Merge remote-tracking branch 'origin/MC-20158-urls' into MC-15986-story

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
@@ -57,49 +62,83 @@ 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, '/');
         }
+        $this->redirectType = 0;
         $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,
+                'redirectCode' => $this->redirectType,
+                '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,
+                'redirectCode' => $finalCustomUrlRewrite->getRedirectType(),
+                '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) {
+        if ($urlRewrite) {
+            $this->redirectType = $urlRewrite->getRedirectType();
             while ($urlRewrite && $urlRewrite->getRedirectType() > 0) {
                 $urlRewrite = $this->findUrlFromRequestPath($urlRewrite->getTargetPath(), $storeId);
             }
-        }
-        if (!$urlRewrite) {
+        } else {
             $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 +152,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 +169,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(
             [

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.")
 }