Merge branch 'hotfix/22.0.5'

CenterForOpenScience · Jul 29, 2022 · a96757e · a96757e
2 parents de2d779 + d675102
commit a96757e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 We follow the CalVer (https://calver.org/) versioning scheme: YY.MINOR.MICRO.
 
+22.0.5 (07-29-2022)
+===================
+
+Support shared SSO between FSU and MagLab
+
 22.0.4 (06-29-2022)
 ===================
 

diff --git a/...n/java/io/cos/cas/osf/web/flow/login/OsfPrincipalFromNonInteractiveCredentialsAction.java b/...n/java/io/cos/cas/osf/web/flow/login/OsfPrincipalFromNonInteractiveCredentialsAction.java
@@ -558,6 +558,7 @@ private OsfApiInstitutionAuthenticationResult notifyOsfApiOfInstnAuthnSuccess(
         final String givenName = user.optString("givenName").trim();
         final String familyName = user.optString("familyName").trim();
         final String isMemberOf = user.optString("isMemberOf").trim();
+        final String userRoles = user.optString("userRoles").trim();
         if (username.isEmpty()) {
             LOGGER.error("[CAS XSLT] Missing email (username) for user at institution '{}'", institutionId);
             throw new InstitutionSsoFailedException("Missing email (username)");
@@ -568,13 +569,20 @@ private OsfApiInstitutionAuthenticationResult notifyOsfApiOfInstnAuthnSuccess(
         }
         if (!isMemberOf.isEmpty()) {
             LOGGER.info(
-                    "[CAS XSLT] Secondary institution detected: username={}, institution={}, member={}",
+                    "[CAS XSLT] Shared SSO \"isMemberOf\" detected: username={}, institution={}, isMemberOf={}",
                     username,
                     institutionId,
                     isMemberOf
             );
+        } else if (!userRoles.isEmpty()) {
+            LOGGER.info(
+                    "[CAS XSLT] Shared SSO \"userRoles\" detected: username={}, institution={}, userRoles={}",
+                    username,
+                    institutionId,
+                    userRoles
+            );
         } else {
-            LOGGER.debug("[CAS XSLT] Secondary institution is not provided: username={}, institution={}", username, institutionId);
+            LOGGER.debug("[CAS XSLT] Shared SSO not eligible: username={}, institution={}", username, institutionId);
         }
         // Parse the department attribute
         final String departmentRaw = user.optString("departmentRaw").trim();