Merge pull request #130 from TAMULib/2.x-affiliation

Affiliations need to handle the NULL case otherwise assume user gets NULL rather than UNKNOWN.
TAMULib · Feb 2, 2022 · 8e07fd5 · 8e07fd5
2 parents 69d1fe9 + d69ccba
commit 8e07fd5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/auth/src/main/java/edu/tamu/weaver/auth/controller/WeaverAssumeUserController.java b/auth/src/main/java/edu/tamu/weaver/auth/controller/WeaverAssumeUserController.java
@@ -74,7 +74,7 @@ public ApiResponse assume(@RequestParam() Map<String, String> params) throws Exc
             claims.put("tdl-givenname", info.get("first_name"));
             claims.put("tdl-mail", info.get("tamu_preferred_alias"));
 
-            String affiliation = info.get("employee_type_name");
+            String affiliation = info.getOrDefault("employee_type_name", "");
 
             if ("".equals(affiliation) || "Student".equals(affiliation)) {
                 String classification = info.get("classification_name").split(" ")[0].replace(",", "");

diff --git a/auth/src/main/java/edu/tamu/weaver/auth/model/Credentials.java b/auth/src/main/java/edu/tamu/weaver/auth/model/Credentials.java
@@ -48,7 +48,7 @@ public Credentials(Claims claims) {
         this.exp = String.valueOf(claims.get("exp"));
         this.email = String.valueOf(claims.get("email"));
         this.role = String.valueOf(claims.get("role"));
-        this.affiliation = String.valueOf(claims.get("affiliation"));
+        this.affiliation = String.valueOf(claims.getOrDefault("affiliation", ""));
         claims.entrySet().forEach(entry -> {
             this.allCredentials.put(entry.getKey(), String.valueOf(entry.getValue()));
         });
@@ -70,7 +70,7 @@ public Credentials(Map<String, Object> claims) {
         this.exp = String.valueOf(claims.get("exp"));
         this.email = String.valueOf(claims.get("email"));
         this.role = String.valueOf(claims.get("role"));
-        this.affiliation = String.valueOf(claims.get("affiliation"));
+        this.affiliation = String.valueOf(claims.getOrDefault("affiliation", ""));
         claims.entrySet().forEach(entry -> {
             this.allCredentials.put(entry.getKey(), String.valueOf(entry.getValue()));
         });

diff --git a/auth/src/main/java/edu/tamu/weaver/auth/service/UserCredentialsService.java b/auth/src/main/java/edu/tamu/weaver/auth/service/UserCredentialsService.java
@@ -29,7 +29,7 @@ public Credentials buildAnonymousCredentials() {
     }
 
     public abstract U updateUserByCredentials(Credentials credentials);
-    
+
     public abstract String getAnonymousRole();
 
 }