ACP2E-4137: [Cloud] No such entity with cartId

Author: soklymeach

app/code/Magento/Checkout/Model/Session.php

@@ -277,9 +277,7 @@ public function getQuote()
                      * need recalculate totals of quote. It is possible if customer use currency switcher or
                      * store switcher.
                      */
-                    $currencyCode = $quote->getQuoteCurrencyCode();
-                    $currentCurrency = $this->_storeManager->getStore()->getCurrentCurrencyCode();
-                    if ($currencyCode !== null && $currencyCode !== $currentCurrency) {
+                    if ($quote->getQuoteCurrencyCode() != $this->_storeManager->getStore()->getCurrentCurrencyCode()) {
                         $quote->setStore($this->_storeManager->getStore());
                         $this->quoteRepository->save($quote->collectTotals());
                         /*

app/code/Magento/Checkout/Test/Unit/Model/SessionTest.php

@@ -434,24 +434,20 @@ public function testGetQuote(): void
         $customerSession = $this->createMock(\Magento\Customer\Model\Session::class);
         $quoteRepository = $this->getMockForAbstractClass(CartRepositoryInterface::class);
         $quoteFactory = $this->createMock(QuoteFactory::class);
-        $quote = $this->getMockBuilder(Quote::class)
-            ->disableOriginalConstructor()
-            ->addMethods(['getQuoteCurrencyCode', 'getTotalsCollectedFlag'])
-            ->onlyMethods(['collectTotals', 'setCustomer'])
-            ->getMock();
+        $quote = $this->createMock(Quote::class);
         $logger = $this->getMockForAbstractClass(LoggerInterface::class);
         $loggerMethods = get_class_methods(LoggerInterface::class);
 
         $quoteFactory->expects($this->once())
             ->method('create')
             ->willReturn($quote);
-        $customerSession->expects($this->exactly(2))->method('isLoggedIn')->willReturn(true);
+        $customerSession->expects($this->exactly(3))
+            ->method('isLoggedIn')
+            ->willReturn(true);
         $store = $this->getMockBuilder(Store::class)
             ->disableOriginalConstructor()
-            ->onlyMethods(['getWebsiteId', 'getCurrentCurrencyCode'])
+            ->onlyMethods(['getWebsiteId'])
             ->getMock();
-        $store->expects($this->any())->method('getWebsiteId')->willReturn(1);
-        $store->expects($this->any())->method('getCurrentCurrencyCode')->willReturn('USD');
         $storeManager->expects($this->any())
             ->method('getStore')
             ->willReturn($store);
@@ -461,24 +457,18 @@ public function testGetQuote(): void
             ->getMock();
         $storage
             ->method('getData')
-            ->willReturnCallback(function ($key) {
-                if ($key === 'quote_id_1') {
-                    return 123;
-                }
-                return null;
-            });
+            ->willReturnOnConsecutiveCalls(null, null, 1);
         $quoteRepository->expects($this->once())
-            ->method('getActive')
-            ->with(123)
-            ->willReturn($quote);
+            ->method('getActiveForCustomer')
+            ->willThrowException(new NoSuchEntityException());
 
         foreach ($loggerMethods as $method) {
             $logger->expects($this->never())->method($method);
         }
-        $quote->expects($this->once())->method('getQuoteCurrencyCode')->willReturn(null);
-        $quote->expects($this->once())->method('getTotalsCollectedFlag')->willReturn(false);
-        $quote->expects($this->once())->method('collectTotals')->willReturnSelf();
-        $quote->expects($this->once())->method('setCustomer')->with(null);
+
+        $quote->expects($this->once())
+            ->method('setCustomer')
+            ->with(null);
 
         $constructArguments = $this->helper->getConstructArguments(
             Session::class,

app/code/Magento/LoginAsCustomerFrontendUi/Controller/Login/Index.php

@@ -20,6 +20,7 @@
 use Magento\LoginAsCustomerApi\Api\GetAuthenticationDataBySecretInterface;
 use Magento\LoginAsCustomerApi\Api\AuthenticateCustomerBySecretInterface;
 use Psr\Log\LoggerInterface;
+use Magento\Checkout\Model\Session as CheckoutSession;
 
 /**
  * Login as Customer storefront login action
@@ -68,6 +69,11 @@ class Index implements HttpGetActionInterface
      */
     private $customerSession;
 
+    /**
+     * @var CheckoutSession
+     */
+    private $checkoutSession;
+
     /**
      * @param ResultFactory $resultFactory
      * @param RequestInterface $request
@@ -77,6 +83,7 @@ class Index implements HttpGetActionInterface
      * @param ManagerInterface $messageManager
      * @param LoggerInterface $logger
      * @param Session|null $customerSession
+     * @param CheckoutSession|null $checkoutSession
      */
     public function __construct(
         ResultFactory $resultFactory,
@@ -86,7 +93,8 @@ public function __construct(
         AuthenticateCustomerBySecretInterface $authenticateCustomerBySecret,
         ManagerInterface $messageManager,
         LoggerInterface $logger,
-        ?Session $customerSession = null
+        ?Session $customerSession = null,
+        ?CheckoutSession $checkoutSession = null
     ) {
         $this->resultFactory = $resultFactory;
         $this->request = $request;
@@ -96,6 +104,8 @@ public function __construct(
         $this->messageManager = $messageManager;
         $this->logger = $logger;
         $this->customerSession = $customerSession ?? ObjectManager::getInstance()->get(Session::class);
+        $this->checkoutSession = $checkoutSession
+            ?? ObjectManager::getInstance()->get(CheckoutSession::class);
     }
 
     /**
@@ -109,6 +119,10 @@ public function execute(): ResultInterface
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
 
         $secret = $this->request->getParam('secret');
+        if ($this->checkoutSession->getQuoteId()) {
+            $this->checkoutSession->clearQuote();
+            $this->checkoutSession->clearStorage();
+        }
         try {
             $this->authenticateCustomerBySecret->execute($secret);
             $customer = $this->customerSession->getCustomer();