MC-18094: Full page cache issue with non-default store view

Author: Roman Lytvynenko

app/code/Magento/Store/App/Action/Plugin/Context.php

@@ -6,15 +6,14 @@
 
 namespace Magento\Store\App\Action\Plugin;
 
+use Magento\Framework\App\Action\AbstractAction;
 use Magento\Framework\App\Http\Context as HttpContext;
+use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\NotFoundException;
 use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Api\StoreCookieManagerInterface;
-use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
-use Magento\Framework\App\Action\AbstractAction;
-use Magento\Framework\App\RequestInterface;
 
 /**
  * Class ContextPlugin
@@ -132,15 +131,11 @@ private function processInvalidStoreRequested(
      */
     private function updateContext(StoreInterface $store)
     {
-        if (!$store->getConfig(Store::XML_PATH_STORE_IN_URL) ||
-            $store->getCode() == $this->storeManager->getDefaultStoreView()->getCode()
-        ) {
-            $this->httpContext->setValue(
-                StoreManagerInterface::CONTEXT_STORE,
-                $store->getCode(),
-                $this->storeManager->getDefaultStoreView()->getCode()
-            );
-        }
+        $this->httpContext->setValue(
+            StoreManagerInterface::CONTEXT_STORE,
+            $store->getCode(),
+            $store->isUseStoreInUrl() ? $store->getCode() : $this->storeManager->getDefaultStoreView()->getCode()
+        );
 
         /** @var StoreInterface $defaultStore */
         $defaultStore = $this->storeManager->getWebsite()->getDefaultStore();

app/code/Magento/Store/Test/Unit/App/Action/Plugin/ContextNonDefaultStoreDirectLinkTest.php

@@ -35,17 +35,17 @@ class ContextNonDefaultStoreDirectLinkTest extends TestCase
      * Test for full page cache hits from new http clients if store context was specified in the URL
      *
      * @dataProvider cacheHitOnDirectLinkToNonDefaultStoreView
-     * @param $customStore
-     * @param $defaultStore
-     * @param $setValueNumberOfTimes
-     * @param $xmlPathStoreInUrl
+     * @param string $customStore
+     * @param string $defaultStore
+     * @param string $expectedDefaultStore
+     * @param bool $useStoreInUrl
      * @return void
      */
     public function testCacheHitOnDirectLinkToNonDefaultStoreView(
-        $customStore,
-        $defaultStore,
-        $setValueNumberOfTimes,
-        $xmlPathStoreInUrl
+        string $customStore,
+        string $defaultStore,
+        string $expectedDefaultStore,
+        bool $useStoreInUrl
     ) {
         $sessionMock = $this->createPartialMock(Generic::class, ['getCurrencyCode']);
         $httpContextMock = $this->createMock(HttpContext::class);
@@ -89,14 +89,12 @@ public function testCacheHitOnDirectLinkToNonDefaultStoreView(
             ->method('getDefaultCurrencyCode')
             ->willReturn(self::CURRENCY_CURRENT_STORE);
 
-        $currentStoreMock->expects($this->any())
-            ->method('getConfig')
-            ->willReturn($xmlPathStoreInUrl);
-
         $currentStoreMock->expects($this->any())
             ->method('getCode')
             ->willReturn($customStore);
 
+        $currentStoreMock->method('isUseStoreInUrl')->willReturn($useStoreInUrl);
+
         $storeManager->expects($this->any())
             ->method('getWebsite')
             ->willReturn($websiteMock);
@@ -126,8 +124,11 @@ public function testCacheHitOnDirectLinkToNonDefaultStoreView(
             ->method('getCurrencyCode')
             ->willReturn(self::CURRENCY_SESSION);
 
-        $httpContextMock->expects($this->exactly($setValueNumberOfTimes))
-            ->method('setValue');
+        $httpContextMock->expects($this->at(1))->method(
+            'setValue'
+        )->with(StoreManagerInterface::CONTEXT_STORE, $customStore, $expectedDefaultStore);
+
+        $httpContextMock->expects($this->at(2))->method('setValue');
 
         $plugin->beforeDispatch(
             $subjectMock,
@@ -141,20 +142,20 @@ public function cacheHitOnDirectLinkToNonDefaultStoreView()
             [
                 'custom_store',
                 'default',
-                1,
-                1
+                'custom_store',
+                true,
             ],
             [
+                'custom_store',
                 'default',
                 'default',
-                2,
-                0
+                false,
             ],
             [
                 'default',
                 'default',
-                2,
-                1
+                'default',
+                true,
             ],
         ];
     }