From 93a2ae236d670dfa0d4557d8aa40d51e1adaa529 Mon Sep 17 00:00:00 2001 From: sadilchamishka Date: Sat, 4 May 2024 10:22:46 +0530 Subject: [PATCH 1/2] Remove runtime check for enterprise login --- .../apps/authentication-portal/src/main/webapp/login.jsp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/identity-apps-core/apps/authentication-portal/src/main/webapp/login.jsp b/identity-apps-core/apps/authentication-portal/src/main/webapp/login.jsp index da11d97f9ed..ec51c3e5e27 100755 --- a/identity-apps-core/apps/authentication-portal/src/main/webapp/login.jsp +++ b/identity-apps-core/apps/authentication-portal/src/main/webapp/login.jsp @@ -30,7 +30,6 @@ <%@ page import="static org.wso2.carbon.identity.application.authentication.endpoint.util.Constants.ENABLE_AUTHENTICATION_WITH_REST_API" %> <%@ page import="static org.wso2.carbon.identity.application.authentication.endpoint.util.Constants.ERROR_WHILE_BUILDING_THE_ACCOUNT_RECOVERY_ENDPOINT_URL" %> <%@ page import="org.wso2.carbon.identity.captcha.util.CaptchaUtil" %> -<%@ page import="org.wso2.carbon.CarbonConstants" %> <%@ page import="org.wso2.carbon.identity.mgt.endpoint.util.IdentityManagementEndpointConstants" %> <%@ page import="org.wso2.carbon.identity.mgt.endpoint.util.client.CommonDataRetrievalClient" %> <%@ page import="org.wso2.carbon.identity.mgt.endpoint.util.client.IdentityProviderDataRetrievalClient" %> @@ -118,11 +117,9 @@ // EnterpriseLoginRetrievalClient enterpriseLoginRetrievalClient = new EnterpriseLoginRetrievalClient(); // enterpriseUserloginEnabled = enterpriseLoginRetrievalClient.isEnterpriseLoginEnabled(userTenantDomain); - if (CarbonConstants.ENABLE_LEGACY_AUTHZ_RUNTIME != null && CarbonConstants.ENABLE_LEGACY_AUTHZ_RUNTIME) { - CommonDataRetrievalClient commonDataRetrievalClient = new CommonDataRetrievalClient(); - enterpriseUserloginEnabled = commonDataRetrievalClient.checkBooleanProperty(ENTERPRISE_API_RELATIVE_PATH + userTenantDomain, + CommonDataRetrievalClient commonDataRetrievalClient = new CommonDataRetrievalClient(); + enterpriseUserloginEnabled = commonDataRetrievalClient.checkBooleanProperty(ENTERPRISE_API_RELATIVE_PATH + userTenantDomain, null, ENTERPRISE_LOGIN_KEY, false, false); - } } catch (Exception e) { // Ignored and send the default value. } From 818c00adf17f07639834f5b9c839471faeac0bb8 Mon Sep 17 00:00:00 2001 From: sadilchamishka Date: Sat, 4 May 2024 10:25:20 +0530 Subject: [PATCH 2/2] =?UTF-8?q?Add=20changeset=20=F0=9F=A6=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .changeset/honest-dingos-approve.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/honest-dingos-approve.md diff --git a/.changeset/honest-dingos-approve.md b/.changeset/honest-dingos-approve.md new file mode 100644 index 00000000000..f5f17276b13 --- /dev/null +++ b/.changeset/honest-dingos-approve.md @@ -0,0 +1,5 @@ +--- +"@wso2is/identity-apps-core": patch +--- + +Remove runtime logic for enterprise login idp