Merge pull request #6152 from sadilchamishka/fix-enterprise-idp-issue

Remove runtime check for enterprise login
wso2 · May 4, 2024 · b2604ed · b2604ed
2 parents c943129 + 818c00a
commit b2604ed
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/.changeset/honest-dingos-approve.md b/.changeset/honest-dingos-approve.md
@@ -0,0 +1,5 @@
+---
+"@wso2is/identity-apps-core": patch
+---
+
+Remove runtime logic for enterprise login idp
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
@@ -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.
         }