Skip to content

Commit f47d1a0

Browse files
committed
ACPT-113: [BUG] Adobe Stock doesn't allow to license an image if configured via Magento config
1 parent 215daef commit f47d1a0

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

app/code/Magento/AdminAdobeIms/Service/ImsConfig.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class ImsConfig extends Config
2929
public const XML_PATH_PROFILE_URL = 'adobe_ims/integration/profile_url';
3030
public const XML_PATH_NEW_ADMIN_EMAIL_TEMPLATE = 'adobe_ims/email/content_template';
3131
public const XML_PATH_VALIDATE_TOKEN_URL = 'adobe_ims/integration/validate_token_url';
32-
public const XML_PATH_LOGOUT_URL = 'adobe_ims/integration/logout_url';
32+
public const XML_PATH_LOGOUT_URI = 'adobe_ims/integration/logout_uri';
3333
public const XML_PATH_CERTIFICATE_PATH = 'adobe_ims/integration/certificate_path';
3434
public const XML_PATH_ADMIN_AUTH_URL_PATTERN = 'adobe_ims/integration/admin/auth_url_pattern';
3535
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
353353
return str_replace(
354354
['#{access_token}', '#{client_secret}', '#{client_id}'],
355355
[$accessToken, $this->getPrivateKey(), $this->getApiKey()],
356-
$this->scopeConfig->getValue(self::XML_PATH_LOGOUT_URL)
356+
$this->scopeConfig->getValue(self::XML_PATH_LOGOUT_URI)
357357
);
358358
}
359359

app/code/Magento/AdminAdobeIms/etc/config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<token_url>https://ims-na1.adobelogin.com/ims/token</token_url>
2828
<profile_url><![CDATA[https://ims-na1.adobelogin.com/ims/profile/v1?client_id=#{client_id}]]></profile_url>
2929
<organization_membership_url><![CDATA[https://graph.identity.adobe.com/#{org_id}@AdobeOrg/membership]]></organization_membership_url>
30-
<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>
30+
<logout_uri><![CDATA[https://ims-na1.adobelogin.com/ims/logout/v1?access_token=#{access_token}&client_id=#{client_id}&client_secret=#{client_secret}]]></logout_uri>
3131
<certificate_path><![CDATA[https://static.adobelogin.com/keys/prod/]]></certificate_path>
3232
<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>
3333
</integration>

app/code/Magento/AdobeIms/Model/Config.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,10 @@ private function getLocale(): string
108108
*/
109109
public function getLogoutUrl(string $accessToken, string $redirectUrl = '') : string
110110
{
111+
// there is no success response with empty redirect url
112+
if ($redirectUrl === '') {
113+
$redirectUrl = 'self';
114+
}
111115
return str_replace(
112116
['#{access_token}', '#{redirect_uri}'],
113117
[$accessToken, $redirectUrl],

0 commit comments

Comments
 (0)