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.

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

Add support for admin to customize login layout #668

Merged
merged 4 commits into from
Feb 8, 2024
Merged

Conversation

Sae126V
Copy link
Contributor

@Sae126V Sae126V commented Nov 8, 2023

Resolves #298.

TODO:

Update https://indigo-iam.github.io/ with relevant information.

@Sae126V Sae126V self-assigned this Nov 8, 2023
@Sae126V Sae126V marked this pull request as ready for review November 15, 2023 07:46
@Sae126V Sae126V marked this pull request as draft November 16, 2023 10:43
@Sae126V Sae126V marked this pull request as ready for review November 16, 2023 11:31
@Sae126V Sae126V requested a review from giacomini December 4, 2023 16:01
Sign in with your ${iamOrganisationName} credentials
</c:when>
<c:otherwise>
Or sign in with your ${iamOrganisationName} credentials
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"Sign in" again?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In our scenario, Assuming that user want external authn block to be displayed first, Now for our local credentials section, we have to change the text to or sign in. Does that make sense, ?

test="${
(
loginPageConfiguration.localAuthenticationVisible
or param.sll != null
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can or be || (for uniformity)?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure..Updated the code to be consistent,

<jsp:include page="login-form.jsp" />
<c:if
test="${
!loginPageConfiguration.defaultLoginPageLayout
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't this equivalent to !loginPageConfiguration.defaultLoginPageLayout || !loginPageConfiguration.localAuthenticationVisible && param.ssl == null?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Simplified the logic. Done

<c:choose>
<c:when
test="${
(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't this equivalent to loginPageConfiguration.defaultLoginPageLayout && (loginPageConfiguration.localAuthenticationVisible || param.sll != null)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Simplified the logic. Done

Copy link

sonarqubecloud bot commented Dec 5, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

90.9% 90.9% Coverage
0.0% 0.0% Duplication

@rmiccoli rmiccoli merged commit ff575f2 into develop Feb 8, 2024
5 checks passed
@rmiccoli rmiccoli deleted the issue-298 branch February 8, 2024 16:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
No open projects
Status: Done
Development

Successfully merging this pull request may close these issues.

4 participants