Merge pull request #13 from zbigniewkuras/issue-9

GraphQL - Fix urlResolver query to support relative path

Author: gelanivishal

app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite.php

@@ -14,6 +14,8 @@
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\UrlRewrite\Model\UrlFinderInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Cms\Helper\Page;
 
 /**
  * UrlRewrite field resolver, used for GraphQL request processing.
@@ -34,20 +36,28 @@ class UrlRewrite implements ResolverInterface
      * @var ValueFactory
      */
     private $valueFactory;
-
+    
+    /**
+     * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     */
+    private $scopeConfig;
+    
     /**
      * @param UrlFinderInterface $urlFinder
      * @param StoreManagerInterface $storeManager
      * @param ValueFactory $valueFactory
+     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      */
     public function __construct(
         UrlFinderInterface $urlFinder,
         StoreManagerInterface $storeManager,
-        ValueFactory $valueFactory
+        ValueFactory $valueFactory,
+        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
     ) {
         $this->urlFinder = $urlFinder;
         $this->storeManager = $storeManager;
         $this->valueFactory = $valueFactory;
+        $this->scopeConfig = $scopeConfig;
     }
 
     /**
@@ -63,8 +73,19 @@ public function resolve(
         $result = function () {
             return null;
         };
+        
         if (isset($args['url'])) {
-            $urlRewrite = $this->findCanonicalUrl($args['url']);
+            $url = $args['url'];
+            if (substr($url, 0, 1) === '/' && $url !== '/') {
+                $url = ltrim($url, '/');
+            } else if ($url === '/') {
+                $homePageIdentifier = $this->scopeConfig->getValue(
+                    Page::XML_PATH_HOME_PAGE,
+                    ScopeInterface::SCOPE_STORE
+                );
+                $url = $homePageIdentifier;
+            }
+            $urlRewrite = $this->findCanonicalUrl($url);
             if ($urlRewrite) {
                 $urlRewriteReturnArray = [
                     'id' => $urlRewrite->getEntityId(),
@@ -96,6 +117,7 @@ private function findCanonicalUrl(string $requestPath) : ?\Magento\UrlRewrite\Se
         if (!$urlRewrite) {
             $urlRewrite = $this->findUrlFromTargetPath($requestPath);
         }
+        
         return $urlRewrite;
     }
 

app/code/Magento/UrlRewriteGraphQl/composer.json

@@ -1,27 +1,27 @@
 {
-    "name": "magento/module-url-rewrite-graph-ql",
-    "description": "N/A",
-    "type": "magento2-module",
-    "require": {
-        "php": "~7.1.3||~7.2.0",
-        "magento/framework": "*",
-        "magento/module-url-rewrite": "*",
-        "magento/module-store": "*"
-
-    },
-    "suggest": {
-        "magento/module-graph-ql": "*"
-    },
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "autoload": {
-        "files": [
-            "registration.php"
-        ],
-        "psr-4": {
-            "Magento\\UrlRewriteGraphQl\\": ""
-        }
-    }
-}
+	"name" : "magento/module-url-rewrite-graph-ql",
+	"description" : "N/A",
+	"type" : "magento2-module",
+	"require" : {
+		"php" : "~7.1.3||~7.2.0",
+		"magento/framework" : "*",
+		"magento/module-url-rewrite" : "*",
+		"magento/module-store" : "*",
+		"magento/cms" : "*"
+	},
+	"suggest" : {
+		"magento/module-graph-ql" : "*"
+	},
+	"license" : [
+		"OSL-3.0",
+		"AFL-3.0"
+	],
+	"autoload" : {
+		"files" : [
+			"registration.php"
+		],
+		"psr-4" : {
+			"Magento\\UrlRewriteGraphQl\\" : ""
+		}
+	}
+}

dev/tests/api-functional/testsuite/Magento/GraphQl/UrlRewrite/UrlResolverTest.php

@@ -272,4 +272,46 @@ public function testInvalidUrlResolverInput()
         $this->assertArrayHasKey('urlResolver', $response);
         $this->assertNull($response['urlResolver']);
     }
+    
+    /**
+     * Test for category entity with leading slash
+     */
+    public function testCategoryUrlWithLeadingSlash()
+    {
+        $productSku = 'p002';
+        $urlPath2 = 'cat-1.html';
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $product = $productRepository->get($productSku, false, null, true);
+        $storeId  = $product->getStoreId();
+        
+        /** @var  UrlFinderInterface $urlFinder */
+        $urlFinder = $this->objectManager->get(UrlFinderInterface::class);
+        $actualUrls = $urlFinder->findOneByData(
+            [
+                'request_path' => $urlPath2,
+                'store_id' => $storeId
+            ]
+        );
+        $categoryId = $actualUrls->getEntityId();
+        $targetPath = $actualUrls->getTargetPath();
+        $expectedType = $actualUrls->getEntityType();
+        
+        $query
+        = <<<QUERY
+{
+  urlResolver(url:"/{$urlPath2}")
+  {
+   id
+   canonical_url
+   type
+  }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+        $this->assertArrayHasKey('urlResolver', $response);
+        $this->assertEquals($categoryId, $response['urlResolver']['id']);
+        $this->assertEquals($targetPath, $response['urlResolver']['canonical_url']);
+        $this->assertEquals(strtoupper($expectedType), $response['urlResolver']['type']);
+    }
 }