Use the path validator service to process the route field. (#545)

Author: fubhy

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

@@ -3,11 +3,14 @@
 namespace Drupal\graphql_core\Plugin\GraphQL\Fields\Routing;
 
 use Drupal\Component\Utility\UrlHelper;
+use Drupal\Core\Path\PathValidatorInterface;
+use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\Core\Url;
 use Drupal\graphql\GraphQL\Cache\CacheableValue;
 use Drupal\graphql\GraphQL\Execution\ResolveContext;
 use Drupal\graphql\Plugin\GraphQL\Fields\FieldPluginBase;
 use GraphQL\Type\Definition\ResolveInfo;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Retrieve a route object based on a path.
@@ -23,23 +26,53 @@
  *   }
  * )
  */
-class Route extends FieldPluginBase {
+class Route extends FieldPluginBase implements ContainerFactoryPluginInterface {
+
+  /**
+   * The path validator service.
+   *
+   * @var \Drupal\Core\Path\PathValidatorInterface
+   */
+  protected $pathValidator;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    return new static(
+      $configuration,
+      $plugin_id,
+      $plugin_definition,
+      $container->get('path.validator')
+    );
+  }
+
+  /**
+   * Route constructor.
+   *
+   * @param array $configuration
+   *   The plugin configuration.
+   * @param string $pluginId
+   *   The plugin id.
+   * @param mixed $pluginDefinition
+   *   The plugin definition.
+   * @param \Drupal\Core\Path\PathValidatorInterface $pathValidator
+   *   The path validator service.
+   */
+  public function __construct(array $configuration, $pluginId, $pluginDefinition, PathValidatorInterface $pathValidator) {
+    parent::__construct($configuration, $pluginId, $pluginDefinition);
+    $this->pathValidator = $pathValidator;
+  }
 
   /**
    * {@inheritdoc}
    */
   public function resolveValues($value, array $args, ResolveContext $context, ResolveInfo $info) {
-    if (UrlHelper::isExternal($args['path'])) {
-      yield Url::fromUri($args['path']);
+    if (($url = $this->pathValidator->getUrlIfValidWithoutAccessCheck($args['path'])) && $url->access()) {
+      yield $url;
     }
     else {
-      $url = Url::fromUri("internal:{$args['path']}", ['routed_path' => $args['path']]);
-      if ($url->isRouted() && $url->access()) {
-        yield $url;
-      }
-      else {
-        yield (new CacheableValue(NULL))->addCacheTags(['4xx-response']);
-      }
+      yield (new CacheableValue(NULL))->addCacheTags(['4xx-response']);
     }
   }
 

modules/graphql_core/tests/src/Kernel/Languages/LanguageTest.php

@@ -122,7 +122,7 @@ public function testLanguageSwitchLinks() {
               'id' => 'en',
             ],
             'url' => [
-              'path' => '/en',
+              'path' => '/en/user/login',
             ],
             'title' => 'English',
             'active' => TRUE,
@@ -132,7 +132,7 @@ public function testLanguageSwitchLinks() {
               'id' => 'fr',
             ],
             'url' => [
-              'path' => '/fr',
+              'path' => '/fr/user/login',
             ],
             'title' => NULL,
             'active' => FALSE,
@@ -142,7 +142,7 @@ public function testLanguageSwitchLinks() {
               'id' => 'es',
             ],
             'url' => [
-              'path' => '/es',
+              'path' => '/es/user/login',
             ],
             'title' => NULL,
             'active' => FALSE,
@@ -152,7 +152,7 @@ public function testLanguageSwitchLinks() {
               'id' => 'pt-br',
             ],
             'url' => [
-              'path' => '/',
+              'path' => '/user/login',
             ],
             'title' => NULL,
             'active' => FALSE,

modules/graphql_core/tests/src/Kernel/Routing/RouteTest.php

@@ -37,7 +37,7 @@ protected function setUp() {
       ->willReturn('graphql/test/a');
 
     $urlGenerator
-      ->generateFromRoute('graphql_context_test.a', [], ['routed_path' => '/graphql/test/a', 'query' => []], TRUE)
+      ->generateFromRoute('graphql_context_test.a', [], ['query' => []], TRUE)
       ->willReturn((new GeneratedUrl())->setGeneratedUrl('/my/other/alias'));
 
     $this->container->set('path.alias_manager', $aliasManager->reveal());