Update checks to be consistent and simple

indigo-iam · Dec 5, 2023 · 8234f56 · 8234f56
1 parent 5eae0b1
commit 8234f56
Showing 1 changed file with 14 additions and 16 deletions.
diff --git a/iam-login-service/src/main/webapp/WEB-INF/views/iam/login.jsp b/iam-login-service/src/main/webapp/WEB-INF/views/iam/login.jsp
@@ -76,9 +76,9 @@
         <c:if
             test="${
                 (
-                    loginPageConfiguration.localAuthenticationVisible
-                    or param.sll != null
-                ) && loginPageConfiguration.defaultLoginPageLayout
+                  loginPageConfiguration.localAuthenticationVisible
+                  or param.sll != null
+                ) and loginPageConfiguration.defaultLoginPageLayout
             }"
         >
             <jsp:include page="login-form.jsp" />
@@ -87,9 +87,9 @@
         <c:if
             test="${
                 !loginPageConfiguration.defaultLoginPageLayout
-                || (
-                    !loginPageConfiguration.localAuthenticationVisible
-                    && (param.sll == null or !loginPageConfiguration.defaultLoginPageLayout)
+                or (
+                  !loginPageConfiguration.localAuthenticationVisible
+                  and param.sll == null
                 )
             }"
         >
@@ -104,13 +104,11 @@
                     <c:choose>
                         <c:when
                             test="${
-                                (
-                                    loginPageConfiguration.localAuthenticationVisible
-                                    && loginPageConfiguration.defaultLoginPageLayout
-                                ) || (
-                                    loginPageConfiguration.defaultLoginPageLayout
-                                    && param.sll != null
-                                )
+                              loginPageConfiguration.defaultLoginPageLayout
+                              and (
+                                loginPageConfiguration.localAuthenticationVisible
+                                or param.sll != null
+                              )
                             }"
                         >
                             Or sign in with
@@ -188,9 +186,9 @@
         <c:if
             test="${
                 (
-                    loginPageConfiguration.localAuthenticationVisible
-                    or param.sll != null
-                ) && !loginPageConfiguration.defaultLoginPageLayout
+                  loginPageConfiguration.localAuthenticationVisible
+                  or param.sll != null
+                ) and !loginPageConfiguration.defaultLoginPageLayout
             }"
         >
             <jsp:include page="login-form.jsp" />