MC-20158: Redirects are not supported in urlResolver

- support for custom urls
- return the proper canonical url

Author: cpartica

app/code/Magento/CatalogGraphQl/Model/Resolver/Product/CanonicalUrl.php

@@ -34,8 +34,8 @@ public function resolve(
 
         /* @var $product Product */
         $product = $value['model'];
-        $url = $product->getUrlModel()->getUrl($product, ['_ignore_category' => true]);
+        $product->getUrlModel()->getUrl($product, ['_ignore_category' => true]);
 
-        return $url;
+        return $product->getRequestPath();
     }
 }

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

@@ -57,49 +57,79 @@ public function resolve(
             throw new GraphQlInputException(__('"url" argument should be specified and not empty'));
         }
 
+        $storeId = (int)$context->getExtensionAttributes()->getStore()->getId();
         $result = null;
         $url = $args['url'];
         if (substr($url, 0, 1) === '/' && $url !== '/') {
             $url = ltrim($url, '/');
         }
         $customUrl = $this->customUrlLocator->locateUrl($url);
         $url = $customUrl ?: $url;
-        $urlRewrite = $this->findCanonicalUrl($url, (int)$context->getExtensionAttributes()->getStore()->getId());
-        if ($urlRewrite) {
-            if (!$urlRewrite->getEntityId()) {
+        $finalUrlRewrite = $this->findFinalUrl($url, $storeId);
+        if ($finalUrlRewrite) {
+            $relativeUrl = $finalUrlRewrite->getRequestPath();
+            $resultArray = $this->rewriteCustomUrls($finalUrlRewrite, $storeId) ?? [
+                'id' => $finalUrlRewrite->getEntityId(),
+                'canonical_url' => $relativeUrl,
+                'relative_url' => $relativeUrl,
+                'type' => $this->sanitizeType($finalUrlRewrite->getEntityType())
+            ];
+
+
+            if (empty($resultArray['id'])) {
                 throw new GraphQlNoSuchEntityException(
                     __('No such entity found with matching URL key: %url', ['url' => $url])
                 );
             }
-            $result = [
-                'id' => $urlRewrite->getEntityId(),
-                'canonical_url' => $urlRewrite->getTargetPath(),
-                'relative_url' => $urlRewrite->getTargetPath(),
-                'type' => $this->sanitizeType($urlRewrite->getEntityType())
-            ];
+
+            $result = $resultArray;
         }
         return $result;
     }
 
     /**
-     * Find the canonical url passing through all redirects if any
+     * Handle custom urls with and without redirects
+     *
+     * @param UrlRewrite $finalUrlRewrite
+     * @param int $storeId
+     * @return array|null
+     */
+    private function rewriteCustomUrls(UrlRewrite $finalUrlRewrite, int $storeId): ?array
+    {
+        if ($finalUrlRewrite->getEntityType() === 'custom' || !($finalUrlRewrite->getEntityId() > 0)) {
+            $finalCustomUrlRewrite = clone $finalUrlRewrite;
+            $finalUrlRewrite = $this->findFinalUrl($finalCustomUrlRewrite->getTargetPath(), $storeId, true);
+            $relativeUrl =
+                $finalCustomUrlRewrite->getRedirectType() == 0
+                    ? $finalCustomUrlRewrite->getRequestPath() : $finalUrlRewrite->getRequestPath();
+            return [
+                'id' => $finalUrlRewrite->getEntityId(),
+                'canonical_url' => $relativeUrl,
+                'relative_url' => $relativeUrl,
+                'type' => $this->sanitizeType($finalUrlRewrite->getEntityType())
+            ];
+        }
+        return null;
+    }
+
+    /**
+     * Find the final url passing through all redirects if any
      *
      * @param string $requestPath
      * @param int $storeId
+     * @param bool $findCustom
      * @return UrlRewrite|null
      */
-    private function findCanonicalUrl(string $requestPath, int $storeId) : ?UrlRewrite
+    private function findFinalUrl(string $requestPath, int $storeId, bool $findCustom = false): ?UrlRewrite
     {
         $urlRewrite = $this->findUrlFromRequestPath($requestPath, $storeId);
-        if ($urlRewrite && $urlRewrite->getRedirectType() > 0) {
-            while ($urlRewrite && $urlRewrite->getRedirectType() > 0) {
-                $urlRewrite = $this->findUrlFromRequestPath($urlRewrite->getTargetPath(), $storeId);
-            }
+        while ($urlRewrite && $urlRewrite->getRedirectType() > 0) {
+            $urlRewrite = $this->findUrlFromRequestPath($urlRewrite->getTargetPath(), $storeId);
         }
         if (!$urlRewrite) {
             $urlRewrite = $this->findUrlFromTargetPath($requestPath, $storeId);
         }
-        if ($urlRewrite && !$urlRewrite->getEntityId() && !$urlRewrite->getIsAutogenerated()) {
+        if ($urlRewrite && ($findCustom && !$urlRewrite->getEntityId() && !$urlRewrite->getIsAutogenerated())) {
             $urlRewrite = $this->findUrlFromTargetPath($urlRewrite->getTargetPath(), $storeId);
         }
 
@@ -113,7 +143,7 @@ private function findCanonicalUrl(string $requestPath, int $storeId) : ?UrlRewri
      * @param int $storeId
      * @return UrlRewrite|null
      */
-    private function findUrlFromRequestPath(string $requestPath, int $storeId) : ?UrlRewrite
+    private function findUrlFromRequestPath(string $requestPath, int $storeId): ?UrlRewrite
     {
         return $this->urlFinder->findOneByData(
             [
@@ -130,7 +160,7 @@ private function findUrlFromRequestPath(string $requestPath, int $storeId) : ?Ur
      * @param int $storeId
      * @return UrlRewrite|null
      */
-    private function findUrlFromTargetPath(string $targetPath, int $storeId) : ?UrlRewrite
+    private function findUrlFromTargetPath(string $targetPath, int $storeId): ?UrlRewrite
     {
         return $this->urlFinder->findOneByData(
             [