Improve shared role creation in sub organization level

wso2-extensions · Oct 25, 2024 · f10580d · f10580d
1 parent 2333d0d
commit f10580d
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/...n/java/org/wso2/carbon/identity/organization/management/handler/SharedRoleMgtHandler.java b/...n/java/org/wso2/carbon/identity/organization/management/handler/SharedRoleMgtHandler.java
@@ -271,7 +271,12 @@ private void createSharedRolesOnNewRoleCreation(Map<String, Object> eventPropert
                     for (BasicOrganization organization : applicationSharedOrganizations) {
                         String shareAppTenantDomain =
                                 getOrganizationManager().resolveTenantDomain(organization.getId());
-                        RoleBasicInfo sharedRoleInfo = getRoleManagementServiceV2().addRole(mainRoleName,
+                        String sharedOrgRoleName = mainRoleName;
+                        if (getRoleManagementServiceV2().isExistingRoleName(mainRoleName, RoleConstants.ORGANIZATION,
+                                organization.getId(), shareAppTenantDomain)) {
+                            sharedOrgRoleName = mainRoleName + "_shared_to_" + shareAppTenantDomain;
+                        }
+                        RoleBasicInfo sharedRoleInfo = getRoleManagementServiceV2().addRole(sharedOrgRoleName,
                                 Collections.emptyList(),
                                 Collections.emptyList(),
                                 Collections.emptyList(), RoleConstants.ORGANIZATION, organization.getId(),