Replace "errorSource" with "casRedirectSource"

With recent FE rework on the "login again" link / button, how CAS
handles such redirection no longer only applies to customized or
flowless error pages. Thus, the property name and its query param
name and accepted values have all been updated.

Author: cslzchen

src/main/java/io/cos/cas/osf/web/flow/login/OsfAbstractLoginPreparationAction.java

@@ -43,9 +43,9 @@ public abstract class OsfAbstractLoginPreparationAction extends AbstractAuthenti
 
     protected static final String PARAMETER_ORCID_REDIRECT_VALUE = "true";
 
-    protected static final String PARAMETER_ERROR_SOURCE = "errorSource";
+    protected static final String PARAMETER_REDIRECT_SOURCE = "casRedirectSource";
 
-    protected static final List<String> EXPECTED_ERROR_CODES = new LinkedList<>(Arrays.asList("401", "403", "404", "405", "423", "-1"));
+    protected static final List<String> EXPECTED_REDIRECT_CODES = new LinkedList<>(Arrays.asList("tomcat", "cas"));
 
     public OsfAbstractLoginPreparationAction(
             final CasDelegatingWebflowEventResolver initialAuthenticationAttemptWebflowEventResolver,

src/main/java/io/cos/cas/osf/web/flow/login/OsfDefaultLoginPreparationAction.java

@@ -147,8 +147,8 @@ private String getEncodedServiceUrlFromRequestContext(final RequestContext conte
     }
 
     private boolean isFromFlowlessErrorPage(final RequestContext context) {
-        final String errorCode = context.getRequestParameters().get(PARAMETER_ERROR_SOURCE);
-        return !StringUtils.isBlank(errorCode) && EXPECTED_ERROR_CODES.contains(errorCode);
+        final String errorCode = context.getRequestParameters().get(PARAMETER_REDIRECT_SOURCE);
+        return !StringUtils.isBlank(errorCode) && EXPECTED_REDIRECT_CODES.contains(errorCode);
     }
 
     private Event continueToUsernamePasswordLogin() {

src/main/resources/templates/casAccountDisabledView.html

@@ -33,7 +33,7 @@ <h2 th:utext="#{screen.accountdisabled.heading}"></h2>
                     </a>
                 </section>
                 <hr class="my-4" />
-                <section class="text-with-mdi" th:with="loginUrl=@{/login(errorSource=401)}">
+                <section class="text-with-mdi" th:with="loginUrl=@{/login(casRedirectSource=cas)}">
                     <i class="mdi mdi-login mdi-before-text"></i>
                     <span><a th:href="@{/logout(service=${loginUrl})}" th:utext="#{screen.error.page.loginagain}"></a></span>
                 </section>

src/main/resources/templates/casInstitutionSsoFailedView.html

@@ -27,7 +27,7 @@
                     <h2 th:utext="#{screen.institutionssofailed.heading}"></h2>
                     <p th:utext="#{screen.institutionssofailed.message}"></p>
                 </section>
-                <section class="form-button" th:with="loginUrl=@{/login(errorSource=401)}">
+                <section class="form-button" th:with="loginUrl=@{/login(casRedirectSource=cas)}">
                     <a class="mdc-button mdc-button--raised button-osf-blue" th:href="@{/logout(service=${loginUrl})}">
                         <span class="mdc-button__label" th:utext="#{screen.error.page.loginagain}"></span>
                     </a>

src/main/resources/templates/casInvalidUserStatusView.html

@@ -33,7 +33,7 @@ <h2 th:utext="#{screen.invaliduserstatus.heading}"></h2>
                     </a>
                 </section>
                 <hr class="my-4" />
-                <section class="text-with-mdi" th:with="loginUrl=@{/login(errorSource=401)}">
+                <section class="text-with-mdi" th:with="loginUrl=@{/login(casRedirectSource=cas)}">
                     <i class="mdi mdi-login mdi-before-text"></i>
                     <span><a th:href="@{/logout(service=${loginUrl})}" th:utext="#{screen.error.page.loginagain}"></a></span>
                 </section>

src/main/resources/templates/casInvalidVerificationKeyView.html

@@ -33,7 +33,7 @@ <h2 th:utext="#{screen.invalidverificationkey.heading}"></h2>
                     </a>
                 </section>
                 <hr class="my-4" />
-                <section class="text-with-mdi" th:with="loginUrl=@{/login(errorSource=401)}">
+                <section class="text-with-mdi" th:with="loginUrl=@{/login(casRedirectSource=cas)}">
                     <i class="mdi mdi-login mdi-before-text"></i>
                     <span><a th:href="@{/logout(service=${loginUrl})}" th:utext="#{screen.error.page.loginagain}"></a></span>
                 </section>

src/main/resources/templates/casLogoutView.html

@@ -35,7 +35,7 @@ <h2 th:utext="#{screen.generic.logoutsuccess.heading}"></h2>
                 <hr class="my-4" />
                 <section class="text-with-mdi" th:with="loginUrl=@{/login(casRedirectSource=cas)}">
                     <i class="mdi mdi-login mdi-before-text"></i>
-                    <span><a th:href="@{/login(casRedirectSource=200)}" th:utext="#{screen.generic.logoutsuccess.link.login}"></a></span>
+                    <span><a th:href="@{/login(casRedirectSource=cas)}" th:utext="#{screen.generic.logoutsuccess.link.login}"></a></span>
                 </section>
             </section>
         </div>

src/main/resources/templates/casServiceErrorView.html

@@ -27,7 +27,7 @@
                     <h2 th:utext="#{screen.service.error.heading}"></h2>
                     <p th:if="${rootCauseException != null and rootCauseException.code != null}" th:utext="#{${rootCauseException.code}}"></p>
                 </section>
-                <section class="form-button" th:with="loginUrl=@{/login(errorSource=401)}">
+                <section class="form-button" th:with="loginUrl=@{/login(casRedirectSource=cas)}">
                     <a class="mdc-button mdc-button--raised button-osf-blue" th:href="@{/logout(service=${loginUrl})}">
                         <span class="mdc-button__label" th:utext="#{screen.error.page.loginagain}"></span>
                     </a>

src/main/resources/templates/error.html

@@ -27,7 +27,7 @@
                     <h2 th:utext="#{screen.unavailable.heading}"></h2>
                     <div th:utext="#{screen.unavailable.message}"></div>
                 </section>
-                <section class="form-button" th:with="loginUrl=@{/login(errorSource=401)}">
+                <section class="form-button" th:with="loginUrl=@{/login(casRedirectSource=cas)}">
                     <a class="mdc-button mdc-button--raised button-osf-blue" th:href="@{/logout(service=${loginUrl})}">
                         <span class="mdc-button__label" th:utext="#{screen.error.page.loginagain}"></span>
                     </a>

src/main/resources/templates/error/401.html

@@ -35,7 +35,7 @@ <h2 th:utext="#{screen.error.page.accessdenied}"></h2>
 
                 <section class="text-with-mdi">
                     <i class="mdi mdi-login mdi-before-text"></i>
-                    <span><a th:href="@{/login(errorSource=401)}" th:utext="#{screen.error.page.loginagain}"></a></span>
+                    <span><a th:href="@{/login(casRedirectSource=tomcat)}" th:utext="#{screen.error.page.loginagain}"></a></span>
                 </section>
 
             </section>