ACP2E-4312: Cross-Website Guest Order Assignment Bug in MergeGuestOrder Plugin

Author: aplapana

app/code/Magento/CustomerGraphQl/Model/GetGuestOrdersByEmail.php

@@ -7,39 +7,51 @@
 
 namespace Magento\CustomerGraphQl\Model;
 
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Model\Config\Share;
 use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\Sales\Api\Data\OrderSearchResultInterface;
 
 class GetGuestOrdersByEmail
 {
     /**
      * @param OrderRepositoryInterface $orderRepository
+     * @param ScopeConfigInterface $scopeConfig
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
      */
     public function __construct(
         private readonly OrderRepositoryInterface $orderRepository,
-        private SearchCriteriaBuilder $searchCriteriaBuilder
+        private readonly ScopeConfigInterface $scopeConfig,
+        private readonly SearchCriteriaBuilder $searchCriteriaBuilder
     ) {
     }
 
     /**
      * Retrieve customer orders collection
      *
-     * @param string $email
+     * @param CustomerInterface $customer
      * @return OrderSearchResultInterface
      */
-    public function execute(string $email): OrderSearchResultInterface
+    public function execute(CustomerInterface $customer): OrderSearchResultInterface
     {
-        $this->searchCriteriaBuilder->addFilter(
-            'customer_email',
-            $email,
-            'eq'
-        )->addFilter(
-            'customer_is_guest',
-            1,
-            'eq'
+        $this->searchCriteriaBuilder
+            ->addFilter('customer_email', $customer->getEmail())
+            ->addFilter('customer_is_guest', 1);
+
+        $customerAccountShareScope = (int)$this->scopeConfig->getValue(
+            Share::XML_PATH_CUSTOMER_ACCOUNT_SHARE,
+            ScopeConfigInterface::SCOPE_TYPE_DEFAULT
         );
+
+        if ($customerAccountShareScope === Share::SHARE_WEBSITE) {
+            $this->searchCriteriaBuilder->addFilter(
+                'store_id',
+                $customer->getStoreId()
+            );
+        }
+
         return $this->orderRepository->getList($this->searchCriteriaBuilder->create());
     }
 }

app/code/Magento/CustomerGraphQl/Plugin/Model/MergeGuestOrder.php

@@ -33,7 +33,7 @@ public function __construct(
      */
     public function afterCreateAccount(AccountManagement $subject, CustomerInterface $customer)
     {
-        $searchResult = $this->getGuestOrdersByEmail->execute($customer->getEmail());
+        $searchResult = $this->getGuestOrdersByEmail->execute($customer);
         foreach ($searchResult->getItems() as $order) {
             $this->customerAssignment->execute($order, $customer);
         }