Merge branch 'main' of https://github.com/wso2-extensions/identity-or…

…ganization-management into multi_user_cretion
wso2-extensions · Dec 8, 2023 · 497733e · 497733e
2 parents 4dd8a1b + d680346
commit 497733e
Show file tree

Hide file tree

Showing 17 changed files with 36 additions and 16 deletions.
diff --git a/components/org.wso2.carbon.identity.organization.config.service/pom.xml b/components/org.wso2.carbon.identity.organization.config.service/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.organization.management</groupId>
         <artifactId>identity-organization-management</artifactId>
-        <version>1.3.131</version>
+        <version>1.3.134-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/components/org.wso2.carbon.identity.organization.discovery.service/pom.xml b/components/org.wso2.carbon.identity.organization.discovery.service/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.organization.management</groupId>
         <artifactId>identity-organization-management</artifactId>
-        <version>1.3.131</version>
+        <version>1.3.134-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/components/org.wso2.carbon.identity.organization.management.application/pom.xml b/components/org.wso2.carbon.identity.organization.management.application/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.organization.management</groupId>
         <artifactId>identity-organization-management</artifactId>
-        <version>1.3.131</version>
+        <version>1.3.134-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/.../wso2/carbon/identity/organization/management/application/handler/OrgClaimMgtHandler.java b/.../wso2/carbon/identity/organization/management/application/handler/OrgClaimMgtHandler.java
@@ -123,6 +123,21 @@ private void handlePostShareApplication(Event event) throws IdentityEventExcepti
                 addClaimsToSubOrganization(parentOrgCustomLocalClaims, sharedOrganizationTenantDomain,
                         missingClaims, parentTenantDomain);
             }
+            // Add the custom claim dialects to the organization.
+            List<String> claimDialectURIListInOrg = getClaimMetadataManagementService()
+                    .getClaimDialects(sharedOrganizationTenantDomain).stream().map(ClaimDialect::getClaimDialectURI)
+                    .collect(Collectors.toList());
+            getClaimMetadataManagementService().getClaimDialects(parentTenantDomain).stream()
+                    .filter(claimDialect -> !claimDialectURIListInOrg.contains(claimDialect.getClaimDialectURI()))
+                    .forEach(claimDialect -> {
+                        try {
+                            getClaimMetadataManagementService()
+                                    .addClaimDialect(claimDialect, sharedOrganizationTenantDomain);
+                        } catch (ClaimMetadataException e) {
+                            LOG.error("Error while adding claim dialect " + claimDialect.getClaimDialectURI() +
+                                    " to organization " + sharedOrganizationTenantDomain, e);
+                        }
+                    });
         } catch (OrganizationManagementException | ClaimMetadataException e) {
             throw new IdentityEventException("An error occurred  while adding the claims.", e);
         }

diff --git a/components/org.wso2.carbon.identity.organization.management.authz.service/pom.xml b/components/org.wso2.carbon.identity.organization.management.authz.service/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.organization.management</groupId>
         <artifactId>identity-organization-management</artifactId>
-        <version>1.3.131</version>
+        <version>1.3.134-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/components/org.wso2.carbon.identity.organization.management.claim.provider/pom.xml b/components/org.wso2.carbon.identity.organization.management.claim.provider/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.organization.management</groupId>
         <artifactId>identity-organization-management</artifactId>
-        <version>1.3.131</version>
+        <version>1.3.134-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/components/org.wso2.carbon.identity.organization.management.ext/pom.xml b/components/org.wso2.carbon.identity.organization.management.ext/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.organization.management</groupId>
         <artifactId>identity-organization-management</artifactId>
-        <version>1.3.131</version>
+        <version>1.3.134-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/components/org.wso2.carbon.identity.organization.management.governance.connector/pom.xml b/components/org.wso2.carbon.identity.organization.management.governance.connector/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.organization.management</groupId>
         <artifactId>identity-organization-management</artifactId>
-        <version>1.3.131</version>
+        <version>1.3.134-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/components/org.wso2.carbon.identity.organization.management.handler/pom.xml b/components/org.wso2.carbon.identity.organization.management.handler/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-organization-management</artifactId>
         <groupId>org.wso2.carbon.identity.organization.management</groupId>
