ACP2E-2704: Getting Unable to send the cookie. Size of 'mage-messages' while trying to Reorder

Author: aplapana

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

@@ -12,6 +12,7 @@
 use Magento\Framework\Api\AttributeValueFactory;
 use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\DataObject;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Model\AbstractExtensibleModel;
 use Magento\Quote\Api\Data\PaymentInterface;
@@ -1619,7 +1620,7 @@ public function addItem(\Magento\Quote\Model\Quote\Item $item)
      * Add product. Returns error message if product type instance can't prepare product.
      *
      * @param mixed $product
-     * @param null|float|\Magento\Framework\DataObject $request
+     * @param null|float|DataObject $request
      * @param null|string $processMode
      * @return \Magento\Quote\Model\Quote\Item|string
      * @throws \Magento\Framework\Exception\LocalizedException
@@ -1637,11 +1638,12 @@ public function addProduct(
         if (is_numeric($request)) {
             $request = $this->objectFactory->create(['qty' => $request]);
         }
-        if (!$request instanceof \Magento\Framework\DataObject) {
+        if (!$request instanceof DataObject) {
             throw new \Magento\Framework\Exception\LocalizedException(
                 __('We found an invalid request for adding product to quote.')
             );
         }
+        $invalidProductAddFlag = $this->checkForInvalidProductAdd($request);
 
         if (!$product->isSalable()) {
             throw new \Magento\Framework\Exception\LocalizedException(
@@ -1699,7 +1701,7 @@ public function addProduct(
 
             // collect errors instead of throwing first one
             if ($item->getHasError()) {
-                if (!$request->getForceAddToCart()) {
+                if (!$invalidProductAddFlag) {
                     $this->deleteItem($item);
                 }
                 foreach ($item->getMessage(false) as $message) {
@@ -1719,6 +1721,20 @@ public function addProduct(
         return $parentItem;
     }
 
+    /**
+     * Checks if invalid products should be added to quote
+     *
+     * @param DataObject $request
+     * @return bool
+     */
+    private function checkForInvalidProductAdd(DataObject $request): bool
+    {
+        $forceAdd = $request->getAddToCartInvalidProduct();
+        $request->unsetData('add_to_cart_invalid_product');
+
+        return (bool) $forceAdd;
+    }
+
     /**
      * Adding catalog product object data to quote
      *
@@ -1774,8 +1790,8 @@ protected function _addCatalogProduct(\Magento\Catalog\Model\Product $product, $
      * For more options see \Magento\Catalog\Helper\Product->addParamsToBuyRequest()
      *
      * @param int $itemId
-     * @param \Magento\Framework\DataObject $buyRequest
-     * @param null|array|\Magento\Framework\DataObject $params
+     * @param DataObject $buyRequest
+     * @param null|array|DataObject $params
      * @return \Magento\Quote\Model\Quote\Item
      * @throws \Magento\Framework\Exception\LocalizedException
      *
@@ -1797,9 +1813,9 @@ public function updateItem($itemId, $buyRequest, $params = null)
         $product = clone $this->productRepository->getById($productId, false, $this->getStore()->getId());
 
         if (!$params) {
-            $params = new \Magento\Framework\DataObject();
+            $params = new DataObject();
         } elseif (is_array($params)) {
-            $params = new \Magento\Framework\DataObject($params);
+            $params = new DataObject($params);
         }
         $params->setCurrentConfig($item->getBuyRequest());
         $buyRequest = $this->_catalogProduct->addParamsToBuyRequest($buyRequest, $params);
@@ -2148,7 +2164,7 @@ protected function _clearErrorInfo()
      * @param string|null $origin Usually a name of module, that embeds error
      * @param int|null $code Error code, unique for origin, that sets it
      * @param string|null $message Error message
-     * @param \Magento\Framework\DataObject|null $additionalData Any additional data, that caller would like to store
+     * @param DataObject|null $additionalData Any additional data, that caller would like to store
      * @return $this
      */
     public function addErrorInfo(

app/code/Magento/Sales/Model/Reorder/Reorder.php

@@ -107,7 +107,7 @@ class Reorder
     /**
      * @var bool
      */
-    private bool $forceAdd;
+    private bool $addToCartInvalidProduct;
 
     /**
      * @param OrderFactory $orderFactory
@@ -118,7 +118,7 @@ class Reorder
      * @param LoggerInterface $logger
      * @param ProductCollectionFactory $productCollectionFactory
      * @param OrderInfoBuyRequestGetter $orderInfoBuyRequestGetter
-     * @param bool $forceAdd
+     * @param bool $addToCartInvalidProduct
      */
     public function __construct(
         OrderFactory $orderFactory,
@@ -129,7 +129,7 @@ public function __construct(
         LoggerInterface $logger,
         ProductCollectionFactory $productCollectionFactory,
         OrderInfoBuyRequestGetter $orderInfoBuyRequestGetter,
-        bool $forceAdd = false
+        bool $addToCartInvalidProduct = false
     ) {
         $this->orderFactory = $orderFactory;
         $this->cartRepository = $cartRepository;
@@ -139,7 +139,7 @@ public function __construct(
         $this->guestCartResolver = $guestCartResolver;
         $this->productCollectionFactory = $productCollectionFactory;
         $this->orderInfoBuyRequestGetter = $orderInfoBuyRequestGetter;
-        $this->forceAdd = $forceAdd;
+        $this->addToCartInvalidProduct = $addToCartInvalidProduct;
     }
 
     /**
@@ -272,7 +272,7 @@ private function addItemToCart(OrderItemInterface $orderItem, Quote $cart, Produ
 
         $addProductResult = null;
         try {
-            $infoBuyRequest->setForceAddToCart($this->forceAdd);
+            $infoBuyRequest->setAddToCartInvalidProduct($this->addToCartInvalidProduct);
             $addProductResult = $cart->addProduct($product, $infoBuyRequest);
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
             $this->addError($this->getCartItemErrorMessage($orderItem, $product, $e->getMessage()));

app/code/Magento/Sales/etc/di.xml

@@ -1038,9 +1038,4 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Sales\Model\Reorder\Reorder">
-        <arguments>
-            <argument name="forceAdd" xsi:type="boolean">true</argument>
-        </arguments>
-    </type>
 </config>

app/code/Magento/Sales/etc/frontend/di.xml

@@ -22,4 +22,9 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Sales\Model\Reorder\Reorder">
+        <arguments>
+            <argument name="addToCartInvalidProduct" xsi:type="boolean">true</argument>
+        </arguments>
+    </type>
 </config>

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

@@ -22,9 +22,4 @@
     <type name="Magento\Sales\Model\Service\InvoiceService">
         <plugin name="addTransactionCommentAfterCapture" type="Magento\Sales\Plugin\Model\Service\Invoice\AddTransactionCommentAfterCapture"/>
     </type>
-    <type name="Magento\Sales\Model\Reorder\Reorder">
-        <arguments>
-            <argument name="forceAdd" xsi:type="boolean">false</argument>
-        </arguments>
-    </type>
 </config>

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

@@ -22,9 +22,4 @@
     <type name="Magento\Sales\Model\Service\InvoiceService">
         <plugin name="addTransactionCommentAfterCapture" type="Magento\Sales\Plugin\Model\Service\Invoice\AddTransactionCommentAfterCapture"/>
     </type>
-    <type name="Magento\Sales\Model\Reorder\Reorder">
-        <arguments>
-            <argument name="forceAdd" xsi:type="boolean">false</argument>
-        </arguments>
-    </type>
 </config>