MC-19712: Full page cache issue with multiple stores

Author: dhorytskyi

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

@@ -11,6 +11,7 @@
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\NotFoundException;
+use Magento\Framework\Session\SessionManagerInterface;
 use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Api\StoreCookieManagerInterface;
 use Magento\Store\Model\ScopeInterface;
@@ -23,17 +24,17 @@
 class Context
 {
     /**
-     * @var \Magento\Framework\Session\SessionManagerInterface
+     * @var SessionManagerInterface
      */
     protected $session;
 
     /**
-     * @var \Magento\Framework\App\Http\Context
+     * @var HttpContext
      */
     protected $httpContext;
 
     /**
-     * @var \Magento\Store\Model\StoreManagerInterface
+     * @var StoreManagerInterface
      */
     protected $storeManager;
 
@@ -43,15 +44,15 @@ class Context
     protected $storeCookieManager;
 
     /**
-     * @param \Magento\Framework\Session\SessionManagerInterface $session
-     * @param \Magento\Framework\App\Http\Context $httpContext
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param SessionManagerInterface $session
+     * @param HttpContext $httpContext
+     * @param StoreManagerInterface $storeManager
      * @param StoreCookieManagerInterface $storeCookieManager
      */
     public function __construct(
-        \Magento\Framework\Session\SessionManagerInterface $session,
-        \Magento\Framework\App\Http\Context $httpContext,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        SessionManagerInterface $session,
+        HttpContext $httpContext,
+        StoreManagerInterface $storeManager,
         StoreCookieManagerInterface $storeCookieManager
     ) {
         $this->session      = $session;
@@ -80,7 +81,7 @@ public function beforeDispatch(
 
         /** @var string|array|null $storeCode */
         $storeCode = $request->getParam(
-            \Magento\Store\Model\StoreManagerInterface::PARAM_NAME,
+            StoreManagerInterface::PARAM_NAME,
             $this->storeCookieManager->getStoreCodeFromCookie()
         );
         if (is_array($storeCode)) {
@@ -106,13 +107,13 @@ public function beforeDispatch(
      * Take action in case of invalid store requested.
      *
      * @param RequestInterface $request
-     * @param \Throwable|null $previousException
+     * @param NoSuchEntityException|null $previousException
      * @return void
      * @throws NotFoundException
      */
     private function processInvalidStoreRequested(
         RequestInterface $request,
-        \Throwable $previousException = null
+        NoSuchEntityException $previousException = null
     ) {
         $store = $this->storeManager->getStore();
         $this->updateContext($request, $store);
@@ -137,27 +138,25 @@ private function updateContext(RequestInterface $request, StoreInterface $store)
     {
         switch (true) {
             case $store->isUseStoreInUrl():
-                $defaultStoreCode = $store->getCode();
+                $defaultStore = $store;
                 break;
             case ScopeInterface::SCOPE_STORE == $request->getServerValue(StoreManager::PARAM_RUN_TYPE):
                 $defaultStoreCode = $request->getServerValue(StoreManager::PARAM_RUN_CODE);
+                $defaultStore = $this->storeManager->getStore($defaultStoreCode);
                 break;
             default:
                 $defaultStoreCode = $this->storeManager->getDefaultStoreView()->getCode();
+                $defaultStore = $this->storeManager->getStore($defaultStoreCode);
                 break;
         }
         $this->httpContext->setValue(
             StoreManagerInterface::CONTEXT_STORE,
             $store->getCode(),
-            $defaultStoreCode
+            $defaultStore->getCode()
         );
-
-        /** @var StoreInterface $defaultStore */
-        $defaultStore = $this->storeManager->getWebsite()->getDefaultStore();
         $this->httpContext->setValue(
             HttpContext::CONTEXT_CURRENCY,
-            $this->session->getCurrencyCode()
-                ?: $store->getDefaultCurrencyCode(),
+            $this->session->getCurrencyCode() ?: $store->getDefaultCurrencyCode(),
             $defaultStore->getDefaultCurrencyCode()
         );
     }

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

@@ -53,7 +53,10 @@ public function testCacheHitOnDirectLinkToNonDefaultStoreView(
         $storeCookieManager = $this->createMock(StoreCookieManagerInterface::class);
         $storeMock = $this->createMock(Store::class);
         $currentStoreMock = $this->createMock(Store::class);
-        $requestMock = $this->getMockBuilder(RequestInterface::class)->getMockForAbstractClass();
+        $requestMock = $this->getMockBuilder(RequestInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getServerValue'])
+            ->getMockForAbstractClass();
         $subjectMock = $this->getMockBuilder(AbstractAction::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();

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

@@ -93,7 +93,10 @@ protected function setUp()
             \Magento\Store\Model\Website::class,
             ['getDefaultStore', '__wakeup']
         );
-        $this->requestMock = $this->getMockBuilder(RequestInterface::class)->getMockForAbstractClass();
+        $this->requestMock = $this->getMockBuilder(RequestInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getServerValue'])
+            ->getMockForAbstractClass();
         $this->subjectMock = $this->getMockBuilder(AbstractAction::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();