MC-37109: Session Cache Local Storage | Checkout Issue

Author: serhii-balko

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

@@ -5,6 +5,7 @@
  */
 namespace Magento\Persistent\Model;
 
+use Magento\Customer\Api\Data\CustomerInterfaceFactory;
 use Magento\Customer\Api\Data\GroupInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Persistent\Helper\Data;
@@ -64,21 +65,28 @@ class QuoteManager
      */
     private $cartExtensionFactory;
 
+    /**
+     * @var CustomerInterfaceFactory
+     */
+    private $customerDataFactory;
+
     /**
      * @param \Magento\Persistent\Helper\Session $persistentSession
      * @param Data $persistentData
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param CartRepositoryInterface $quoteRepository
      * @param CartExtensionFactory|null $cartExtensionFactory
      * @param ShippingAssignmentProcessor|null $shippingAssignmentProcessor
+     * @param CustomerInterfaceFactory|null $customerDataFactory
      */
     public function __construct(
         \Magento\Persistent\Helper\Session $persistentSession,
         Data $persistentData,
         \Magento\Checkout\Model\Session $checkoutSession,
         CartRepositoryInterface $quoteRepository,
         ?CartExtensionFactory $cartExtensionFactory = null,
-        ?ShippingAssignmentProcessor $shippingAssignmentProcessor = null
+        ?ShippingAssignmentProcessor $shippingAssignmentProcessor = null,
+        ?CustomerInterfaceFactory $customerDataFactory = null
     ) {
         $this->persistentSession = $persistentSession;
         $this->persistentData = $persistentData;
@@ -88,6 +96,8 @@ public function __construct(
             ?? ObjectManager::getInstance()->get(CartExtensionFactory::class);
         $this->shippingAssignmentProcessor = $shippingAssignmentProcessor
             ?? ObjectManager::getInstance()->get(ShippingAssignmentProcessor::class);
+        $this->customerDataFactory = $customerDataFactory
+            ?? ObjectManager::getInstance()->get(CustomerInterfaceFactory::class);
     }
 
     /**
@@ -109,14 +119,11 @@ public function setGuest($checkQuote = false)
             $quote->getPaymentsCollection()->walk('delete');
             $quote->getAddressesCollection()->walk('delete');
             $this->_setQuotePersistent = false;
+            $this->cleanCustomerData($quote);
             $quote->setIsActive(true)
-                ->setCustomerId(null)
-                ->setCustomerEmail(null)
-                ->setCustomerFirstname(null)
-                ->setCustomerLastname(null)
-                ->setCustomerGroupId(GroupInterface::NOT_LOGGED_IN_ID)
                 ->setIsPersistent(false)
                 ->removeAllAddresses();
+
             //Create guest addresses
             $quote->getShippingAddress();
             $quote->getBillingAddress();
@@ -129,6 +136,27 @@ public function setGuest($checkQuote = false)
         $this->persistentSession->setSession(null);
     }
 
+    /**
+     * Clear customer data in quote
+     *
+     * @param Quote $quote
+     */
+    private function cleanCustomerData($quote)
+    {
+        /**
+         * Set empty customer object in quote to avoid restore customer id
+         * @see Quote::beforeSave()
+         */
+        if ($quote->getCustomerId()) {
+            $quote->setCustomer($this->customerDataFactory->create());
+        }
+        $quote->setCustomerId(null)
+            ->setCustomerEmail(null)
+            ->setCustomerFirstname(null)
+            ->setCustomerLastname(null)
+            ->setCustomerGroupId(GroupInterface::NOT_LOGGED_IN_ID);
+    }
+
     /**
      * Emulate guest cart with persistent cart
      *

app/code/Magento/Persistent/Test/Unit/Model/QuoteManagerTest.php

@@ -9,6 +9,8 @@
 namespace Magento\Persistent\Test\Unit\Model;
 
 use Magento\Checkout\Model\Session;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Api\Data\CustomerInterfaceFactory;
 use Magento\Customer\Model\GroupManagement;
 use Magento\Eav\Model\Entity\Collection\AbstractCollection;
 use Magento\Persistent\Helper\Data;
@@ -78,6 +80,11 @@ class QuoteManagerTest extends TestCase
      */
     private $shippingAssignmentProcessor;
 
+    /**
+     * @var CustomerInterfaceFactory|MockObject
+     */
+    private $customerDataFactory;
+
     protected function setUp(): void
     {
         $this->persistentSessionMock = $this->createMock(\Magento\Persistent\Helper\Session::class);
@@ -124,21 +131,24 @@ protected function setUp(): void
                 'getItemsQty',
                 'getExtensionAttributes',
                 'setExtensionAttributes',
-                '__wakeup'
+                '__wakeup',
+                'setCustomer'
             ])
             ->disableOriginalConstructor()
             ->getMock();
 
         $this->cartExtensionFactory = $this->createPartialMock(CartExtensionFactory::class, ['create']);
         $this->shippingAssignmentProcessor = $this->createPartialMock(ShippingAssignmentProcessor::class, ['create']);
+        $this->customerDataFactory = $this->createMock(CustomerInterfaceFactory::class);
 
         $this->model = new QuoteManager(
             $this->persistentSessionMock,
             $this->persistentDataMock,
             $this->checkoutSessionMock,
             $this->quoteRepositoryMock,
             $this->cartExtensionFactory,
-            $this->shippingAssignmentProcessor
+            $this->shippingAssignmentProcessor,
+            $this->customerDataFactory
         );
     }
 
@@ -189,6 +199,7 @@ public function testSetGuestWhenShoppingCartAndQuoteAreNotPersistent()
 
     public function testSetGuest()
     {
+        $customerId = 22;
         $this->checkoutSessionMock->expects($this->once())
             ->method('getQuote')->willReturn($this->quoteMock);
         $this->quoteMock->expects($this->once())->method('getId')->willReturn(11);
@@ -220,6 +231,7 @@ public function testSetGuest()
             ->method('getShippingAddress')->willReturn($quoteAddressMock);
         $this->quoteMock->expects($this->once())
             ->method('getBillingAddress')->willReturn($quoteAddressMock);
+        $this->quoteMock->method('getCustomerId')->willReturn($customerId);
         $this->quoteMock->expects($this->once())->method('collectTotals')->willReturn($this->quoteMock);
         $this->quoteRepositoryMock->expects($this->once())->method('save')->with($this->quoteMock);
         $this->persistentSessionMock->expects($this->once())
@@ -229,7 +241,6 @@ public function testSetGuest()
         $this->quoteMock->expects($this->once())->method('isVirtual')->willReturn(false);
         $this->quoteMock->expects($this->once())->method('getItemsQty')->willReturn(1);
         $extensionAttributes = $this->getMockBuilder(CartExtensionInterface::class)
-            ->addMethods(['getShippingAssignments', 'setShippingAssignments'])
             ->getMockForAbstractClass();
         $shippingAssignment = $this->createMock(ShippingAssignmentInterface::class);
         $extensionAttributes->expects($this->once())
@@ -248,6 +259,11 @@ public function testSetGuest()
         $this->quoteMock->expects($this->once())
             ->method('setExtensionAttributes')
             ->with($extensionAttributes);
+        $customerMock = $this->createMock(CustomerInterface::class);
+        $this->customerDataFactory->method('create')->willReturn($customerMock);
+        $this->quoteMock->expects($this->once())
+            ->method('setCustomer')
+            ->with($customerMock);
         $this->model->setGuest(false);
     }