Merge branch '2.4.5-develop' into BUG#AC-3515

mahesh-singh-rajawat · mahesh-singh-rajawat · commit fd955b8d44f0 · 2022-06-17T14:28:37.000+05:30
diff --git a/app/code/Magento/AdminAdobeIms/Service/ImsConfig.php b/app/code/Magento/AdminAdobeIms/Service/ImsConfig.php
@@ -29,7 +29,7 @@ class ImsConfig extends Config
     public const XML_PATH_PROFILE_URL = 'adobe_ims/integration/profile_url';
     public const XML_PATH_NEW_ADMIN_EMAIL_TEMPLATE = 'adobe_ims/email/content_template';
     public const XML_PATH_VALIDATE_TOKEN_URL = 'adobe_ims/integration/validate_token_url';
-    public const XML_PATH_LOGOUT_URL = 'adobe_ims/integration/logout_url';
+    public const XML_PATH_ADMIN_LOGOUT_URL = 'adobe_ims/integration/admin_logout_url';
     public const XML_PATH_CERTIFICATE_PATH = 'adobe_ims/integration/certificate_path';
     public const XML_PATH_ADMIN_AUTH_URL_PATTERN = 'adobe_ims/integration/admin/auth_url_pattern';
     public const XML_PATH_ADMIN_REAUTH_URL_PATTERN = 'adobe_ims/integration/admin/reauth_url_pattern';
@@ -353,7 +353,7 @@ public function getBackendLogoutUrl(string $accessToken) : string
         return str_replace(
             ['#{access_token}', '#{client_secret}', '#{client_id}'],
             [$accessToken, $this->getPrivateKey(), $this->getApiKey()],
-            $this->scopeConfig->getValue(self::XML_PATH_LOGOUT_URL)
+            $this->scopeConfig->getValue(self::XML_PATH_ADMIN_LOGOUT_URL)
         );
     }
 
