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

Fix login page authenticators fallback logic #7975

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Fix login page authenticators fallback logic #7975

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1d1656d
Change authenticators fallback logic
PasinduYeshan Mar 31, 2025
64a1df7
Add changeset
PasinduYeshan Mar 31, 2025
b37cfae
Merge remote-tracking branch 'upstream/master' into fix/login-sec
PasinduYeshan Mar 31, 2025
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
5 changes: 5 additions & 0 deletions .changeset/hungry-teachers-hide.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@wso2is/identity-apps-core": patch
---

Fix login page authenticators fallback logic
25 changes: 19 additions & 6 deletions identity-apps-core/apps/authentication-portal/src/main/webapp/login.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,7 @@
iconId++;
if (!idpEntry.getKey().equals(Constants.RESIDENT_IDP_RESERVED_NAME)) {
String idpName = idpEntry.getKey();
String idpDisplayName = idpName;
String idpDisplayName = "Default IDP Name";
boolean isHubIdp = false;
boolean isGoogleIdp = false;
boolean isGitHubIdp = false;
Expand Down Expand Up @@ -681,6 +681,8 @@
try {
IdentityProviderDataRetrievalClient identityProviderDataRetrievalClient = new IdentityProviderDataRetrievalClient();
imageURL = identityProviderDataRetrievalClient.getIdPImage(tenantDomain, idpName);
// TODO: Improve the identityProviderDataRetrievalClient to return both image URL and idp name.
idpDisplayName = idpName;
} catch (IdentityProviderDataRetrievalClientException e) {
// Exception is ignored and the default `imageURL` value will be used as a fallback.
}
Expand Down Expand Up @@ -1067,16 +1069,17 @@
</div>
<br>
<%
}
}
for (String localAuthenticator : localAuthenticatorNames) {
String authenticatorDisplayName = "DEFAULT LOCAL AUTHENTICATOR NAME";
if (registeredLocalAuthenticators.contains(localAuthenticator)) {
continue;
}

if (localAuthenticator.startsWith(CUSTOM_LOCAL_AUTHENTICATOR_PREFIX)) {

String customLocalAuthenticatorImageURL = "libs/themes/default/assets/images/authenticators/custom-authenticator.svg";
String customLocalAuthenticatorDisplayName = localAuthenticator;
String customLocalAuthenticatorDisplayName = "DEFAULT CUSTOM AUTHENTICATOR NAME";
Map<String, String> authenticatorConfigMap = new HashMap<>();
try {
AuthenticatorDataRetrievalClient authenticatorDataRetrievalClient = new AuthenticatorDataRetrievalClient();
Expand Down Expand Up @@ -1119,7 +1122,17 @@
<br>
<br>
<%
continue;
continue;
}
} else {
try {
AuthenticatorDataRetrievalClient authenticatorDataRetrievalClient = new AuthenticatorDataRetrievalClient();
Map<String, String> authenticatorConfigMap = authenticatorDataRetrievalClient.getAuthenticatorConfig(tenantDomain, localAuthenticator);
if (StringUtils.isNotBlank(authenticatorConfigMap.get("displayName"))) {
authenticatorDisplayName = authenticatorConfigMap.get("displayName");
}
} catch (AuthenticatorDataRetrievalClientException e) {
// Exception is ignored and the default values will be used as a fallback.
}
}
%>
Expand All @@ -1141,11 +1154,11 @@
role="presentation">
<span>
<%=AuthenticationEndpointUtil.i18n(resourceBundle, "sign.in.with")%>
<%=localAuthenticator%>
<%=authenticatorDisplayName%>
</span>
</button>
</div>
</div>
</div>
<br>
<%
}
Expand Down