Redirect path processing (#673)

Author: pmelab

modules/graphql_core/src/Plugin/GraphQL/Fields/Routing/Route.php

@@ -3,14 +3,11 @@
 namespace Drupal\graphql_core\Plugin\GraphQL\Fields\Routing;
 
 use Drupal\Core\Path\PathValidatorInterface;
+use Drupal\Core\PathProcessor\InboundPathProcessorInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\graphql\GraphQL\Cache\CacheableValue;
 use Drupal\graphql\GraphQL\Execution\ResolveContext;
 use Drupal\graphql\Plugin\GraphQL\Fields\FieldPluginBase;
-use Drupal\language\LanguageNegotiator;
-use Drupal\Core\Language\LanguageManagerInterface;
-use Drupal\redirect\Entity\Redirect;
-use Drupal\Tests\views_ui\Functional\ReportFieldsTest;
 use GraphQL\Type\Definition\ResolveInfo;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
@@ -52,6 +49,16 @@ class Route extends FieldPluginBase implements ContainerFactoryPluginInterface {
    */
   protected $languageManager;
 
+  /**
+   * @var \Drupal\redirect\RedirectRepository
+   */
+  protected $redirectRepository;
+
+  /**
+   * @var InboundPathProcessorInterface
+   */
+  protected $pathProcessor;
+
   /**
    * {@inheritdoc}
    */
@@ -61,8 +68,10 @@ public static function create(ContainerInterface $container, array $configuratio
       $plugin_id,
       $plugin_definition,
       $container->get('path.validator'),
-      $container->has('language_negotiator') ? $container->get('language_negotiator') : NULL,
-      $container->get('language_manager')
+      $container->get('language_negotiator', ContainerInterface::NULL_ON_INVALID_REFERENCE),
+      $container->get('language_manager'),
+      $container->get('redirect.repository', ContainerInterface::NULL_ON_INVALID_REFERENCE),
+      $container->get('path_processor_manager')
     );
   }
 
@@ -81,16 +90,24 @@ public static function create(ContainerInterface $container, array $configuratio
    *   The language negotiator.
    * @param \Drupal\Core\Language\LanguageManagerInterface $languageManager
    *   The language manager.
+   * @param \Drupal\redirect\RedirectRepository $redirectRepository
+   *   The redirect repository, if redirect module is active.
+   * @param \Drupal\Core\PathProcessor\InboundPathProcessorInterface
+   *   An inbound path processor, to clean paths before redirect lookups.
    */
   public function __construct(
     array $configuration,
     $pluginId,
     $pluginDefinition,
     PathValidatorInterface $pathValidator,
     $languageNegotiator,
-    $languageManager
+    $languageManager,
+    $redirectRepository,
+    $pathProcessor
   ) {
     parent::__construct($configuration, $pluginId, $pluginDefinition);
+    $this->redirectRepository = $redirectRepository;
+    $this->pathProcessor = $pathProcessor;
     $this->pathValidator = $pathValidator;
     $this->languageNegotiator = $languageNegotiator;
     $this->languageManager = $languageManager;
@@ -128,23 +145,17 @@ protected function isLanguageAwareField() {
     return TRUE;
   }
 
-  /**
-   * Get the redirect repository service.
-   *
-   * @return \Drupal\redirect\RedirectRepository
-   */
-  protected function getRedirectRepository() {
-    return \Drupal::service('redirect.repository');
-  }
-
   /**
    * {@inheritdoc}
    */
   public function resolveValues($value, array $args, ResolveContext $context, ResolveInfo $info) {
-    if (\Drupal::moduleHandler()->moduleExists('redirect')) {
-      $redirectRepository = $this->getRedirectRepository();
+    if ($this->redirectRepository) {
       $currentLanguage = $this->languageManager->getCurrentLanguage()->getId();
-      if ($redirect = $redirectRepository->findMatchingRedirect($args['path'], [], $currentLanguage)) {
+
+      $processedPath = $this->pathProcessor
+        ->processInbound($args['path'], Request::create($args['path']));
+
+      if ($redirect = $this->redirectRepository->findMatchingRedirect($processedPath, [], $currentLanguage)) {
         yield $redirect;
         return;
       }