Merge branch '2.4-develop' into B2B-2221

Author: avattam06

app/code/Magento/AdminAdobeIms/view/adminhtml/web/js/adobe-ims-reauth.js

@@ -45,17 +45,17 @@ define([
          * @return {window.Promise}
          */
         login: function () {
-            var deferred = $.Deferred();
-            var loginConfig = this.loginConfig;
+            var deferred = $.Deferred(),
+                loginConfig = this.loginConfig;
 
-            $("input.ims_verification").click('click', function(e) {
+            $('input.ims_verification').on('click', function () {
                 login(loginConfig)
                     .then(function (response) {
                         if (response.isAuthorized === true) {
                             $('input.ims_verified').val(true);
                         }
                         deferred.resolve(response);
-                    }.bind(this))
+                    })
                     .fail(function (error) {
                         deferred.reject(error);
                     });

app/code/Magento/AdminAdobeIms/view/adminhtml/web/postcss.config.js

@@ -4,5 +4,5 @@ module.exports = {
         require('postcss-varfallback'),
         require('postcss-dropunusedvars'),
         require('cssnano')
-    ],
+    ]
 };

app/code/Magento/Checkout/CustomerData/Cart.php

@@ -16,7 +16,7 @@
 class Cart extends \Magento\Framework\DataObject implements SectionSourceInterface
 {
     /**
-     * @var \Magento\Customer\Model\Session
+     * @var \Magento\Checkout\Model\Session
      */
     protected $checkoutSession;
 

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

@@ -21,6 +21,16 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\CustomerGraphQl\Model\Context\AddUserInfoToContext">
+        <arguments>
+            <argument name="session" xsi:type="object">Magento\Customer\Model\Session\Proxy</argument>
+        </arguments>
+    </type>
+    <type name="Magento\CustomerGraphQl\Plugin\ClearCustomerSessionAfterRequest">
+        <arguments>
+            <argument name="session" xsi:type="object">Magento\Customer\Model\Session\Proxy</argument>
+        </arguments>
+    </type>
     <type name="Magento\StoreGraphQl\Model\Resolver\Store\StoreConfigDataProvider">
         <arguments>
             <argument name="extendedConfigData" xsi:type="array">

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

@@ -16,4 +16,9 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\DirectoryGraphQl\Controller\HttpHeaderProcessor\CurrencyProcessor">
+        <arguments>
+            <argument name="session" xsi:type="object">Magento\Framework\Session\Generic\Proxy</argument>
+        </arguments>
+    </type>
 </config>

app/code/Magento/Downloadable/Controller/Download/Link.php

@@ -38,8 +38,6 @@ protected function _getCustomerSession()
      */
     public function execute()
     {
-        $session = $this->_getCustomerSession();
-
         $id = $this->getRequest()->getParam('id', 0);
         /** @var PurchasedLink $linkPurchasedItem */
         $linkPurchasedItem = $this->_objectManager->create(
@@ -53,6 +51,7 @@ public function execute()
             return $this->_redirect('*/customer/products');
         }
         if (!$this->_objectManager->get(\Magento\Downloadable\Helper\Data::class)->getIsShareable($linkPurchasedItem)) {
+            $session = $this->_getCustomerSession();
             $customerId = $session->getCustomerId();
             if (!$customerId) {
                 /** @var \Magento\Catalog\Model\Product $product */

app/code/Magento/Downloadable/Test/Unit/Controller/Download/LinkTest.php

@@ -180,7 +180,7 @@ protected function setUp(): void
      */
     public function testAbsentLinkId(): void
     {
-        $this->objectManager->expects($this->once())
+        $this->objectManager->expects($this->never())
             ->method('get')
             ->with(Session::class)
             ->willReturn($this->session);
@@ -229,8 +229,8 @@ public function testGetLinkForGuestCustomer(): void
         $this->session->expects($this->once())->method('authenticate')->willReturn(true);
         $this->objectManager
             ->method('get')
-            ->withConsecutive([Session::class], [Data::class])
-            ->willReturnOnConsecutiveCalls($this->session, $this->helperData);
+            ->withConsecutive([Data::class], [Session::class])
+            ->willReturnOnConsecutiveCalls($this->helperData, $this->session);
         $this->objectManager
             ->method('create')
             ->withConsecutive([Item::class], [Product::class], [UrlInterface::class])
@@ -262,8 +262,8 @@ public function testGetLinkForWrongCustomer(): void
         $this->session->expects($this->once())->method('getCustomerId')->willReturn('customer_id');
         $this->objectManager
             ->method('get')
-            ->withConsecutive([Session::class], [Data::class])
-            ->willReturnOnConsecutiveCalls($this->session, $this->helperData);
+            ->withConsecutive([Data::class], [Session::class])
+            ->willReturnOnConsecutiveCalls($this->helperData, $this->session);
         $this->objectManager
             ->method('create')
             ->withConsecutive([Item::class], [Purchased::class])
@@ -295,8 +295,8 @@ public function testExceptionInUpdateLinkStatus($mimeType, $disposition): void
             ->willReturnSelf();
         $this->objectManager
             ->method('get')
-            ->withConsecutive([\Magento\Customer\Model\Session::class], [Data::class], [Download::class])
-            ->willReturnOnConsecutiveCalls($this->session, $this->helperData, $this->downloadHelper);
+            ->withConsecutive([Data::class], [Download::class])
+            ->willReturnOnConsecutiveCalls($this->helperData, $this->downloadHelper);
         $this->objectManager
             ->method('create')
             ->withConsecutive([Item::class])
@@ -383,8 +383,8 @@ public function testLinkNotAvailable($messageType, $status, $notice): void
         $this->linkPurchasedItem->expects($this->once())->method('getId')->willReturn(5);
         $this->objectManager
             ->method('get')
-            ->withConsecutive([Session::class], [Data::class])
-            ->willReturnOnConsecutiveCalls($this->session, $this->helperData);
+            ->withConsecutive([Data::class], [Session::class])
+            ->willReturnOnConsecutiveCalls($this->helperData, $this->session);
         $this->objectManager
             ->method('create')
             ->with(Item::class)

app/code/Magento/Tax/Plugin/Checkout/CustomerData/Cart.php

@@ -13,7 +13,7 @@
 class Cart
 {
     /**
-     * @var \Magento\Customer\Model\Session
+     * @var \Magento\Checkout\Model\Session
      */
     protected $checkoutSession;
 

app/code/Magento/Weee/Plugin/Checkout/CustomerData/Cart.php

@@ -9,7 +9,7 @@
 class Cart extends \Magento\Tax\Plugin\Checkout\CustomerData\Cart
 {
     /**
-     * @var \Magento\Customer\Model\Session
+     * @var \Magento\Checkout\Model\Session
      */
     protected $checkoutSession;
 

dev/tests/static/testsuite/Magento/Test/Js/_files/blacklist/magento.txt

@@ -7,6 +7,7 @@ app/code/Magento/Sales/view/adminhtml/web/order/create/giftmessage.js
 app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js
 app/code/Magento/Shipping/view/adminhtml/web/order/packaging.js
 app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/magento-swagger.js
+app/code/Magento/AdminAdobeIms/view/adminhtml/web/js/loadicons.js
 lib/web/mage/adminhtml/tools.js
 lib/web/mage/adminhtml/varienLoader.js
 lib/web/magnifier/magnifier.js