Skip to content

Commit

Permalink
fix todos
Browse files Browse the repository at this point in the history
  • Loading branch information
@AnuradhaSK
AnuradhaSK committed Oct 16, 2023
1 parent d68a7b6 commit 86f9849
Show file tree
Hide file tree
Showing 3 changed files with 87 additions and 40 deletions.
82 changes: 43 additions & 39 deletions ...n/java/org/wso2/carbon/identity/organization/management/handler/SharedRoleMgtHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.identity.application.common.IdentityApplicationManagementException;
import org.wso2.carbon.identity.event.IdentityEventConstants;
import org.wso2.carbon.identity.event.IdentityEventException;
import org.wso2.carbon.identity.event.event.Event;
Expand All @@ -37,6 +38,7 @@
import org.wso2.carbon.identity.role.v2.mgt.core.RoleBasicInfo;
import org.wso2.carbon.identity.role.v2.mgt.core.RoleConstants;
import org.wso2.carbon.identity.role.v2.mgt.core.RoleManagementService;
import org.wso2.carbon.utils.multitenancy.MultitenantConstants;

import java.util.Collections;
import java.util.List;
Expand Down Expand Up @@ -78,7 +80,7 @@ public void handleEvent(Event event) throws IdentityEventException {
}
}

private void createSubOrgRolesOnNewOrgCreation(Map<String, Object> eventProperties) {
private void createSubOrgRolesOnNewOrgCreation(Map<String, Object> eventProperties) throws IdentityEventException {

try {
Organization organization = (Organization) eventProperties.get(Constants.EVENT_PROP_ORGANIZATION);
Expand All @@ -90,7 +92,7 @@ private void createSubOrgRolesOnNewOrgCreation(Map<String, Object> eventProperti
ParentOrganizationDO parentOrg = organization.getParent();
String parentOrgId = parentOrg.getId();
// Get parent organization's roles which has organization audience.
String filter = "audienceId eq " + parentOrg.getId();
String filter = RoleConstants.AUDIENCE_ID + " " + RoleConstants.EQ + " " + parentOrg.getId();
String parenTenantDomain = getOrganizationManager().resolveTenantDomain(parentOrgId);
List<RoleBasicInfo> parentOrgRoles =
getRoleManagementServiceV2().getRoles(filter, null, 0, null, null, parenTenantDomain);
Expand All @@ -106,16 +108,13 @@ private void createSubOrgRolesOnNewOrgCreation(Map<String, Object> eventProperti
subOrgRole.getId(), parenTenantDomain, subOrgTenantDomain);
}
} catch (OrganizationManagementException e) {
// TODO : handle exception
throw new RuntimeException(e);
throw new IdentityEventException("Error occurred while resolving organization id from tenant domain.", e);
} catch (IdentityRoleManagementException e) {
// TODO : handle exception
throw new RuntimeException(e);
throw new IdentityEventException("Error occurred while adding main role to shared role relationship.", e);
}

}

private void createSubOrgRolesOnNewRoleCreation(Map<String, Object> eventProperties) {
private void createSubOrgRolesOnNewRoleCreation(Map<String, Object> eventProperties) throws IdentityEventException {

try {
String mainRoleUUID = (String) eventProperties.get(IdentityEventConstants.EventProperty.ROLE_ID);
Expand All @@ -125,7 +124,7 @@ private void createSubOrgRolesOnNewRoleCreation(Map<String, Object> eventPropert
String roleAudienceId = (String) eventProperties.get(IdentityEventConstants.EventProperty.AUDIENCE_ID);
String roleOrgId = getOrganizationManager().resolveOrganizationId(roleTenantDomain);
boolean isPrimaryOrganization = getOrganizationManager().isPrimaryOrganization(roleOrgId);
if (!isPrimaryOrganization) {
if (!isPrimaryOrganization && !MultitenantConstants.SUPER_TENANT_DOMAIN_NAME.equals(roleTenantDomain)) {
return;
}
switch (roleAudienceType) {
Expand Down Expand Up @@ -176,15 +175,13 @@ private void createSubOrgRolesOnNewRoleCreation(Map<String, Object> eventPropert
LOG.error("Unsupported audience type: " + roleAudienceType);
}
} catch (OrganizationManagementException e) {
// TODO : handle exception
LOG.debug(e.getMessage());
throw new IdentityEventException("Error occurred while retrieving shared applications.", e);
} catch (IdentityRoleManagementException e) {
// TODO : handle exception
throw new RuntimeException(e);
throw new IdentityEventException("Error occurred while adding main role to shared role relationship.", e);
}
}

private void createSubOrgRolesOnAppSharing(Map<String, Object> eventProperties) {
private void createSubOrgRolesOnAppSharing(Map<String, Object> eventProperties) throws IdentityEventException {

String parentOrganizationId =
(String) eventProperties.get(OrgApplicationMgtConstants.EVENT_PROP_PARENT_ORGANIZATION_ID);
Expand All @@ -194,33 +191,40 @@ private void createSubOrgRolesOnAppSharing(Map<String, Object> eventProperties)
(String) eventProperties.get(OrgApplicationMgtConstants.EVENT_PROP_SHARED_ORGANIZATION_ID);
String sharedApplicationId =
(String) eventProperties.get(OrgApplicationMgtConstants.EVENT_PROP_SHARED_APPLICATION_ID);
boolean hasAppAudiencedRoles = true;
// TODO: check application is using the application audience roles.
if (hasAppAudiencedRoles) {
try {
String mainApplicationTenantDomain = getOrganizationManager().resolveTenantDomain(parentOrganizationId);
String allowedAudienceForRoleAssociation =
OrganizationManagementHandlerDataHolder.getInstance().getApplicationManagementService()
.getAllowedAudienceForRoleAssociation(parentApplicationId, mainApplicationTenantDomain);
boolean hasAppAudiencedRoles =
RoleConstants.APPLICATION.equalsIgnoreCase(allowedAudienceForRoleAssociation);
if (!hasAppAudiencedRoles) {
return;
}
// Create the role if not exists, and add the relationship.
try {
String mainApplicationTenantDomain = getOrganizationManager().resolveTenantDomain(parentOrganizationId);
String sharedApplicationTenantDomain =
getOrganizationManager().resolveTenantDomain(sharedOrganizationId);
// Get parent organization's roles which has application audience.
String filter = "audienceId eq " + parentApplicationId;
List<RoleBasicInfo> parentOrgRoles =
getRoleManagementServiceV2().getRoles(filter, null, 0, null, null, mainApplicationTenantDomain);
for (RoleBasicInfo parentOrgRole : parentOrgRoles) {
String parentOrgRoleName = parentOrgRole.getName();
// Create the role in the sub org.
RoleBasicInfo subOrgRole =
getRoleManagementServiceV2().addRole(parentOrgRoleName, Collections.emptyList(),
Collections.emptyList(), Collections.emptyList(), RoleConstants.APPLICATION,
sharedApplicationId, sharedApplicationTenantDomain);
// Add relationship between parent org role and sub org role.
getRoleManagementServiceV2().addMainRoleToSharedRoleRelationship(parentOrgRole.getId(),
subOrgRole.getId(), mainApplicationTenantDomain, sharedApplicationTenantDomain);
}
} catch (OrganizationManagementException | IdentityRoleManagementException e) {
// TODO: handle exception
throw new RuntimeException(e);
String sharedApplicationTenantDomain = getOrganizationManager().resolveTenantDomain(sharedOrganizationId);
// Get parent organization's roles which has application audience.
String filter = RoleConstants.AUDIENCE_ID + " " + RoleConstants.EQ + " " + parentApplicationId;
List<RoleBasicInfo> parentOrgRoles =
getRoleManagementServiceV2().getRoles(filter, null, 0, null, null,
mainApplicationTenantDomain);
for (RoleBasicInfo parentOrgRole : parentOrgRoles) {
String parentOrgRoleName = parentOrgRole.getName();
// Create the role in the sub org.
RoleBasicInfo subOrgRole =
getRoleManagementServiceV2().addRole(parentOrgRoleName, Collections.emptyList(),
Collections.emptyList(), Collections.emptyList(), RoleConstants.APPLICATION,
sharedApplicationId, sharedApplicationTenantDomain);
// Add relationship between parent org role and sub org role.
getRoleManagementServiceV2().addMainRoleToSharedRoleRelationship(parentOrgRole.getId(),
subOrgRole.getId(), mainApplicationTenantDomain, sharedApplicationTenantDomain);
}
} catch (IdentityApplicationManagementException e) {
throw new IdentityEventException("Error occurred checking main application allowed role audience.", e);
} catch (OrganizationManagementException e) {
throw new IdentityEventException("Error occurred while resolving tenant domain from organization id.", e);
} catch (IdentityRoleManagementException e) {
throw new IdentityEventException("Error occurred while adding main role to shared role relationship.", e);
}
}

Expand Down
23 changes: 23 additions & 0 deletions ...ity/organization/management/handler/internal/OrganizationManagementHandlerDataHolder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

package org.wso2.carbon.identity.organization.management.handler.internal;

import org.wso2.carbon.identity.application.mgt.ApplicationManagementService;
import org.wso2.carbon.identity.event.services.IdentityEventService;
import org.wso2.carbon.identity.governance.IdentityGovernanceService;
import org.wso2.carbon.identity.organization.management.application.OrgApplicationManager;
Expand All @@ -37,6 +38,7 @@ public class OrganizationManagementHandlerDataHolder {
private OrganizationManager organizationManager;
private RoleManagementService roleManagementServiceV2;
private OrgApplicationManager orgApplicationManager;
private ApplicationManagementService applicationManagementService;

public static OrganizationManagementHandlerDataHolder getInstance() {

Expand Down Expand Up @@ -142,5 +144,26 @@ public void setOrgApplicationManager(OrgApplicationManager orgApplicationManager

this.orgApplicationManager = orgApplicationManager;
}

/**
* Get {@link ApplicationManagementService}.
*
* @return Application management instance {@link ApplicationManagementService}.
*/
public ApplicationManagementService getApplicationManagementService() {

return applicationManagementService;
}

/**
* Set {@link ApplicationManagementService}.
*
* @param applicationManagementService Instance of {@link ApplicationManagementService}.
*/
public void setApplicationManagementService(
ApplicationManagementService applicationManagementService) {

this.applicationManagementService = applicationManagementService;
}
}

22 changes: 21 additions & 1 deletion ...ganization/management/handler/internal/OrganizationManagementHandlerServiceComponent.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.osgi.service.component.annotations.ReferencePolicy;
import org.wso2.carbon.identity.application.mgt.ApplicationManagementService;
import org.wso2.carbon.identity.event.handler.AbstractEventHandler;
import org.wso2.carbon.identity.event.services.IdentityEventService;
import org.wso2.carbon.identity.governance.IdentityGovernanceService;
Expand Down Expand Up @@ -141,12 +142,31 @@ protected void unsetRoleManagementServiceV2(RoleManagementService roleManagement
protected void setOrgApplicationManagementService(OrgApplicationManager orgApplicationManagementService) {

OrganizationManagementHandlerDataHolder.getInstance().setOrgApplicationManager(orgApplicationManagementService);
LOG.debug("OrgApplication management service unset in OrganizationManagementHandlerService bundle.");
LOG.debug("OrgApplication management service set in OrganizationManagementHandlerService bundle.");
}

protected void unsetOrgApplicationManagementService(OrgApplicationManager orgApplicationManagementService) {

OrganizationManagementHandlerDataHolder.getInstance().setOrgApplicationManager(null);
LOG.debug("OrgApplication management service unset in OrganizationManagementHandlerService bundle.");
}

@Reference(
name = "org.wso2.carbon.identity.application.mgt.ApplicationManagementService",
service = org.wso2.carbon.identity.application.mgt.ApplicationManagementService.class,
cardinality = ReferenceCardinality.MANDATORY,
policy = ReferencePolicy.DYNAMIC,
unbind = "unsetApplicationManagementService")
protected void setApplicationManagementService(ApplicationManagementService applicationManagementService) {

OrganizationManagementHandlerDataHolder.getInstance()
.setApplicationManagementService(applicationManagementService);
LOG.debug("Application management service set in OrganizationManagementHandlerService bundle.");
}

protected void unsetApplicationManagementService(ApplicationManagementService applicationManagementService) {

OrganizationManagementHandlerDataHolder.getInstance().setApplicationManagementService(null);
LOG.debug("Application management service unset in OrganizationManagementHandlerService bundle.");
}
}

0 comments on commit 86f9849

Please sign in to comment.