From b9ff3aa3cb8f41e8329327de6adb29e4e3c09edc Mon Sep 17 00:00:00 2001 From: asha15 <165079T@uom.lk> Date: Thu, 29 Aug 2024 11:56:01 +0530 Subject: [PATCH 1/2] add discoverable property --- .../application/listener/FragmentApplicationMgtListener.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/components/org.wso2.carbon.identity.organization.management.application/src/main/java/org/wso2/carbon/identity/organization/management/application/listener/FragmentApplicationMgtListener.java b/components/org.wso2.carbon.identity.organization.management.application/src/main/java/org/wso2/carbon/identity/organization/management/application/listener/FragmentApplicationMgtListener.java index 17edf580..1e95796f 100644 --- a/components/org.wso2.carbon.identity.organization.management.application/src/main/java/org/wso2/carbon/identity/organization/management/application/listener/FragmentApplicationMgtListener.java +++ b/components/org.wso2.carbon.identity.organization.management.application/src/main/java/org/wso2/carbon/identity/organization/management/application/listener/FragmentApplicationMgtListener.java @@ -300,6 +300,8 @@ public boolean doPostGetServiceProvider(ServiceProvider serviceProvider, String inheritAPIBasedAuthenticationEnabledProperty(mainApplication, serviceProvider); // Inherit Application enabled property from the main application. inheritApplicationEnabledProperty(mainApplication, serviceProvider); + // Inherit discoverable property from the main application. + serviceProvider.setDiscoverable(mainApplication.isDiscoverable()); /* If the shared application doesn't have a configured access URL, From 4c67494d7355ed1738d949cdb21a45bb3ad39881 Mon Sep 17 00:00:00 2001 From: asha15 <165079T@uom.lk> Date: Sun, 8 Sep 2024 16:29:46 +0530 Subject: [PATCH 2/2] Update discoverability property logic --- .../listener/FragmentApplicationMgtListener.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/components/org.wso2.carbon.identity.organization.management.application/src/main/java/org/wso2/carbon/identity/organization/management/application/listener/FragmentApplicationMgtListener.java b/components/org.wso2.carbon.identity.organization.management.application/src/main/java/org/wso2/carbon/identity/organization/management/application/listener/FragmentApplicationMgtListener.java index 1e95796f..28363962 100644 --- a/components/org.wso2.carbon.identity.organization.management.application/src/main/java/org/wso2/carbon/identity/organization/management/application/listener/FragmentApplicationMgtListener.java +++ b/components/org.wso2.carbon.identity.organization.management.application/src/main/java/org/wso2/carbon/identity/organization/management/application/listener/FragmentApplicationMgtListener.java @@ -300,8 +300,7 @@ public boolean doPostGetServiceProvider(ServiceProvider serviceProvider, String inheritAPIBasedAuthenticationEnabledProperty(mainApplication, serviceProvider); // Inherit Application enabled property from the main application. inheritApplicationEnabledProperty(mainApplication, serviceProvider); - // Inherit discoverable property from the main application. - serviceProvider.setDiscoverable(mainApplication.isDiscoverable()); + inheritDiscoverabilityProperty(mainApplication, serviceProvider); /* If the shared application doesn't have a configured access URL, @@ -319,6 +318,11 @@ public boolean doPostGetServiceProvider(ServiceProvider serviceProvider, String return super.doPostGetServiceProvider(serviceProvider, applicationName, tenantDomain); } + private void inheritDiscoverabilityProperty(ServiceProvider mainApplication, ServiceProvider sharedApplication) { + + sharedApplication.setDiscoverable(mainApplication.isDiscoverable() || sharedApplication.isDiscoverable()); + } + private void inheritAPIBasedAuthenticationEnabledProperty(ServiceProvider mainApplication, ServiceProvider sharedApplication) {