Revert "AC-15054: Product Add to Cart issue in Rest API"

This reverts commit 4374e7f.

Author: sumesh-GL

app/code/Magento/Quote/Plugin/UpdateCartId.php

@@ -1,99 +1,51 @@
 <?php
 /**
- * Copyright 2025 Adobe
- * All Rights Reserved.
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 declare(strict_types=1);
 
 namespace Magento\Quote\Plugin;
 
-use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Webapi\Rest\Request as RestRequest;
 use Magento\Quote\Api\Data\CartItemInterface;
 use Magento\Quote\Api\GuestCartItemRepositoryInterface;
-use Magento\Quote\Model\QuoteIdMaskFactory;
-use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Update cart id from request param
  */
 class UpdateCartId
 {
+    /**
+     * @var RestRequest $request
+     */
+    private $request;
+
     /**
      * @param RestRequest $request
-     * @param ProductRepositoryInterface $productRepository
-     * @param StoreManagerInterface $storeManager
-     * @param QuoteIdMaskFactory $quoteIdMaskFactory
      */
-    public function __construct(
-        private readonly RestRequest $request,
-        private readonly ProductRepositoryInterface $productRepository,
-        private readonly StoreManagerInterface      $storeManager,
-        private readonly QuoteIdMaskFactory         $quoteIdMaskFactory
-    ) {
+    public function __construct(RestRequest $request)
+    {
+        $this->request = $request;
     }
 
     /**
      * Update id from request if param cartId exist
      *
      * @param GuestCartItemRepositoryInterface $guestCartItemRepository
      * @param CartItemInterface $cartItem
-     * @return array
+     * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function beforeSave(
         GuestCartItemRepositoryInterface $guestCartItemRepository,
         CartItemInterface $cartItem
-    ): array {
+    ): void {
         $cartId = $this->request->getParam('cartId');
 
         if ($cartId) {
             $cartItem->setQuoteId($cartId);
         }
-        $this->validateProductWebsiteAssignment($cartItem);
-        return [$cartItem];
-    }
-
-    /**
-     * Validate that product is assigned to the current website
-     *
-     * @param CartItemInterface $cartItem
-     * @throws LocalizedException
-     * @throws NoSuchEntityException
-     */
-    private function validateProductWebsiteAssignment(CartItemInterface $cartItem): void
-    {
-        $sku = $cartItem->getSku();
-        if (!$sku) {
-            return;
-        }
-
-        // Get current website ID from the masked cart ID
-        $maskedQuoteId = $cartItem->getQuoteId();
-        $quoteIdMask = $this->quoteIdMaskFactory->create()->load($maskedQuoteId, 'masked_id');
-
-        if (!$quoteIdMask->getQuoteId()) {
-            return;
-        }
-        $currentWebsiteId = $this->storeManager->getStore()->getWebsiteId();
-        try {
-            $product = $this->productRepository->get($sku, false, null);
-
-            $productWebsiteIds = $product->getWebsiteIds();
-
-            // Validate website assignment
-            if (!is_array($productWebsiteIds) || !in_array($currentWebsiteId, $productWebsiteIds)) {
-                throw new LocalizedException(
-                    __('Product that you are trying to add is not available.')
-                );
-            }
-        } catch (NoSuchEntityException $e) {
-            throw new LocalizedException(
-                __('Product that you are trying to add is not available.')
-            );
-        }
     }
 }

app/code/Magento/Quote/etc/webapi_rest/di.xml

@@ -23,6 +23,11 @@
     <type name="Magento\Quote\Model\QuoteValidator">
         <plugin name="error_redirect_processor" type="Magento\Quote\Plugin\Webapi\Model\ErrorRedirectProcessor" />
     </type>
+    <type name="Magento\Quote\Api\GuestCartItemRepositoryInterface">
+        <plugin name="validateProductWebsiteAssignmentGuest"
+                type="Magento\Quote\Plugin\Webapi\ValidateProductWebsiteAssignmentForGuest"
+                sortOrder="100" />
+    </type>
     <type name="Magento\Quote\Api\CartItemRepositoryInterface">
         <plugin name="validateProductWebsiteAssignment"
                 type="Magento\Quote\Plugin\Webapi\ValidateProductWebsiteAssignment"