Merge branch 'ACP2E-3343' of https://github.com/adobe-commerce-tier-4/magento2ce into PR-14-10-2024

Author: chittima

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

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\Quote\Model;
@@ -14,7 +14,6 @@
 use Magento\Quote\Model\Quote as QuoteEntity;
 use Magento\Quote\Model\Quote\Validator\MinimumOrderAmount\ValidationMessage as OrderAmountValidationMessage;
 use Magento\Quote\Model\ValidationRules\QuoteValidationRuleInterface;
-use Magento\Framework\Webapi\Rest\Response as RestResponse;
 
 /**
  * Class to validate the quote
@@ -44,32 +43,24 @@ class QuoteValidator
      */
     private $quoteValidationRule;
 
-    /**
-     * @var RestResponse
-     */
-    private $_response;
-
     /**
      * QuoteValidator constructor.
      *
      * @param AllowedCountries|null $allowedCountryReader
      * @param OrderAmountValidationMessage|null $minimumAmountMessage
      * @param QuoteValidationRuleInterface|null $quoteValidationRule
-     * @param RestResponse|null $response
      */
     public function __construct(
         AllowedCountries $allowedCountryReader = null,
         OrderAmountValidationMessage $minimumAmountMessage = null,
-        QuoteValidationRuleInterface $quoteValidationRule = null,
-        RestResponse $response = null
+        QuoteValidationRuleInterface $quoteValidationRule = null
     ) {
         $this->allowedCountryReader = $allowedCountryReader ?: ObjectManager::getInstance()
             ->get(AllowedCountries::class);
         $this->minimumAmountMessage = $minimumAmountMessage ?: ObjectManager::getInstance()
             ->get(OrderAmountValidationMessage::class);
         $this->quoteValidationRule = $quoteValidationRule ?: ObjectManager::getInstance()
             ->get(QuoteValidationRuleInterface::class);
-        $this->_response = $response ?: ObjectManager::getInstance()->get(RestResponse::class);
     }
 
     /**
@@ -115,7 +106,6 @@ public function validateBeforeSubmit(QuoteEntity $quote)
                 $defaultMessage .= ' %1';
             }
             if ($defaultMessage) {
-                $this->_response->setHeader('errorRedirectAction', '#shipping');
                 throw new ValidatorException(__($defaultMessage, implode(' ', $messages)));
             }
         }

app/code/Magento/Quote/Plugin/Webapi/Model/ErrorRedirectProcessor.php

@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\Quote\Plugin\Webapi\Model;
+
+use Magento\Framework\Validator\Exception as ValidatorException;
+use Magento\Framework\Webapi\Rest\Response as RestResponse;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\QuoteValidator;
+
+class ErrorRedirectProcessor
+{
+    /**
+     * @param RestResponse $restResponse
+     */
+    public function __construct(
+        private readonly RestResponse $restResponse
+    ) {
+    }
+
+    /**
+     * Set errorRedirectAction in case of exception.
+     *
+     * @param QuoteValidator $subject
+     * @param callable $proceed
+     * @param Quote $quote
+     */
+    public function aroundValidateBeforeSubmit(QuoteValidator $subject, callable $proceed, Quote $quote)
+    {
+        try {
+            $result = $proceed($quote);
+        } catch (ValidatorException $e) {
+            $this->restResponse->setHeader('errorRedirectAction', '#shipping');
+            throw $e;
+        }
+
+        return $result;
+    }
+}

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

@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
@@ -23,4 +23,7 @@
     <type name="Magento\Quote\Api\CartRepositoryInterface">
         <plugin name="quoteValidateOrderId" type="Magento\Quote\Plugin\ValidateQuoteOrigOrder"/>
     </type>
+    <type name="Magento\Quote\Model\QuoteValidator">
+        <plugin name="error_redirect_processor" type="Magento\Quote\Plugin\Webapi\Model\ErrorRedirectProcessor" />
+    </type>
 </config>

dev/tests/integration/testsuite/Magento/Framework/App/FrontControllerTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2013 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Framework\App;
 
@@ -18,6 +18,7 @@
  * @SuppressWarnings(PHPMD.UnusedFormalParameter)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @magentoAppArea frontend
+ * @magentoAppIsolation enabled
  */
 class FrontControllerTest extends TestCase
 {
@@ -118,4 +119,24 @@ public function testInvalidRequest()
             $this->_model->dispatch($request)
         );
     }
+
+    public function testDispatchWithAcceptHeader(): void
+    {
+        if (!Bootstrap::canTestHeaders()) {
+            $this->markTestSkipped('Can\'t test dispatch process without sending headers');
+        }
+
+        $this->fakeRequestValidator->valid = true;
+        $_SERVER['HTTP_HOST'] = 'localhost';
+        $this->_objectManager->get(State::class)->setAreaCode('frontend');
+        $request = $this->_objectManager->get(HttpRequest::class);
+        $request->setRequestUri('/checkout');
+        $headers = $request->getHeaders();
+        $headers->addHeaderLine('Accept', 'text/html');
+        $request->setHeaders($headers);
+        $this->assertInstanceOf(
+            ResultInterface::class,
+            $this->_model->dispatch($request)
+        );
+    }
 }