Merge branch 'ACP2E-3541' of https://github.com/adobe-commerce-tier-4/magento2ce into PR-03-17-2025

Author: chittima

app/code/Magento/Checkout/view/frontend/web/js/model/error-processor.js

@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 
 /**
@@ -24,7 +24,11 @@ define([
             messageContainer = messageContainer || globalMessageList;
 
             if (response.status == 401) { //eslint-disable-line eqeqeq
-                this.redirectTo(url.build('customer/account/login/'));
+                error = {
+                    message: $t('You are not authorized to access this resource.')
+                };
+                messageContainer.addErrorMessage(error);
+                this.redirectTo(url.build('customer/account/login/'), 2000);
             } else {
                 try {
                     error = JSON.parse(response.responseText);
@@ -40,8 +44,10 @@ define([
         /**
          * Method to redirect by requested URL.
          */
-        redirectTo: function (redirectUrl) {
-            window.location.replace(redirectUrl);
+        redirectTo: function (redirectUrl, delay = 0) {
+            setTimeout(() => {
+                window.location.replace(redirectUrl);
+            }, delay);
         }
     };
 });

app/code/Magento/Theme/etc/adminhtml/di.xml

@@ -37,4 +37,7 @@
         <plugin name="validate_design_config"
                 type="Magento\Theme\Plugin\DesignProcessorFacade"/>
     </type>
+    <type name="Magento\Framework\App\ActionInterface">
+        <plugin name="designLoader" type="Magento\Theme\Plugin\LoadDesignPlugin"/>
+    </type>
 </config>

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

@@ -106,9 +106,6 @@
             <argument name="scope" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
         </arguments>
     </virtualType>
-    <type name="Magento\Framework\App\ActionInterface">
-        <plugin name="designLoader" type="Magento\Theme\Plugin\LoadDesignPlugin"/>
-    </type>
     <type name="Magento\Framework\View\Element\UiComponent\DataProvider\CollectionFactory">
         <arguments>
              <argument name="collections" xsi:type="array">

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

@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -35,4 +35,7 @@
             <argument name="filePath" xsi:type="string">css/critical.css</argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\App\ActionInterface">
+        <plugin name="designLoader" type="Magento\Theme\Plugin\LoadDesignPlugin"/>
+    </type>
 </config>

dev/tests/api-functional/testsuite/Magento/Quote/Api/GuestShipmentEstimationTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2016 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Quote\Api;
 
@@ -11,9 +11,9 @@
 
 class GuestShipmentEstimationTest extends WebapiAbstract
 {
-    const SERVICE_VERSION = 'V1';
-    const SERVICE_NAME = 'quoteGuestShipmentEstimationV1';
-    const RESOURCE_PATH = '/V1/guest-carts/';
+    public const SERVICE_VERSION = 'V1';
+    public const SERVICE_NAME = 'quoteGuestShipmentEstimationV1';
+    public const RESOURCE_PATH = '/V1/guest-carts/';
 
     /**
      * @var ObjectManager
@@ -25,6 +25,33 @@ protected function setUp(): void
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
     }
 
+    /**
+     * @return void
+     */
+    public function testNotAuthorized(): void
+    {
+        $this->_markTestAsRestOnly();
+        $serviceInfo = [
+            'rest' => [
+                'resourcePath' => '/V1/carts/mine/estimate-shipping-methods',
+                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST,
+                'token' => null,
+            ]
+        ];
+
+        $requestData = [
+            'address' => [
+                'country_id' => "US",
+                'postcode' => null,
+                'region' => null,
+                'region_id' => null
+            ],
+        ];
+
+        $this->expectExceptionMessage("The consumer isn't authorized to access %resources.");
+        $this->_webApiCall($serviceInfo, $requestData);
+    }
+
     /**
      * @magentoApiDataFixture Magento/SalesRule/_files/cart_rule_free_shipping.php
      * @magentoApiDataFixture Magento/Sales/_files/quote.php

dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/model/error-processor.test.js

@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 /*eslint max-nested-callbacks: 0*/
@@ -62,13 +62,17 @@ define([
             it('check on failed status', function () {
                 var messageContainer = jasmine.createSpyObj('globalMessageList', ['addErrorMessage']);
 
+                let messageObject = {
+                    message: 'You are not authorized to access this resource.'
+                };
+
                 spyOn(model, 'redirectTo').and.callFake(function () {});
                 model.process({
                     status: 401,
                     responseText: ''
                 }, messageContainer);
-                expect(mocks['mage/url'].build)
-                    .toHaveBeenCalled();
+                expect(messageContainer.addErrorMessage)
+                    .toHaveBeenCalledWith(messageObject);
             });
         });
     });