diff --git a/app/code/Magento/AdminAdobeIms/etc/config.xml b/app/code/Magento/AdminAdobeIms/etc/config.xml
@@ -27,7 +27,7 @@
                 <token_url>https://ims-na1.adobelogin.com/ims/token</token_url>
                 <profile_url><![CDATA[https://ims-na1.adobelogin.com/ims/profile/v1?client_id=#{client_id}]]></profile_url>
                 <organization_membership_url><![CDATA[https://graph.identity.adobe.com/#{org_id}@AdobeOrg/membership]]></organization_membership_url>
-                <logout_url><![CDATA[https://ims-na1.adobelogin.com/ims/logout/v1?access_token=#{access_token}&amp;client_id=#{client_id}&amp;client_secret=#{client_secret}]]></logout_url>
+                <admin_logout_url><![CDATA[https://ims-na1.adobelogin.com/ims/logout/v1?access_token=#{access_token}&client_id=#{client_id}&client_secret=#{client_secret}]]></admin_logout_url>
                 <certificate_path><![CDATA[https://static.adobelogin.com/keys/prod/]]></certificate_path>
                 <validate_token_url><![CDATA[https://ims-na1.adobelogin.com/ims/validate_token/v1?token=#{token}&client_id=#{client_id}&type=#{token_type}]]></validate_token_url>
             </integration>
diff --git a/app/code/Magento/AdobeIms/Model/Config.php b/app/code/Magento/AdobeIms/Model/Config.php
@@ -108,6 +108,10 @@ private function getLocale(): string
      */
     public function getLogoutUrl(string $accessToken, string $redirectUrl = '') : string
     {
+        // there is no success response with empty redirect url
+        if ($redirectUrl === '') {
+            $redirectUrl = 'self';
+        }
         return str_replace(
             ['#{access_token}', '#{redirect_uri}'],
             [$accessToken, $redirectUrl],
diff --git a/app/code/Magento/AdobeIms/Model/GetAccessToken.php b/app/code/Magento/AdobeIms/Model/GetAccessToken.php
@@ -55,7 +55,9 @@ public function execute(int $adminUserId = null): ?string
     {
         try {
             $adminUserId = $adminUserId ?? (int) $this->userContext->getUserId();
-            return $this->userProfileRepository->getByUserId($adminUserId)->getAccessToken();
+            return $this->encryptor->decrypt(
+                $this->userProfileRepository->getByUserId($adminUserId)->getAccessToken()
+            );
         } catch (NoSuchEntityException $exception) {
             return null;
         }
diff --git a/app/code/Magento/AdobeIms/Test/Unit/Model/GetAccessTokenTest.php b/app/code/Magento/AdobeIms/Test/Unit/Model/GetAccessTokenTest.php
@@ -72,6 +72,13 @@ public function testExecute(?string $token): void
             ->willReturn($userProfileMock);
         $userProfileMock->expects($this->once())->method('getAccessToken')->willReturn($token);
 
+        $decryptedToken = $token ?? '';
+
+        $this->encryptor->expects($this->once())
+            ->method('decrypt')
+            ->with($token)
+            ->willReturn($decryptedToken);
+
         $this->assertEquals($token, $this->getAccessToken->execute());
     }
 
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminDeleteUserSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminDeleteUserSection.xml
@@ -9,7 +9,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminDeleteUserSection">
-        <element name="theUser" selector="//td[contains(text(), 'John')]" type="button"/>
+        <element name="theUser" selector="//td[contains(text(), '{{userName}}')]" type="button" parameterized="true"/>
         <element name="password" selector="#user_current_password" type="input"/>
         <element name="delete" selector=".page-actions-buttons #delete" type="button"/>
         <element name="confirm" selector="//*[@class='action-primary action-accept']" type="button"/>
diff --git a/app/code/Magento/Quote/Model/Quote.php b/app/code/Magento/Quote/Model/Quote.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Quote\Model;
 
+use Magento\Catalog\Model\Product\Attribute\Source\Status as ProductStatus;
 use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Customer\Api\Data\GroupInterface;
 use Magento\Directory\Model\AllowedCountries;
@@ -874,7 +875,8 @@ public function beforeSave()
      * Loading quote data by customer
      *
      * @param \Magento\Customer\Model\Customer|int $customer
-     * @deprecated 101.0.0
+     * @deprecated 101.0.0 Deprecated to handle external usages of customer methods
+     * @see https://jira.corp.magento.com/browse/MAGETWO-19935
      * @return $this
      */
     public function loadByCustomer($customer)
@@ -1427,12 +1429,14 @@ public function getItemsCollection($useCache = true)
     public function getAllItems()
     {
         $items = [];
+        /** @var \Magento\Quote\Model\Quote\Item $item */
         foreach ($this->getItemsCollection() as $item) {
-            /** @var \Magento\Quote\Model\Quote\Item $item */
-            if (!$item->isDeleted()) {
+            $product = $item->getProduct();
+            if (!$item->isDeleted() && ($product && (int)$product->getStatus() !== ProductStatus::STATUS_DISABLED)) {
                 $items[] = $item;
             }
         }
+
         return $items;
     }
 
diff --git a/app/code/Magento/Quote/Test/Unit/Model/QuoteTest.php b/app/code/Magento/Quote/Test/Unit/Model/QuoteTest.php
@@ -1034,6 +1034,9 @@ public function testAddProductItemPreparation(): void
         $itemMock->expects($this->any())
             ->method('representProduct')
             ->willReturn(true);
+        $itemMock->expects($this->any())
+            ->method('getProduct')
+            ->willReturn($this->productMock);
 
         $iterator = new \ArrayIterator([$itemMock]);
         $collectionMock->expects($this->any())
@@ -1402,20 +1405,26 @@ public function testGetItemsCollection(): void
     public function testGetAllItems(): void
     {
         $itemOneMock = $this->getMockBuilder(\Magento\Quote\Model\ResourceModel\Quote\Item::class)
-            ->addMethods(['isDeleted'])
+            ->addMethods(['isDeleted', 'getProduct'])
             ->disableOriginalConstructor()
             ->getMock();
         $itemOneMock->expects($this->once())
             ->method('isDeleted')
             ->willReturn(false);
+        $itemOneMock->expects($this->once())
+            ->method('getProduct')
+            ->willReturn($this->productMock);
 
         $itemTwoMock = $this->getMockBuilder(\Magento\Quote\Model\ResourceModel\Quote\Item::class)
-            ->addMethods(['isDeleted'])
+            ->addMethods(['isDeleted', 'getProduct'])
             ->disableOriginalConstructor()
             ->getMock();
         $itemTwoMock->expects($this->once())
             ->method('isDeleted')
             ->willReturn(true);
+        $itemTwoMock->expects($this->once())
+            ->method('getProduct')
+            ->willReturn($this->productMock);
 
         $items = [$itemOneMock, $itemTwoMock];
         $itemResult = [$itemOneMock];
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminCanceledOrdersInOrderSalesReportTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminCanceledOrdersInOrderSalesReportTest.xml
@@ -21,6 +21,8 @@
         </annotations>
 
         <before>
+            <!--Enable flat rate shipping-->
+            <magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
 
             <createData entity="_defaultCategory" stepKey="createCategory"/>
@@ -72,6 +74,8 @@
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
             <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+            <!-- Disable shipping method for customer with default address -->
+            <magentoCLI command="config:set {{DisableFlatRateConfigData.path}} {{DisableFlatRateConfigData.value}}" stepKey="disableFlatRate"/>
         </after>
 
         <actionGroup ref="AdminGoToOrdersReportPageActionGroup" stepKey="goToOrdersReportPage1"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderForCustomerWithTwoAddressesTaxableAndNonTaxableTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderForCustomerWithTwoAddressesTaxableAndNonTaxableTest.xml
@@ -74,6 +74,8 @@
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
             <!--Disable free shipping method -->
             <magentoCLI command="config:set {{DisableFreeShippingConfigData.path}} {{DisableFreeShippingConfigData.value}}" stepKey="disableFreeShipping"/>
+            <!-- Disable shipping method for customer with default address -->
+            <magentoCLI command="config:set {{DisableFlatRateConfigData.path}} {{DisableFlatRateConfigData.value}}" stepKey="disableFlatRate"/>
         </after>
     </test>
 </tests>
diff --git a/dev/tests/integration/testsuite/Magento/Dhl/Model/CarrierTest.php b/dev/tests/integration/testsuite/Magento/Dhl/Model/CarrierTest.php
@@ -8,6 +8,7 @@
 namespace Magento\Dhl\Model;
 
 use Magento\Framework\App\Config\ReinitableConfigInterface;
+use Magento\Framework\App\ProductMetadataInterface;
 use Magento\Framework\DataObject;
 use Magento\Framework\HTTP\AsyncClient\HttpException;
 use Magento\Framework\HTTP\AsyncClient\HttpResponseDeferredInterface;
@@ -48,6 +49,11 @@ class CarrierTest extends TestCase
      */
     private $config;
 
+    /**
+     * @var ProductMetadataInterface
+     */
+    private $productMetadata;
+
     /**
      * @var string
      */
@@ -62,6 +68,7 @@ protected function setUp(): void
         $this->dhlCarrier = $objectManager->get(Carrier::class);
         $this->httpClient = $objectManager->get(AsyncClientInterface::class);
         $this->config = $objectManager->get(ReinitableConfigInterface::class);
+        $this->productMetadata = $objectManager->get(ProductMetadataInterface::class);
         $this->restoreCountry = $this->config->getValue('shipping/origin/country_id', 'store', 'default_store');
     }
 
@@ -402,6 +409,7 @@ private function getExpectedLabelRequestXml(
         // phpcs:ignore Magento2.Functions.DiscouragedFunction
         $expectedRequestElement = new ShippingElement(file_get_contents(__DIR__ . $requestXmlPath));
 
+        $expectedRequestElement->Request->MetaData->SoftwareVersion = $this->buildSoftwareVersion();
         $expectedRequestElement->Consignee->CountryCode = $destCountryId;
         $expectedRequestElement->Consignee->CountryName = $countryNames[$destCountryId];
         $expectedRequestElement->Shipper->CountryCode = $origCountryId;
@@ -415,6 +423,16 @@ private function getExpectedLabelRequestXml(
         return $expectedRequestElement->asXML();
     }
 
+    /**
+     * Builds a string to be used as the request SoftwareVersion.
+     *
+     * @return string
+     */
+    private function buildSoftwareVersion(): string
+    {
+        return substr($this->productMetadata->getVersion(), 0, 10);
+    }
+
     /**
      * Tests that valid rates are returned when sending a quotes request.
      *
diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteManagementTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteManagementTest.php
@@ -34,6 +34,7 @@
  *
  * @see \Magento\Quote\Model\QuoteManagement
  * @magentoDbIsolation enabled
+ * @magentoAppIsolation enabled
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class QuoteManagementTest extends TestCase
@@ -196,7 +197,6 @@ public function testSubmitWithDeletedItem(): void
         $this->cartManagement->placeOrder($quote->getId());
     }
 
-
     /**
      * Tries to create order with product that has child items and one of them
      * was deleted when item data check is disabled on quote load.
@@ -237,7 +237,11 @@ public function testSubmitWithItemOutOfStockWithDisabledInventoryCheck(): void
     {
         $this->makeProductOutOfStock('simple');
         $quote = $this->getQuoteByReservedOrderId->execute('test01');
-        $this->expectExceptionObject(new LocalizedException(__('The shipping method is missing. Select the shipping method and try again.')));
+        $this->expectExceptionObject(
+            new LocalizedException(
+                __('The shipping method is missing. Select the shipping method and try again.')
+            )
+        );
         $this->cartManagement->placeOrder($quote->getId());
     }
 

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,9 @@ public function execute(int $adminUserId = null): ?string`
`55`	`55`	`{`
`56`	`56`	`try {`
`57`	`57`	`$adminUserId = $adminUserId ?? (int) $this->userContext->getUserId();`
`58`		`- return $this->userProfileRepository->getByUserId($adminUserId)->getAccessToken();`
	`58`	`+ return $this->encryptor->decrypt(`
	`59`	`+ $this->userProfileRepository->getByUserId($adminUserId)->getAccessToken()`
	`60`	`+ );`
`59`	`61`	`} catch (NoSuchEntityException $exception) {`
`60`	`62`	`return null;`
`61`	`63`	`}`