Skip to content

Commit b2604ed

Browse files
Merge pull request #6152 from sadilchamishka/fix-enterprise-idp-issue
Remove runtime check for enterprise login
2 parents c943129 + 818c00a commit b2604ed

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

.changeset/honest-dingos-approve.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@wso2is/identity-apps-core": patch
3+
---
4+
5+
Remove runtime logic for enterprise login idp

identity-apps-core/apps/authentication-portal/src/main/webapp/login.jsp

+2-5
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
<%@ page import="static org.wso2.carbon.identity.application.authentication.endpoint.util.Constants.ENABLE_AUTHENTICATION_WITH_REST_API" %>
3131
<%@ page import="static org.wso2.carbon.identity.application.authentication.endpoint.util.Constants.ERROR_WHILE_BUILDING_THE_ACCOUNT_RECOVERY_ENDPOINT_URL" %>
3232
<%@ page import="org.wso2.carbon.identity.captcha.util.CaptchaUtil" %>
33-
<%@ page import="org.wso2.carbon.CarbonConstants" %>
3433
<%@ page import="org.wso2.carbon.identity.mgt.endpoint.util.IdentityManagementEndpointConstants" %>
3534
<%@ page import="org.wso2.carbon.identity.mgt.endpoint.util.client.CommonDataRetrievalClient" %>
3635
<%@ page import="org.wso2.carbon.identity.mgt.endpoint.util.client.IdentityProviderDataRetrievalClient" %>
@@ -118,11 +117,9 @@
118117
// EnterpriseLoginRetrievalClient enterpriseLoginRetrievalClient = new EnterpriseLoginRetrievalClient();
119118
// enterpriseUserloginEnabled = enterpriseLoginRetrievalClient.isEnterpriseLoginEnabled(userTenantDomain);
120119
121-
if (CarbonConstants.ENABLE_LEGACY_AUTHZ_RUNTIME != null && CarbonConstants.ENABLE_LEGACY_AUTHZ_RUNTIME) {
122-
CommonDataRetrievalClient commonDataRetrievalClient = new CommonDataRetrievalClient();
123-
enterpriseUserloginEnabled = commonDataRetrievalClient.checkBooleanProperty(ENTERPRISE_API_RELATIVE_PATH + userTenantDomain,
120+
CommonDataRetrievalClient commonDataRetrievalClient = new CommonDataRetrievalClient();
121+
enterpriseUserloginEnabled = commonDataRetrievalClient.checkBooleanProperty(ENTERPRISE_API_RELATIVE_PATH + userTenantDomain,
124122
null, ENTERPRISE_LOGIN_KEY, false, false);
125-
}
126123
} catch (Exception e) {
127124
// Ignored and send the default value.
128125
}

0 commit comments

Comments
 (0)