MAGETWO-86324: PWA URL resolver service

- fix case when canonical path is used as input

Author: cpartica

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

@@ -65,12 +65,15 @@ public function resolve(array $args, ResolverContextInterface $context)
      */
     private function findCanonicalUrl(string $requestPath)
     {
-        $urlRewrite = $this->findUrl($requestPath);
-        if ($urlRewrite->getRedirectType() > 0) {
+        $urlRewrite = $this->findUrlFromRequestPath($requestPath);
+        if ($urlRewrite && $urlRewrite->getRedirectType() > 0) {
             while ($urlRewrite && $urlRewrite->getRedirectType() > 0) {
-                $urlRewrite = $this->findUrl($urlRewrite->getTargetPath());
+                $urlRewrite = $this->findUrlFromRequestPath($urlRewrite->getTargetPath());
             }
         }
+        if (!$urlRewrite) {
+            $urlRewrite = $this->findUrlFromTargetPath($requestPath);
+        }
         return $urlRewrite;
     }
 
@@ -80,7 +83,7 @@ private function findCanonicalUrl(string $requestPath)
      * @param string $requestPath
      * @return \Magento\UrlRewrite\Service\V1\Data\UrlRewrite|null
      */
-    private function findUrl(string $requestPath)
+    private function findUrlFromRequestPath(string $requestPath)
     {
         return $this->urlFinder->findOneByData(
             [
@@ -90,6 +93,22 @@ private function findUrl(string $requestPath)
         );
     }
 
+    /**
+     * Find a url from a target url on the current store
+     *
+     * @param string $targetPath
+     * @return \Magento\UrlRewrite\Service\V1\Data\UrlRewrite|null
+     */
+    private function findUrlFromTargetPath(string $targetPath)
+    {
+        return $this->urlFinder->findOneByData(
+            [
+                'target_path' => $targetPath,
+                'store_id' => $this->storeManager->getStore()->getId()
+            ]
+        );
+    }
+
     /**
      * Sanitizes the type to fit schema specs
      *