Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Allow application creation in sub organization level" #420

Merged
merged 1 commit into from
Jan 7, 2025
Merged

Revert "Allow application creation in sub organization level" #420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 9 additions & 16 deletions ...identity/organization/management/application/listener/FragmentApplicationMgtListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,22 +132,15 @@ public boolean doPreCreateApplication(ServiceProvider serviceProvider, String te
throws IdentityApplicationManagementException {

try {
boolean isFragmentApp = serviceProvider.getSpProperties() != null &&
Arrays.stream(serviceProvider.getSpProperties()).anyMatch(
property -> IS_FRAGMENT_APP.equals(property.getName()) &&
Boolean.parseBoolean(property.getValue()));
if (isFragmentApp) {
String organizationId = getOrganizationManager().resolveOrganizationId(tenantDomain);
int organizationDepthInHierarchy =
getOrganizationManager().getOrganizationDepthInHierarchy(organizationId);
if (isSubOrganization(organizationDepthInHierarchy) &&
!isSharedAppFromSharingProcess(serviceProvider, tenantDomain)) {
throw new IdentityApplicationManagementClientException(
ERROR_CODE_SUB_ORG_CANNOT_CREATE_APP.getCode(),
ERROR_CODE_SUB_ORG_CANNOT_CREATE_APP.getMessage());
}
String organizationId = getOrganizationManager().resolveOrganizationId(tenantDomain);
int organizationDepthInHierarchy =
getOrganizationManager().getOrganizationDepthInHierarchy(organizationId);
if (isSubOrganization(organizationDepthInHierarchy) &&
!isSharedAppFromInternalProcess(serviceProvider, tenantDomain)) {
throw new IdentityApplicationManagementClientException(
ERROR_CODE_SUB_ORG_CANNOT_CREATE_APP.getCode(),
ERROR_CODE_SUB_ORG_CANNOT_CREATE_APP.getMessage());
}
return true;
} catch (OrganizationManagementClientException e) {
if (LOG.isDebugEnabled()) {
LOG.debug("Organization not found for the tenant: " + tenantDomain);
Expand Down Expand Up @@ -591,7 +584,7 @@ private ClaimMapping[] addApplicationRolesToFilteredClaimMappings(ClaimMapping[]
* @param tenantDomain The tenant domain which the service provider app is belongs to.
* @return True if app is shared by an internal process of Asgardeo for sharing apps to sub organizations.
*/
private boolean isSharedAppFromSharingProcess(ServiceProvider serviceProvider, String tenantDomain) {
private boolean isSharedAppFromInternalProcess(ServiceProvider serviceProvider, String tenantDomain) {

return serviceProvider.getSpProperties() != null && Arrays.stream(serviceProvider.getSpProperties())
.anyMatch(property -> IS_FRAGMENT_APP.equals(property.getName()) &&
Expand Down
2 changes: 1 addition & 1 deletion ...tity/organization/management/application/listener/FragmentApplicationMgtListenerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ public Object[][] getSubOrganizationMetaData() {

return new Object[][]{
// Create application in sub-organization.
{"orgId2", 2, tenantDomain, false, false},
{"orgId2", 2, tenantDomain, false, true},
// Create an application in a sub-organization, and it's marked as a fragment app.
{"orgId3", 2, tenantDomain, true, true},
// Create an application marked as a fragmented app by an internal process of primaryTenantDomain.
Expand Down
Loading