Merge branch 'feature/fix-relative-logout-service-url' into develop

Author: cslzchen

src/main/java/io/cos/cas/osf/web/flow/config/OsfCasWebflowContextConfiguration.java

@@ -59,4 +59,13 @@ public CasWebflowConfigurer defaultLogoutWebflowConfigurer() {
         osfCasLogoutWebFlowConfigurer.setOrder(Ordered.HIGHEST_PRECEDENCE);
         return osfCasLogoutWebFlowConfigurer;
     }
+
+    // TODO: Move all server-specific URLs, endpoints and other attributes to a dedicated class and initialize it as a
+    //       bean. ThymeLeaf templates can access Spring beans, which solves the issue of CasConfigurationProperties
+    //       accessibility in templates. For more details, refer to section "Spring Beans" in the following guide:
+    //       https://www.thymeleaf.org/doc/articles/springmvcaccessdata.html for details
+    @Bean(name="casServerLoginUrl")
+    public String casServerLoginUrl() {
+        return casProperties.getServer().getName() + "/login";
+    }
 }

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(casRedirectSource=cas)}">
+                <section class="text-with-mdi" th:with="loginUrl=@{${@casServerLoginUrl}(casRedirectSource=cas)}">
                     <span><a th:href="@{/logout(service=${loginUrl})}" th:utext="#{screen.error.page.loginagain}"></a></span>
                 </section>
             </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(casRedirectSource=cas)}">
+                <section class="form-button" th:with="loginUrl=@{${@casServerLoginUrl}(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(casRedirectSource=cas)}">
+                <section class="text-with-mdi" th:with="loginUrl=@{${@casServerLoginUrl}(casRedirectSource=cas)}">
                     <span><a th:href="@{/logout(service=${loginUrl})}" th:utext="#{screen.error.page.loginagain}"></a></span>
                 </section>
             </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(casRedirectSource=cas)}">
+                <section class="text-with-mdi" th:with="loginUrl=@{${@casServerLoginUrl}(casRedirectSource=cas)}">
                     <span><a th:href="@{/logout(service=${loginUrl})}" th:utext="#{screen.error.page.loginagain}"></a></span>
                 </section>
             </section>

src/main/resources/templates/casLogoutView.html

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

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(casRedirectSource=cas)}">
+                <section class="form-button" th:with="loginUrl=@{${@casServerLoginUrl}(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

@@ -33,7 +33,7 @@ <h2 th:utext="#{screen.unavailable.heading}"></h2>
                     <pre th:utext="${'Timestamp: ' + #dates.formatISO(#dates.createNow())}"></pre>
                     <pre th:text="${'Message: ' + message}"></pre>
                 </section>
-                <section class="form-button" th:with="loginUrl=@{/login(casRedirectSource=cas)}">
+                <section class="form-button" th:with="loginUrl=@{${@casServerLoginUrl}(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>