diff --git a/app/code/Magento/AdminAdobeIms/Service/ImsOrganizationService.php b/app/code/Magento/AdminAdobeIms/Service/ImsOrganizationService.php index 6dbc301e5dde1..1c05e5edb62e9 100644 --- a/app/code/Magento/AdminAdobeIms/Service/ImsOrganizationService.php +++ b/app/code/Magento/AdminAdobeIms/Service/ImsOrganizationService.php @@ -41,16 +41,10 @@ public function __construct( */ public function checkOrganizationAllocation(array $profile): bool { - if (empty($profile['roles'])) { - throw new AdobeImsOrganizationAuthorizationException( - __('No roles assigned for profile.') - ); - } - - $customerOrganizations = $this->getCustomerOrganizationList($profile['roles']); $configuredOrganization = $this->adminImsConfig->getOrganizationId(); - if (!in_array($configuredOrganization, $customerOrganizations, true)) { + //@TODO CABPI-324: Change Org check to use new endpoint + if (!$configuredOrganization) { throw new AdobeImsOrganizationAuthorizationException( __('Profile is not assigned to defined organization.') ); diff --git a/app/code/Magento/AdminAdobeIms/etc/config.xml b/app/code/Magento/AdminAdobeIms/etc/config.xml index 4763021c435aa..d0c71e63dab50 100644 --- a/app/code/Magento/AdminAdobeIms/etc/config.xml +++ b/app/code/Magento/AdminAdobeIms/etc/config.xml @@ -11,22 +11,23 @@ 0 - - + + - openid AdobeID - additional_info.roles + openid + email + profile 0 - - https://ims-na1-stg1.adobelogin.com/ims/token - - + + https://ims-na1.adobelogin.com/ims/token + + - + admin_adobe_ims_email_header_template