Merge remote-tracking branch 'l3/MC-38900' into BUGFIX-11-23

Author: dhorytskyi

app/code/Magento/Quote/Model/Quote/Address.php

@@ -139,7 +139,7 @@ class Address extends AbstractAddress implements
     const ADDRESS_TYPE_BILLING = 'billing';
 
     const ADDRESS_TYPE_SHIPPING = 'shipping';
-    
+
     private const CACHED_ITEMS_ALL = 'cached_items_all';
 
     /**
@@ -1653,7 +1653,7 @@ public function setCustomerId($customerId)
     public function getEmail()
     {
         $email = $this->getData(self::KEY_EMAIL);
-        if (!$email && $this->getQuote()) {
+        if ($this->getQuote() && (!$email || $this->getQuote()->dataHasChangedFor('customer_email'))) {
             $email = $this->getQuote()->getCustomerEmail();
             $this->setEmail($email);
         }

dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetGuestEmailOnCartTest.php

@@ -8,6 +8,9 @@
 namespace Magento\GraphQl\Quote\Guest;
 
 use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
+use Magento\Quote\Model\Quote\Address;
+use Magento\Quote\Model\QuoteFactory;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
@@ -21,10 +24,22 @@ class SetGuestEmailOnCartTest extends GraphQlAbstract
      */
     private $getMaskedQuoteIdByReservedOrderId;
 
+    /**
+     * @var QuoteFactory
+     */
+    private $quoteFactory;
+
+    /**
+     * @var QuoteResource
+     */
+    private $quoteResource;
+
     protected function setUp(): void
     {
         $objectManager = Bootstrap::getObjectManager();
         $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
+        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
+        $this->quoteResource = $objectManager->get(QuoteResource::class);
     }
 
     /**
@@ -43,6 +58,33 @@ public function testSetGuestEmailOnCart()
         $this->assertEquals($email, $response['setGuestEmailOnCart']['cart']['email']);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     */
+    public function testSetGuestEmailOnCartWithDifferentEmailAddress()
+    {
+        $reservedOrderId = 'test_quote';
+        $secondEmail = 'attempt2@example.com';
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
+
+        $email = 'attempt1@example.com';
+        $query = $this->getQuery($maskedQuoteId, $email);
+        $this->graphQlMutation($query);
+
+        $query = $this->getQuery($maskedQuoteId, $secondEmail);
+        $this->graphQlMutation($query);
+
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, $reservedOrderId, 'reserved_order_id');
+        $addresses = $quote->getAddressesCollection();
+        $this->assertEquals(2, $addresses->count());
+        foreach ($addresses as $address) {
+            if ($address->getAddressType() === Address::ADDRESS_TYPE_SHIPPING) {
+                $this->assertEquals($secondEmail, $address->getEmail());
+            }
+        }
+    }
+
     /**
      * _security
      * @magentoApiDataFixture Magento/Customer/_files/customer.php