MC-37109: Session Cache Local Storage | Checkout Issue

Author: serhii-balko

app/code/Magento/Persistent/Model/QuoteManager.php

@@ -108,9 +108,6 @@ public function __construct(
      */
     public function setGuest($checkQuote = false)
     {
-        $this->persistentSession->getSession()->removePersistentCookie();
-        $this->persistentSession->setSession(null);
-
         /** @var $quote Quote */
         $quote = $this->checkoutSession->getQuote();
         if ($quote && $quote->getId()) {
@@ -134,6 +131,9 @@ public function setGuest($checkQuote = false)
             $quote->collectTotals();
             $this->quoteRepository->save($quote);
         }
+
+        $this->persistentSession->getSession()->removePersistentCookie();
+        $this->persistentSession->setSession(null);
     }
 
     /**

app/code/Magento/Persistent/Observer/RemoveGuestPersistenceOnEmptyCartObserver.php

@@ -96,6 +96,8 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         }
 
         if (!$cart || $cart->getItemsCount() == 0) {
+            $this->customerSession->setCustomerId(null)
+                ->setCustomerGroupId(null);
             $this->quoteManager->setGuest();
         }
     }

app/code/Magento/Persistent/Test/Unit/Observer/RemoveGuestPersistenceOnEmptyCartObserverTest.php

@@ -137,6 +137,13 @@ public function testExecuteWithEmptyCart()
             ->with($customerId)
             ->willReturn($quoteMock);
         $quoteMock->expects($this->once())->method('getItemsCount')->willReturn($emptyCount);
+        $this->customerSessionMock->expects($this->once())
+            ->method('setCustomerId')
+            ->with(null)
+            ->willReturnSelf();
+        $this->customerSessionMock->expects($this->once())
+            ->method('setCustomerGroupId')
+            ->with(null);
         $this->quoteManagerMock->expects($this->once())->method('setGuest');
 
         $this->model->execute($this->observerMock);
@@ -160,6 +167,13 @@ public function testExecuteWithNonexistentCart()
             ->method('getActiveForCustomer')
             ->with($customerId)
             ->willThrowException($exception);
+        $this->customerSessionMock->expects($this->once())
+            ->method('setCustomerId')
+            ->with(null)
+            ->willReturnSelf();
+        $this->customerSessionMock->expects($this->once())
+            ->method('setCustomerGroupId')
+            ->with(null);
         $this->quoteManagerMock->expects($this->once())->method('setGuest');
 
         $this->model->execute($this->observerMock);