MAGETWO-93061: CMS page of second website with same URLkey as first website, show content of First website instead of second website content.

- Add switch store to url

Author: nikshostko

app/code/Magento/Cms/Block/Adminhtml/Page/Grid/Renderer/Action/UrlBuilder.php

@@ -3,8 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Cms\Block\Adminhtml\Page\Grid\Renderer\Action;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Url\EncoderInterface;
+use Magento\Framework\App\ActionInterface;
+use Magento\Store\Model\StoreManagerInterface;
+
 /**
  * Url builder class used to compose dynamic urls.
  */
@@ -15,12 +22,31 @@ class UrlBuilder
      */
     protected $frontendUrlBuilder;
 
+    /**
+     * @var EncoderInterface
+     */
+    private $urlEncoder;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
     /**
      * @param \Magento\Framework\UrlInterface $frontendUrlBuilder
+     * @param EncoderInterface|null $urlEncoder
+     * @param StoreManagerInterface|null $storeManager
      */
-    public function __construct(\Magento\Framework\UrlInterface $frontendUrlBuilder)
-    {
+    public function __construct(
+        \Magento\Framework\UrlInterface $frontendUrlBuilder,
+        EncoderInterface $urlEncoder = null,
+        StoreManagerInterface $storeManager = null
+    ) {
         $this->frontendUrlBuilder = $frontendUrlBuilder;
+        $this->urlEncoder = $urlEncoder ?: ObjectManager::getInstance()
+            ->get(EncoderInterface::class);
+        $this->storeManager = $storeManager?: ObjectManager::getInstance()
+            ->get(StoreManagerInterface::class);
     }
 
     /**
@@ -35,12 +61,22 @@ public function getUrl($routePath, $scope, $store)
     {
         if ($scope) {
             $this->frontendUrlBuilder->setScope($scope);
-            $href = $this->frontendUrlBuilder->getUrl(
+            $targetUrl = $this->frontendUrlBuilder->getUrl(
                 $routePath,
                 [
                     '_current' => false,
                     '_nosid' => true,
-                    '_query' => [\Magento\Store\Model\StoreManagerInterface::PARAM_NAME => $store]
+                    '_query' => [
+                        StoreManagerInterface::PARAM_NAME => $store
+                    ]
+                ]
+            );
+            $href = $this->frontendUrlBuilder->getUrl(
+                'stores/store/switch',
+                [
+                    '_current' => false,
+                    '_nosid' => true,
+                    '_query' => $this->prepareRequestQuery($store, $targetUrl)
                 ]
             );
         } else {
@@ -55,4 +91,25 @@ public function getUrl($routePath, $scope, $store)
 
         return $href;
     }
+
+    /**
+     * Prepare request query
+     *
+     * @param string $store
+     * @param string $href
+     * @return array
+     */
+    private function prepareRequestQuery(string $store, string $href) : array
+    {
+        $storeView = $this->storeManager->getDefaultStoreView();
+        $query = [
+            StoreManagerInterface::PARAM_NAME => $store,
+            ActionInterface::PARAM_NAME_URL_ENCODED => $this->urlEncoder->encode($href)
+        ];
+        if ($storeView->getCode() !== $store) {
+            $query['___from_store'] = $storeView->getCode();
+        }
+
+        return $query;
+    }
 }

app/code/Magento/Store/Controller/Store/SwitchAction.php

@@ -4,6 +4,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Store\Controller\Store;
 
@@ -18,13 +19,15 @@
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Store\Model\StoreSwitcher;
 use Magento\Store\Model\StoreSwitcherInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\App\Action\HttpGetActionInterface;
 
 /**
  * Handles store switching url and makes redirect.
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class SwitchAction extends Action
+class SwitchAction extends Action implements HttpGetActionInterface, HttpPostActionInterface
 {
     /**
      * @var StoreCookieManagerInterface
@@ -89,10 +92,12 @@ public function __construct(
     public function execute()
     {
         $targetStoreCode = $this->_request->getParam(
-            \Magento\Store\Model\StoreManagerInterface::PARAM_NAME,
+            \Magento\Store\Model\StoreManagerInterface::PARAM_NAME
+        );
+        $fromStoreCode = $this->_request->getParam(
+            '___from_store',
             $this->storeCookieManager->getStoreCodeFromCookie()
         );
-        $fromStoreCode = $this->_request->getParam('___from_store');
 
         $requestedUrlToRedirect = $this->_redirect->getRedirectUrl();
         $redirectUrl = $requestedUrlToRedirect;

app/code/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrl.php

@@ -70,10 +70,7 @@ public function switch(StoreInterface $fromStore, StoreInterface $targetStore, s
         if ($oldRewrite) {
             $targetUrl = $targetStore->getBaseUrl();
             // look for url rewrite match on the target store
-            $currentRewrite = $this->urlFinder->findOneByData([
-                UrlRewrite::TARGET_PATH => $oldRewrite->getTargetPath(),
-                UrlRewrite::STORE_ID => $targetStore->getId(),
-            ]);
+            $currentRewrite = $this->findCurrentRewrite($oldRewrite, $targetStore);
             if ($currentRewrite) {
                 $targetUrl .= $currentRewrite->getRequestPath();
             }
@@ -93,4 +90,26 @@ public function switch(StoreInterface $fromStore, StoreInterface $targetStore, s
         }
         return $targetUrl;
     }
+
+    /**
+     * Look for url rewrite match on the target store
+     *
+     * @param UrlRewrite $oldRewrite
+     * @param StoreInterface $targetStore
+     * @return UrlRewrite|null
+     */
+    private function findCurrentRewrite(UrlRewrite $oldRewrite, StoreInterface $targetStore)
+    {
+        $currentRewrite = $this->urlFinder->findOneByData([
+            UrlRewrite::TARGET_PATH => $oldRewrite->getTargetPath(),
+            UrlRewrite::STORE_ID => $targetStore->getId(),
+        ]);
+        if (!$currentRewrite) {
+            $currentRewrite = $this->urlFinder->findOneByData([
+                UrlRewrite::REQUEST_PATH => $oldRewrite->getTargetPath(),
+                UrlRewrite::STORE_ID => $targetStore->getId(),
+            ]);
+        }
+        return $currentRewrite;
+    }
 }