Skip to content

Commit f674b28

Browse files
CABI-365:: changes reverted as there is separate PR for these changes
1 parent 3664ee1 commit f674b28

File tree

2 files changed

+14
-22
lines changed

2 files changed

+14
-22
lines changed

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

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<integration>
1212
<admin_enabled>0</admin_enabled>
1313
<admin>
14-
<auth_url_pattern><![CDATA[#{imsUrl}/ims/authorize/v2?client_id=#{client_id}&redirect_uri=#{redirect_uri}&locale=#{locale}&scope=#{scope}&response_type=code]]></auth_url_pattern>
15-
<reauth_url_pattern><![CDATA[#{imsUrl}/ims/authorize/v2?client_id=#{client_id}&redirect_uri=#{redirect_uri}&locale=#{locale}&scope=#{scope}&response_type=code&reauth=check]]></reauth_url_pattern>
14+
<auth_url_pattern><![CDATA[https://ims-na1.adobelogin.com/ims/authorize/v2?client_id=#{client_id}&redirect_uri=#{redirect_uri}&locale=#{locale}&scope=#{scope}&response_type=code]]></auth_url_pattern>
15+
<reauth_url_pattern><![CDATA[https://ims-na1.adobelogin.com/ims/authorize/v2?client_id=#{client_id}&redirect_uri=#{redirect_uri}&locale=#{locale}&scope=#{scope}&response_type=code&reauth=check]]></reauth_url_pattern>
1616
<scopes>
1717
<AdobeID>AdobeID</AdobeID>
1818
<openid>openid</openid>
@@ -21,14 +21,15 @@
2121
<org.read>org.read</org.read>
2222
</scopes>
2323
</admin>
24+
<logging_enabled>0</logging_enabled>
2425
<organization_id backend_model="Magento\Config\Model\Config\Backend\Encrypted"/>
25-
<profile_url><![CDATA[#{imsUrl}/ims/profile/v1?client_id=#{client_id}]]></profile_url>
26-
<organization_membership_url><![CDATA[#{organizationMembershipUrl}/#{org_id}@AdobeOrg/membership]]></organization_membership_url>
27-
<admin_logout_url><![CDATA[#{imsUrl}/ims/logout/v1?access_token=#{access_token}&client_id=#{client_id}&client_secret=#{client_secret}]]></admin_logout_url>
28-
<certificate_path><![CDATA[#{certificateUrl}/keys/prod/]]></certificate_path>
29-
<validate_token_url><![CDATA[#{imsUrl}/ims/validate_token/v1?token=#{token}&client_id=#{client_id}&type=#{token_type}]]></validate_token_url>
30-
<organizationMembershipUrl>https://graph.identity.adobe.com</organizationMembershipUrl>
31-
<certificateUrl>https://static.adobelogin.com</certificateUrl>
26+
<auth_url_pattern><![CDATA[https://ims-na1.adobelogin.com/ims/authorize/v2?client_id=#{client_id}&amp;redirect_uri=#{redirect_uri}&amp;locale=#{locale}&amp;scope=openid,creative_sdk,email,profile&amp;response_type=code]]></auth_url_pattern>
27+
<token_url>https://ims-na1.adobelogin.com/ims/token</token_url>
28+
<profile_url><![CDATA[https://ims-na1.adobelogin.com/ims/profile/v1?client_id=#{client_id}]]></profile_url>
29+
<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>
31+
<certificate_path><![CDATA[https://static.adobelogin.com/keys/prod/]]></certificate_path>
32+
<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>
3233
</integration>
3334
<email>
3435
<header_template>admin_adobe_ims_email_header_template</header_template>

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

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,10 @@
1111
<integration>
1212
<api_key backend_model="Magento\Config\Model\Config\Backend\Encrypted"/>
1313
<private_key backend_model="Magento\Config\Model\Config\Backend\Encrypted"/>
14-
<token_url>#{imsUrl}/ims/token</token_url>
15-
<logout_url><![CDATA[#{imsUrl}/ims/logout?access_token=#{access_token}&redirect_uri=#{redirect_uri}]]></logout_url>
16-
<image_url><![CDATA[#{imageUrl}/v2/users/me?api_key=#{api_key}]]></image_url>
17-
<auth_url_pattern><![CDATA[#{imsUrl}/ims/authorize?client_id=#{client_id}&redirect_uri=#{redirect_uri}&locale=#{locale}&scope=#{scope}&response_type=code]]></auth_url_pattern>
18-
<imsUrl>https://ims-na1.adobelogin.com</imsUrl>
19-
<imageUrl>https://cc-api-behance.adobe.io</imageUrl>
20-
<scopes>
21-
<creative_sdk>creative_sdk</creative_sdk>
22-
<openid>openid</openid>
23-
<email>email</email>
24-
<profile>profile</profile>
25-
</scopes>
26-
<logging_enabled>0</logging_enabled>
14+
<token_url>https://ims-na1.adobelogin.com/ims/token</token_url>
15+
<logout_url><![CDATA[https://ims-na1.adobelogin.com/ims/logout?access_token=#{access_token}&redirect_uri=#{redirect_uri}]]></logout_url>
16+
<image_url><![CDATA[https://cc-api-behance.adobe.io/v2/users/me?api_key=#{api_key}]]></image_url>
17+
<auth_url_pattern><![CDATA[https://ims-na1.adobelogin.com/ims/authorize?client_id=#{client_id}&redirect_uri=#{redirect_uri}&locale=#{locale}&scope=openid,creative_sdk,email,profile&response_type=code]]></auth_url_pattern>
2718
</integration>
2819
</adobe_ims>
2920
</default>

0 commit comments

Comments
 (0)