From a8ae11c4f433f14af49eb7837d3e59aac0b5fce5 Mon Sep 17 00:00:00 2001 From: gcolon021 Date: Fri, 18 Aug 2023 14:55:37 -0400 Subject: [PATCH] [ALS-4793] Remove duplicate default role --- .../auth/service/auth/OpenAuthenticationService.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pic-sure-auth-services/src/main/java/edu/harvard/hms/dbmi/avillach/auth/service/auth/OpenAuthenticationService.java b/pic-sure-auth-services/src/main/java/edu/harvard/hms/dbmi/avillach/auth/service/auth/OpenAuthenticationService.java index 1a05e7e1c..80d20ece2 100644 --- a/pic-sure-auth-services/src/main/java/edu/harvard/hms/dbmi/avillach/auth/service/auth/OpenAuthenticationService.java +++ b/pic-sure-auth-services/src/main/java/edu/harvard/hms/dbmi/avillach/auth/service/auth/OpenAuthenticationService.java @@ -42,13 +42,11 @@ public Response authenticate(Map authRequest) { if (current_user == null) { current_user = userRepository.createOpenAccessUser(); - // All roles already exist, so we don't need to create them. - // We are using this approach so it is added to the user's roles - setDefaultUserRoles(current_user); - //clear some cache entries if we register a new login AuthorizationService.clearCache(current_user); UserService.clearCache(current_user); + + setDefaultUserRoles(current_user); } HashMap claims = new HashMap<>(); @@ -63,7 +61,6 @@ public Response authenticate(Map authRequest) { } private void setDefaultUserRoles(User current_user) { - fenceAuthenticationService.upsertRole(current_user, FENCEAuthenticationService.fence_open_access_role_name, null); fenceAuthenticationService.upsertRole(current_user, "FENCE_PRIV_OPEN_ACCESS", null); fenceAuthenticationService.upsertRole(current_user, "FENCE_PRIV_DICTIONARY", null); userRepository.merge(current_user);