-        <version>1.3.131</version>
+        <version>1.3.134-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/.../wso2/carbon/identity/organization/management/handler/listener/SharedRoleMgtListener.java b/.../wso2/carbon/identity/organization/management/handler/listener/SharedRoleMgtListener.java
@@ -308,10 +308,15 @@ private void handleAddedOrganizationAudienceRolesOnAppUpdate(List<RoleV2> addedO
             CompletableFuture.runAsync(() -> {
                 String sharedAppOrgId = sharedApplication.getOrganizationId();
                 try {
+                    String shareAppTenantDomain = organizationManager.resolveTenantDomain(sharedAppOrgId);
+                    PrivilegedCarbonContext.startTenantFlow();
+                    PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantDomain(shareAppTenantDomain, true);
                     createSharedRolesWithOrgAudience(addedOrgRolesList, tenantDomain, sharedAppOrgId);
                 } catch (IdentityRoleManagementException | OrganizationManagementException e) {
                     LOG.error(String.format("Exception occurred while adding shared roles to organization: %s",
                             sharedApplication.getOrganizationId()), e);
+                } finally {
+                    PrivilegedCarbonContext.endTenantFlow();
                 }
             }, executorService).exceptionally(throwable -> {
                 LOG.error(String.format("Exception occurred while adding shared roles to organization: %s",

diff --git a/...onents/org.wso2.carbon.identity.organization.management.organization.user.sharing/pom.xml b/...onents/org.wso2.carbon.identity.organization.management.organization.user.sharing/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.organization.management</groupId>
         <artifactId>identity-organization-management</artifactId>
-        <version>1.3.131</version>
+        <version>1.3.134-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/components/org.wso2.carbon.identity.organization.management.role.management.service/pom.xml b/components/org.wso2.carbon.identity.organization.management.role.management.service/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>identity-organization-management</artifactId>
         <groupId>org.wso2.carbon.identity.organization.management</groupId>
-        <version>1.3.131</version>
+        <version>1.3.134-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/components/org.wso2.carbon.identity.organization.management.tenant.association/pom.xml b/components/org.wso2.carbon.identity.organization.management.tenant.association/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-organization-management</artifactId>
         <groupId>org.wso2.carbon.identity.organization.management</groupId>
-        <version>1.3.131</version>
+        <version>1.3.134-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/...nents/org.wso2.carbon.identity.organization.management.tomcat.ext.tenant.resolver/pom.xml b/...nents/org.wso2.carbon.identity.organization.management.tomcat.ext.tenant.resolver/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.organization.management</groupId>
         <artifactId>identity-organization-management</artifactId>
-        <version>1.3.131</version>
+        <version>1.3.134-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/components/org.wso2.carbon.identity.organization.user.invitation.management/pom.xml b/components/org.wso2.carbon.identity.organization.user.invitation.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.organization.management</groupId>
         <artifactId>identity-organization-management</artifactId>
-        <version>1.3.131</version>
+        <version>1.3.134-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/features/org.wso2.carbon.identity.organization.management.server.feature/pom.xml b/features/org.wso2.carbon.identity.organization.management.server.feature/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.organization.management</groupId>
         <artifactId>identity-organization-management</artifactId>
-        <version>1.3.131</version>
+        <version>1.3.134-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/pom.xml b/pom.xml
@@ -25,7 +25,7 @@
 
     <groupId>org.wso2.carbon.identity.organization.management</groupId>
     <artifactId>identity-organization-management</artifactId>
-    <version>1.3.131</version>
+    <version>1.3.134-SNAPSHOT</version>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Organization Management</name>
@@ -36,7 +36,7 @@
         <url>https://github.com/wso2-extensions/identity-organization-management.git</url>
         <developerConnection>scm:git:https://github.com/wso2-extensions/identity-organization-management.git</developerConnection>
         <connection>scm:git:https://github.com/wso2-extensions/identity-organization-management.git</connection>
-        <tag>v1.3.131</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <modules>