diff --git a/modules/graphql_compose_routes/src/Plugin/GraphQL/DataProducer/UrlOrRedirect.php b/modules/graphql_compose_routes/src/Plugin/GraphQL/DataProducer/UrlOrRedirect.php index 42fa2cc91c7d38a1cd69a1d629e266946d846fdc..76a093a372bc32b15ebd79624045a78655a8b3bb 100644 --- a/modules/graphql_compose_routes/src/Plugin/GraphQL/DataProducer/UrlOrRedirect.php +++ b/modules/graphql_compose_routes/src/Plugin/GraphQL/DataProducer/UrlOrRedirect.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace Drupal\graphql_compose_routes\Plugin\GraphQL\DataProducer; +use Drupal\Component\Utility\UrlHelper; use Drupal\Core\Language\LanguageInterface; use Drupal\Core\Language\LanguageManagerInterface; use Drupal\Core\Path\PathValidatorInterface; @@ -119,8 +120,10 @@ class UrlOrRedirect extends DataProducerPluginBase implements ContainerFactoryPl // Redirect module requires the current language code to get results. $langcode = $this->languageManager->getCurrentLanguage(LanguageInterface::TYPE_URL)->getId(); + $parsed_url = UrlHelper::parse(trim($path)); + return $this->redirectRepository - ? $this->redirectRepository->findMatchingRedirect($path, [], $langcode) + ? $this->redirectRepository->findMatchingRedirect($parsed_url['path'], $parsed_url['query'], $langcode) : NULL; }