Merge pull request #5571 from sadilchamishka/IS7-idaas-upgrade

Improve admin role resolving
wso2 · Apr 8, 2024 · f201883 · f201883
2 parents 685cbbd + 3e1edf9
commit f201883
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/...t/src/main/java/org/wso2/carbon/identity/application/mgt/dao/impl/ApplicationDAOImpl.java b/...t/src/main/java/org/wso2/carbon/identity/application/mgt/dao/impl/ApplicationDAOImpl.java
@@ -2216,8 +2216,10 @@ public ServiceProvider getApplication(int applicationId) throws IdentityApplicat
             serviceProvider.setCertificateContent(getCertificateContent(propertyList, connection));
 
             // Set role associations.
-            serviceProvider.setAssociatedRolesConfig(
-                    getAssociatedRoles(serviceProvider.getApplicationResourceId(), connection, tenantID));
+            if (!CarbonConstants.ENABLE_LEGACY_AUTHZ_RUNTIME) {
+                serviceProvider.setAssociatedRolesConfig(
+                        getAssociatedRoles(serviceProvider.getApplicationResourceId(), connection, tenantID));
+            }
             // Will be supported with 'Advance Consent Management Feature'.
             /*
             ConsentConfig consentConfig = serviceProvider.getConsentConfig();

diff --git a/...gt/src/main/java/org/wso2/carbon/identity/application/mgt/listener/AdminRoleListener.java b/...gt/src/main/java/org/wso2/carbon/identity/application/mgt/listener/AdminRoleListener.java
@@ -140,10 +140,13 @@ private boolean isAdminRole(String roleId, String tenantDomain) throws IdentityR
         RoleManagementService roleManagementService = ApplicationManagementServiceComponentHolder.getInstance()
                 .getRoleManagementServiceV2();
         RoleBasicInfo role = roleManagementService.getRoleBasicInfoById(roleId, tenantDomain);
-        if (StringUtils.equals(getOrgAdminRoleName(), (role.getName()))) {
-            return role.getAudience().equals(RoleConstants.ORGANIZATION);
-        } else if (RoleConstants.ADMINISTRATOR.equals(role.getName())) {
-            return role.getAudienceName().equals(ApplicationConstants.CONSOLE_APPLICATION_NAME);
+        if (StringUtils.equals(getOrgAdminRoleName(), (role.getName())) &&
+                role.getAudience().equals(RoleConstants.ORGANIZATION)) {
+            return true;
+        }
+        if (RoleConstants.ADMINISTRATOR.equals(role.getName()) &&
+                role.getAudienceName().equals(ApplicationConstants.CONSOLE_APPLICATION_NAME)) {
+            return true;
         }
         return false;
     }

diff --git a/...t/java/org/wso2/carbon/identity/application/mgt/ApplicationManagementServiceImplTest.java b/...t/java/org/wso2/carbon/identity/application/mgt/ApplicationManagementServiceImplTest.java
@@ -24,6 +24,7 @@
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
+import org.wso2.carbon.CarbonConstants;
 import org.wso2.carbon.base.CarbonBaseConstants;
 import org.wso2.carbon.context.CarbonContext;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
@@ -166,6 +167,7 @@ public void setup() throws RegistryException, UserStoreException, SecretManageme
         SecretManagerComponentDataHolder.getInstance().setSecretManagementEnabled(true);
         SecretDAO secretDAO = new SecretDAOImpl();
         SecretManagerComponentDataHolder.getInstance().setSecretDAOS(Collections.singletonList(secretDAO));
+        CarbonConstants.ENABLE_LEGACY_AUTHZ_RUNTIME = false;
     }
 
     @DataProvider(name = "addApplicationDataProvider")