Merge pull request #1 from thokiller/master

[BUGFIX][PWAI-1505] added compatibility for the 404 in combination wi…

Author: mhaagen85

…riteGraphQl/Model/Resolver/EntityUrl.php …lRewriteGraphQl/Model/Resolver/Route.phpPlugin/Graphql/Magento/UrlRewriteGraphQl/Model/Resolver/EntityUrl.php renamed to Plugin/Graphql/Magento/UrlRewriteGraphQl/Model/Resolver/Route.php Plugin/Graphql/Magento/UrlRewriteGraphQl/Model/Resolver/EntityUrl.php renamed to Plugin/Graphql/Magento/UrlRewriteGraphQl/Model/Resolver/Route.php

@@ -9,7 +9,7 @@
 
 use Magento\Store\Api\Data\StoreInterface;
 
-class EntityUrl
+class Route
 {
     /**
      * @var \Experius\PageNotFound\Model\PageNotFoundFactory
@@ -39,7 +39,7 @@ public function __construct(
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function aroundResolve(
-        \Magento\UrlRewriteGraphQl\Model\Resolver\EntityUrl $subject,
+        \Magento\UrlRewriteGraphQl\Model\Resolver\Route $subject,
         $proceed,
         $field,
         $context,
@@ -52,7 +52,7 @@ public function aroundResolve(
             $args['url'] = $this->savePageNotFound($args['url'], $context->getExtensionAttributes()->getStore()) ?: $args['url'];
             $result = $proceed($field, $context, $info, $value, $args);
             if (!is_null($result)) {
-                $result['redirectCode'] = 301;
+                $result['redirect_code'] = 301;
             }
         }
         return $result;
@@ -68,15 +68,12 @@ protected function savePageNotFound(
         $fromUrl,
         StoreInterface $store
     ) {
-
         /* @var $pageNotFoundModel \Experius\PageNotFound\Model\PageNotFound */
         $pageNotFoundModel = $this->pageNotFoundFactory->create();
-
         $baseUrl = $store->getBaseUrl();
         if (strpos($fromUrl, $baseUrl) === false) {
             $fromUrl = $baseUrl . ltrim($fromUrl, '/');
         }
-
         $pageNotFoundModel->load($fromUrl,'from_url');
 
         if($pageNotFoundModel->getId()){
@@ -92,7 +89,6 @@ protected function savePageNotFound(
         }
 
         $pageNotFoundModel->save();
-
         if($pageNotFoundModel->getToUrl()) {
             return str_replace($baseUrl, '', $pageNotFoundModel->getToUrl());
         }

etc/graphql/di.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-	<type name="Magento\UrlRewriteGraphQl\Model\Resolver\EntityUrl">
-		<plugin disabled="false" name="Experius_PageNotFoundGraphQl_Plugin_Graphql_Magento_UrlRewriteGraphQl_Model_Resolver_EntityUrl" sortOrder="999" type="Experius\PageNotFoundGraphQl\Plugin\Graphql\Magento\UrlRewriteGraphQl\Model\Resolver\EntityUrl"/>
+	<type name="Magento\UrlRewriteGraphQl\Model\Resolver\Route">
+		<plugin disabled="false" name="Experius_PageNotFoundGraphQl_Plugin_Graphql_Magento_UrlRewriteGraphQl_Model_Resolver_Route" sortOrder="999" type="Experius\PageNotFoundGraphQl\Plugin\Graphql\Magento\UrlRewriteGraphQl\Model\Resolver\Route"/>
 	</type>
 </config>