MC-37615: Graphql urlresolver returning Null when using SEO friendly URLs with parameters

Author: dhorytskyi

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

@@ -65,7 +65,8 @@ public function resolve(
         $storeId = (int)$context->getExtensionAttributes()->getStore()->getId();
         $result = null;
         // phpcs:ignore Magento2.Functions.DiscouragedFunction
-        $url = parse_url($args['url'], PHP_URL_PATH);
+        $urlParts = parse_url($args['url']);
+        $url = $urlParts['path'] ?? $args['url'];
         if (substr($url, 0, 1) === '/' && $url !== '/') {
             $url = ltrim($url, '/');
         }
@@ -82,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

@@ -70,8 +70,9 @@ public function testResolveCMSPageWithQueryParameters()
         $page->load('page100');
         $cmsPageId = $page->getId();
         $requestPath = $page->getIdentifier();
+        $requestPath .= '?key=value';
 
-        $query = $this->createQuery($requestPath . '?key=value');
+        $query = $this->createQuery($requestPath);
         $response = $this->graphQlQuery($query);
         $this->assertNotEmpty($response['urlResolver']);
         $this->assertEquals($cmsPageId, $response['urlResolver']['id']);