Merge branch '2.4.5-develop' into 245_new_regression_issue

Author: sidolov

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)
         );
     }
 

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>

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],

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;
         }

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());
     }
 

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"/>