Improve app sharing logic during organization creation

wso2-extensions · Sep 30, 2024 · b2f73d4 · b2f73d4
1 parent 63bf95e
commit b2f73d4
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/...on/identity/organization/management/application/listener/OrganizationCreationHandler.java b/...on/identity/organization/management/application/listener/OrganizationCreationHandler.java
@@ -53,6 +53,7 @@
 
 import static org.wso2.carbon.identity.organization.management.application.constant.OrgApplicationMgtConstants.SHARE_WITH_ALL_CHILDREN;
 import static org.wso2.carbon.identity.organization.management.application.util.OrgApplicationManagerUtil.setIsAppSharedProperty;
+import static org.wso2.carbon.identity.organization.management.service.constant.OrganizationManagementConstants.IS_APP_SHARED;
 import static org.wso2.carbon.identity.organization.management.service.constant.OrganizationManagementConstants.SUPER_ORG_ID;
 import static org.wso2.carbon.identity.organization.management.service.util.Utils.getAuthenticatedUsername;
 
@@ -143,17 +144,10 @@ private void addSharedApplicationsToOrganization(Organization organization)
                 if (mainApplication != null && Arrays.stream(mainApplication.getSpProperties())
                         .anyMatch(p -> SHARE_WITH_ALL_CHILDREN.equalsIgnoreCase(
                                 p.getName()) && Boolean.parseBoolean(p.getValue()))) {
-                    String mainAppOrgId = getOrganizationManager().resolveOrganizationId(mainApplication
-                            .getTenantDomain());
-                    List<BasicOrganization> applicationSharedOrganizations = getOrgApplicationManager()
-                            .getApplicationSharedOrganizations(mainAppOrgId,
-                                    mainApplication.getApplicationResourceId());
-                    // Having an empty list implies that this is the first organization to which the application is
-                    // shared with.
-                    boolean updateIsAppSharedProperty = CollectionUtils.isEmpty(applicationSharedOrganizations);
                     getOrgApplicationManager().shareApplication(parentOrgId, organization.getId(),
                             mainApplication, true);
-                    if (updateIsAppSharedProperty) {
+                    boolean isAppShared = isAppShared(mainApplication);
+                    if (!isAppShared) {
                         updateApplicationWithIsAppSharedProperty(true, mainApplication);
                     }
                 }
@@ -238,6 +232,12 @@ private void updateApplicationWithIsAppSharedProperty(boolean isAppShared, Servi
         }
     }
 
+    private boolean isAppShared(ServiceProvider mainApplication) {
+
+        return Arrays.stream(mainApplication.getSpProperties())
+                .anyMatch(p -> IS_APP_SHARED.equalsIgnoreCase(p.getName()) && Boolean.parseBoolean(p.getValue()));
+    }
+
     private ApplicationManagementService getApplicationManagementService() {
 
         return OrgApplicationMgtDataHolder.getInstance().getApplicationManagementService();