[DUOS-3021][risk=no] Handle null roles better (#2279)

DataBiosphere · Apr 4, 2024 · 0f28492 · 0f28492
1 parent 898700f
commit 0f28492
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/src/main/java/org/broadinstitute/consent/http/util/InstitutionUtil.java b/src/main/java/org/broadinstitute/consent/http/util/InstitutionUtil.java
@@ -5,11 +5,12 @@
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import java.util.List;
+import java.util.Objects;
 import org.broadinstitute.consent.http.enumeration.UserRoles;
 import org.broadinstitute.consent.http.models.User;
 import org.broadinstitute.consent.http.models.UserRole;
 
-public class InstitutionUtil {
+public class InstitutionUtil implements ConsentLogger {
 
   private final GsonBuilder gson;
 
@@ -28,8 +29,12 @@ public Gson getGsonBuilder(Boolean isAdmin) {
 
   public Boolean checkIfAdmin(User user) {
     List<UserRole> roles = user.getRoles();
+    if (roles == null || roles.isEmpty()) {
+      logWarn("User has no roles: " + user.getEmail());
+      return false;
+    }
     return roles.stream()
-        .anyMatch((userRole) -> userRole.getRoleId() == UserRoles.ADMIN.getRoleId());
+        .anyMatch((userRole) -> Objects.equals(userRole.getRoleId(), UserRoles.ADMIN.getRoleId()));
   }
 
   private ExclusionStrategy getSerializationExclusionStrategy(Boolean isAdmin) {

diff --git a/src/test/java/org/broadinstitute/consent/http/util/InstitutionUtilTest.java b/src/test/java/org/broadinstitute/consent/http/util/InstitutionUtilTest.java
@@ -44,11 +44,10 @@ void setUp() {
   }
 
   @Test
-  void testCheckIfAdmin() {
-    Boolean adminResult = util.checkIfAdmin(adminUser);
-    Boolean researcherResult = util.checkIfAdmin(researcherUser);
-    assertTrue(adminResult);
-    assertFalse(researcherResult);
+  void testCheckIfAdminAdmin() {
+    assertTrue(util.checkIfAdmin(adminUser));
+    assertFalse(util.checkIfAdmin(researcherUser));
+    assertFalse(util.checkIfAdmin(new User()));
   }
 
   @Test