Merge remote-tracking branch 'mpi/MC-22567' into Chaika-PR-2019-11-19

Author: veloraven

app/code/Magento/Store/etc/di.xml

@@ -436,7 +436,7 @@
                 <item name="cleanTargetUrl" xsi:type="object">Magento\Store\Model\StoreSwitcher\CleanTargetUrl</item>
                 <item name="manageStoreCookie" xsi:type="object">Magento\Store\Model\StoreSwitcher\ManageStoreCookie</item>
                 <item name="managePrivateContent" xsi:type="object">Magento\Store\Model\StoreSwitcher\ManagePrivateContent</item>
-                <item name="hashGenerator" xsi:type="object">Magento\Store\Model\StoreSwitcher\HashGenerator</item>
+                <item name="hashGenerator" xsi:type="object" sortOrder="1000">Magento\Store\Model\StoreSwitcher\HashGenerator</item>
             </argument>
         </arguments>
     </type>

dev/tests/integration/testsuite/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrlTest.php

@@ -8,21 +8,28 @@
 namespace Magento\UrlRewrite\Model\StoreSwitcher;
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Model\Session;
+use Magento\Framework\App\ActionInterface;
 use Magento\Framework\App\Config\ReinitableConfigInterface;
 use Magento\Framework\App\Config\Value;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\ObjectManagerInterface as ObjectManager;
+use Magento\Framework\Url\DecoderInterface;
 use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Api\StoreRepositoryInterface;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Store\Model\StoreSwitcher;
-use Magento\Framework\ObjectManagerInterface as ObjectManager;
 use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * Test store switching
  */
-class RewriteUrlTest extends \PHPUnit\Framework\TestCase
+class RewriteUrlTest extends TestCase
 {
     /**
      * @var StoreSwitcher
@@ -66,7 +73,7 @@ protected function setUp()
      * @magentoAppIsolation enabled
      * @return void
      * @throws StoreSwitcher\CannotSwitchStoreException
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws NoSuchEntityException
      */
     public function testSwitchToNonExistingPage(): void
     {
@@ -91,7 +98,7 @@ public function testSwitchToNonExistingPage(): void
      * @magentoDbIsolation disabled
      * @return void
      * @throws StoreSwitcher\CannotSwitchStoreException
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws NoSuchEntityException
      */
     public function testSwitchToExistingPage(): void
     {
@@ -120,6 +127,46 @@ public function testSwitchCmsPageToAnotherStore(): void
         $this->assertEquals($expectedUrl, $this->storeSwitcher->switch($fromStore, $toStore, $redirectUrl));
     }
 
+    /**
+     * Test store switching with logged in customer on cms page with different url_key
+     *
+     * @magentoDataFixture Magento/UrlRewrite/_files/url_rewrite.php
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoDbIsolation disabled
+     * @magentoAppArea frontend
+     * @return void
+     */
+    public function testSwitchCmsPageToAnotherStoreAsCustomer(): void
+    {
+        /** @var CustomerRepositoryInterface $repository */
+        $repository = $this->objectManager->create(CustomerRepositoryInterface::class);
+        $this->loginAsCustomer($repository->get('customer@example.com'));
+        $fromStore = $this->getStoreByCode('default');
+        $toStore = $this->getStoreByCode('fixture_second_store');
+
+        $redirectUrl = "http://localhost/index.php/page-c/";
+        $expectedUrl = "http://localhost/index.php/page-c-on-2nd-store";
+        /** @var DecoderInterface $decoder */
+        $decoder = $this->objectManager->create(DecoderInterface::class);
+        $secureRedirectUrl = $this->storeSwitcher->switch($fromStore, $toStore, $redirectUrl);
+        parse_str(parse_url($secureRedirectUrl, PHP_URL_QUERY), $secureRedirectUrlQueryParams);
+        $encodedActualUrl = $secureRedirectUrlQueryParams[ActionInterface::PARAM_NAME_URL_ENCODED];
+        $actualUrl = $decoder->decode($encodedActualUrl);
+        $this->assertEquals($expectedUrl, $actualUrl);
+    }
+
+    /**
+     * Login as customer
+     *
+     * @param CustomerInterface $customer
+     */
+    private function loginAsCustomer($customer)
+    {
+        /** @var Session $session */
+        $session = $this->objectManager->get(Session::class);
+        $session->setCustomerDataAsLoggedIn($customer);
+    }
+
     /**
      * Set base url to store.
      *