Merge branch 'MC-37615' of https://github.com/magento-tango/magento2ce into PR-09-24-2020

Author: chittima

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

@@ -64,7 +64,9 @@ public function resolve(
 
         $storeId = (int)$context->getExtensionAttributes()->getStore()->getId();
         $result = null;
-        $url = $args['url'];
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
+        $urlParts = parse_url($args['url']);
+        $url = $urlParts['path'] ?? $args['url'];
         if (substr($url, 0, 1) === '/' && $url !== '/') {
             $url = ltrim($url, '/');
         }
@@ -81,6 +83,9 @@ public function resolve(
                 'redirectCode' => $this->redirectType,
                 'type' => $this->sanitizeType($finalUrlRewrite->getEntityType())
             ];
+            if (!empty($urlParts['query'])) {
+                $resultArray['relative_url'] .= '?' . $urlParts['query'];
+            }
 
             if (empty($resultArray['id'])) {
                 throw new GraphQlNoSuchEntityException(

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

@@ -45,44 +45,40 @@ public function testCMSPageUrlResolver()
         $targetPath = $urlPathGenerator->getCanonicalUrlPath($page);
         $expectedEntityType = CmsPageUrlRewriteGenerator::ENTITY_TYPE;
 
-        $query
-            = <<<QUERY
-{
-  urlResolver(url:"{$requestPath}")
-  {
-   id
-   relative_url
-   type
-   redirectCode
-  }
-}
-QUERY;
+        $query = $this->createQuery($requestPath);
         $response = $this->graphQlQuery($query);
         $this->assertEquals($cmsPageId, $response['urlResolver']['id']);
         $this->assertEquals($requestPath, $response['urlResolver']['relative_url']);
         $this->assertEquals(strtoupper(str_replace('-', '_', $expectedEntityType)), $response['urlResolver']['type']);
         $this->assertEquals(0, $response['urlResolver']['redirectCode']);
 
         // querying by non seo friendly url path should return seo friendly relative url
-        $query
-            = <<<QUERY
-{
-  urlResolver(url:"{$targetPath}")
-  {
-   id
-   relative_url
-   type
-   redirectCode
-  }
-}
-QUERY;
+        $query = $this->createQuery($targetPath);
         $response = $this->graphQlQuery($query);
         $this->assertEquals($cmsPageId, $response['urlResolver']['id']);
         $this->assertEquals($requestPath, $response['urlResolver']['relative_url']);
         $this->assertEquals(strtoupper(str_replace('-', '_', $expectedEntityType)), $response['urlResolver']['type']);
         $this->assertEquals(0, $response['urlResolver']['redirectCode']);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Cms/_files/pages.php
+     */
+    public function testResolveCMSPageWithQueryParameters()
+    {
+        $page = $this->objectManager->create(\Magento\Cms\Model\Page::class);
+        $page->load('page100');
+        $cmsPageId = $page->getId();
+        $requestPath = $page->getIdentifier();
+        $requestPath .= '?key=value';
+
+        $query = $this->createQuery($requestPath);
+        $response = $this->graphQlQuery($query);
+        $this->assertNotEmpty($response['urlResolver']);
+        $this->assertEquals($cmsPageId, $response['urlResolver']['id']);
+        $this->assertEquals($requestPath, $response['urlResolver']['relative_url']);
+    }
+
     /**
      * Test resolution of '/' path to home page
      */
@@ -98,10 +94,24 @@ public function testResolveSlash()
         $page = $this->objectManager->get(\Magento\Cms\Model\Page::class);
         $page->load($homePageIdentifier);
         $homePageId = $page->getId();
-        $query
-            = <<<QUERY
+        $query = $this->createQuery('/');
+        $response = $this->graphQlQuery($query);
+        $this->assertArrayHasKey('urlResolver', $response);
+        $this->assertEquals($homePageId, $response['urlResolver']['id']);
+        $this->assertEquals($homePageIdentifier, $response['urlResolver']['relative_url']);
+        $this->assertEquals('CMS_PAGE', $response['urlResolver']['type']);
+        $this->assertEquals(0, $response['urlResolver']['redirectCode']);
+    }
+
+    /**
+     * @param string $path
+     * @return string
+     */
+    private function createQuery(string $path): string
+    {
+        return <<<QUERY
 {
-  urlResolver(url:"/")
+  urlResolver(url:"{$path}")
   {
    id
    relative_url
@@ -110,11 +120,5 @@ public function testResolveSlash()
   }
 }
 QUERY;
-        $response = $this->graphQlQuery($query);
-        $this->assertArrayHasKey('urlResolver', $response);
-        $this->assertEquals($homePageId, $response['urlResolver']['id']);
-        $this->assertEquals($homePageIdentifier, $response['urlResolver']['relative_url']);
-        $this->assertEquals('CMS_PAGE', $response['urlResolver']['type']);
-        $this->assertEquals(0, $response['urlResolver']['redirectCode']);
     }
 }