MC-20158: Redirects are not supported in urlResolver

- add redirect code

Author: cpartica

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

@@ -31,6 +31,11 @@ class EntityUrl implements ResolverInterface
      */
     private $customUrlLocator;
 
+    /**
+     * @var int
+     */
+    private $redirectType;
+
     /**
      * @param UrlFinderInterface $urlFinder
      * @param CustomUrlLocatorInterface $customUrlLocator
@@ -63,6 +68,7 @@ public function resolve(
         if (substr($url, 0, 1) === '/' && $url !== '/') {
             $url = ltrim($url, '/');
         }
+        $this->redirectType = 0;
         $customUrl = $this->customUrlLocator->locateUrl($url);
         $url = $customUrl ?: $url;
         $finalUrlRewrite = $this->findFinalUrl($url, $storeId);
@@ -72,6 +78,7 @@ public function resolve(
                 'id' => $finalUrlRewrite->getEntityId(),
                 'canonical_url' => $relativeUrl,
                 'relative_url' => $relativeUrl,
+                'redirectCode' => $this->redirectType,
                 'type' => $this->sanitizeType($finalUrlRewrite->getEntityType())
             ];
 
@@ -105,6 +112,7 @@ private function rewriteCustomUrls(UrlRewrite $finalUrlRewrite, int $storeId): ?
                 'id' => $finalUrlRewrite->getEntityId(),
                 'canonical_url' => $relativeUrl,
                 'relative_url' => $relativeUrl,
+                'redirectCode' => $finalCustomUrlRewrite->getRedirectType(),
                 'type' => $this->sanitizeType($finalUrlRewrite->getEntityType())
             ];
         }
@@ -122,10 +130,12 @@ private function rewriteCustomUrls(UrlRewrite $finalUrlRewrite, int $storeId): ?
     private function findFinalUrl(string $requestPath, int $storeId, bool $findCustom = false): ?UrlRewrite
     {
         $urlRewrite = $this->findUrlFromRequestPath($requestPath, $storeId);
-        while ($urlRewrite && $urlRewrite->getRedirectType() > 0) {
-            $urlRewrite = $this->findUrlFromRequestPath($urlRewrite->getTargetPath(), $storeId);
-        }
-        if (!$urlRewrite) {
+        if ($urlRewrite) {
+            $this->redirectType = $urlRewrite->getRedirectType();
+            while ($urlRewrite && $urlRewrite->getRedirectType() > 0) {
+                $urlRewrite = $this->findUrlFromRequestPath($urlRewrite->getTargetPath(), $storeId);
+            }
+        } else {
             $urlRewrite = $this->findUrlFromTargetPath($requestPath, $storeId);
         }
         if ($urlRewrite && ($findCustom && !$urlRewrite->getEntityId() && !$urlRewrite->getIsAutogenerated())) {

app/code/Magento/UrlRewriteGraphQl/etc/schema.graphqls

@@ -9,6 +9,7 @@ type EntityUrl @doc(description: "EntityUrl is an output object containing the `
     id: Int @doc(description: "The ID assigned to the object associated with the specified url. This could be a product ID, category ID, or page ID.")
     canonical_url: String @deprecated(reason: "The canonical_url field is deprecated, use relative_url instead.")
     relative_url: String @doc(description: "The internal relative URL. If the specified  url is a redirect, the query returns the redirected URL, not the original.")
+    redirectCode: Int @doc(description: "301 or 302 HTTP code for url permanent or temporary redirect or 0 for the 200 no redirect")
     type: UrlRewriteEntityTypeEnum @doc(description: "One of PRODUCT, CATEGORY, or CMS_PAGE.")
 }