Merge branch 'hotfix/21.2.3'

Author: cslzchen

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 We follow the CalVer (https://calver.org/) versioning scheme: YY.MINOR.MICRO.
 
+21.2.3 (05-03-2021)
+===================
+
+Fix login URLs for cas-pac4j institution SSO
+
 21.2.2 (04-29-2021)
 ===================
 

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

@@ -110,7 +110,7 @@ private void putPac4jInstnLoginUrls(final RequestContext context) {
                     } else {
                         final String clientUrl = ((DelegatedClientIdentityProviderConfiguration) client).getRedirectUrl();
                         pac4jInstitutionLoginUrlMap.put(clientName, clientUrl);
-                        LOGGER.warn("{}: {}", clientName, clientUrl);
+                        LOGGER.debug("Store PAC4J institution client [{}] with redirect URL [{}] in context", clientName, clientUrl);
                     }
                 }
             }

src/main/resources/templates/casInstitutionLoginView.html

@@ -93,11 +93,11 @@ <h2 th:utext="#{screen.institutionlogin.heading}"></h2>
                     }
                     if (institutionLoginUrl === "okstate") {
                         /*<![CDATA[*/
-                            institutionLoginUrl = /*[[${okstateUrl}]]*/ '';
+                            institutionLoginUrl = /*[[${pac4jInstnLoginUrls.get('okstate')}]]*/ '';
                         /*]]>*/
                     } else if (institutionLoginUrl === "cord") {
                         /*<![CDATA[*/
-                            institutionLoginUrl = /*[[${cordUrl}]]*/ '';
+                            institutionLoginUrl = /*[[${pac4jInstnLoginUrls.get('cord')}]]*/ '';
                         /*]]>*/
                     } else if (institutionLoginUrl === "fakecas") {
                         /*<![CDATA[*/