LYNX-643 Save in address book does not work when using setBillingAddressOnCart GQL's same_as_shipping field

Author: cod40403

app/code/Magento/QuoteGraphQl/Plugin/CustomerManagementPlugin.php

@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Plugin;
+
+use Exception;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Quote\Model\CustomerManagement as Subject;
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Quote\Model\Quote;
+
+class CustomerManagementPlugin
+{
+    /**
+     * CustomerManagementPlugin Constructor
+     *
+     * @param AddressRepositoryInterface $addressRepository
+     */
+    public function __construct(
+        private readonly AddressRepositoryInterface $addressRepository,
+    ) {
+    }
+
+    /**
+     * Save shipping address in address book if same as billing
+     *
+     * @param Subject $subject
+     * @param Quote $quote
+     * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+     * @throws LocalizedException
+     */
+    public function beforePopulateCustomerInfo(
+        Subject $subject,
+        Quote $quote
+    ): array {
+        try {
+            $shippingAddress = $quote->getShippingAddress();
+
+            if ($shippingAddress->getSaveInAddressBook()
+                && $shippingAddress->getQuoteId()
+                && $shippingAddress->getSameAsBilling()
+            ) {
+                $shippingAddressData = $shippingAddress->exportCustomerAddress();
+                $shippingAddressData->setCustomerId($quote->getCustomerId());
+                $this->addressRepository->save($shippingAddressData);
+                $quote->addCustomerAddress($shippingAddressData);
+                $shippingAddress->setCustomerAddressData($shippingAddressData);
+                $shippingAddress->setCustomerAddressId($shippingAddressData->getId());
+            }
+        } catch (Exception $e) {
+            throw new LocalizedException(__($e->getMessage()));
+        }
+
+        return [$quote];
+    }
+}

app/code/Magento/QuoteGraphQl/etc/graphql/di.xml

@@ -92,4 +92,8 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Quote\Model\CustomerManagement">
+        <plugin name="billing_address_save_same_as_shipping"
+                type="Magento\QuoteGraphQl\Plugin\CustomerManagementPlugin"/>
+    </type>
 </config>

dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -1871,7 +1871,7 @@ public function testSetBillingAddressAndPlaceOrder()
         $searchCriteria = $this->searchCriteriaBuilder->addFilter('parent_id', $customer->getId())->create();
         $addresses = $this->customerAddressRepository->getList($searchCriteria)->getItems();
 
-        self::assertCount(1, $addresses);
+        self::assertCount(2, $addresses);
         self::assertArrayHasKey('cart', $response['setBillingAddressOnCart']);
         foreach ($addresses as $address) {
             $this->customerAddressRepository->delete($address);
@@ -1953,7 +1953,7 @@ public function testSetBillingAddressWithDefaultValueOfSaveInAddressBookAndPlace
         $searchCriteria = $this->searchCriteriaBuilder->addFilter('parent_id', $customer->getId())->create();
         $addresses = $this->customerAddressRepository->getList($searchCriteria)->getItems();
 
-        $this->assertCount(1, $addresses);
+        $this->assertCount(2, $addresses);
         $this->assertArrayHasKey('cart', $response['setBillingAddressOnCart']);
         foreach ($addresses as $address) {
             $this->customerAddressRepository->delete($address);