Merge remote-tracking branch 'mainline/2.4.2-develop' into MC-39744-graphql-store-group

Author: cpartica

app/code/Magento/Paypal/Controller/Express/GetTokenData.php

@@ -168,6 +168,25 @@ public function execute(): ResultInterface
         return $controllerResult->setData($responseContent);
     }
 
+    /**
+     * Prepare quote specified for checkout.
+     *
+     * @return \Magento\Quote\Api\Data\CartInterface
+     * @throws LocalizedException
+     */
+    private function prepareQuote()
+    {
+        $quoteId = $this->getRequest()->getParam('quote_id');
+        if ($quoteId) {
+            $quote = $this->userContext->getUserId()
+                ? $this->cartRepository->get($quoteId)
+                : $this->guestCartRepository->get($quoteId);
+            if ((int)$quote->getCustomer()->getId() === (int)$this->userContext->getUserId()) {
+                return $quote;
+            }
+        }
+        return $this->_getQuote();
+    }
     /**
      * Get paypal token
      *
@@ -176,7 +195,7 @@ public function execute(): ResultInterface
      */
     private function getToken(): ?string
     {
-        $quote = $this->_getQuote();
+        $quote = $this->prepareQuote();
         $this->_initCheckout($quote);
 
         if ($quote->getIsMultiShipping()) {