From c20d5eb69872654648b0ca733e92aef4c76f77c3 Mon Sep 17 00:00:00 2001
From: pieterlukasse <pieterlukasse@gmail.com>
Date: Mon, 20 Nov 2023 13:39:50 +0100
Subject: [PATCH] tmp: add default roles on the fly

... just for testing at the moment. System roles should really be
assigned to the user beforehand as part of the onboarding process...
---
 .../java/org/ohdsi/webapi/shiro/PermissionManager.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/ohdsi/webapi/shiro/PermissionManager.java b/src/main/java/org/ohdsi/webapi/shiro/PermissionManager.java
index 3d56d9d99..cb41dc8ad 100644
--- a/src/main/java/org/ohdsi/webapi/shiro/PermissionManager.java
+++ b/src/main/java/org/ohdsi/webapi/shiro/PermissionManager.java
@@ -213,10 +213,12 @@ public UserEntity registerUser(final String login, final String name, final User
         removeAllUserRolesFromUser(login, user);
         // add back just the given newUserRoles:
         addRolesForUser(login, userOrigin, user, newUserRoles, false);
+        // make sure the default roles are there: TODO - discuss if really necessary....
+        addDefaultRolesForUser(login, userOrigin, user, defaultRoles);
       }
       // get user again, fresh from db with all new roles:
       user = userRepository.findOne(user.getId());
-      return user;
+      return user;  // >>>>>>>>>> RETURN! Add else for readability???
     }
 
     checkRoleIsAbsent(login, false, "User with such login has been improperly removed from the database. " +
@@ -232,7 +234,7 @@ public UserEntity registerUser(final String login, final String name, final User
     this.addUser(user, personalRole, userOrigin, null);
     addRolesForUser(login, userOrigin, user, newUserRoles, false);
     addDefaultRolesForUser(login, userOrigin, user, defaultRoles);
-    // // get user again, fresh from db with all new roles:
+    // get user again, fresh from db with all new roles:
     user = userRepository.findOne(user.getId());
     return user;
   }
@@ -500,7 +502,7 @@ private UserRoleEntity addUser(final UserEntity user, final RoleEntity role,
                                  final UserOrigin userOrigin, final String status) {
     UserRoleEntity relation = this.userRoleRepository.findByUserAndRole(user, role);
     if (relation == null) {
-      logger.debug("The system role={} is new for this user. Adding...", role.getName());
+      logger.debug("The role={} is new for this user. Adding...", role.getName());
       relation = new UserRoleEntity();
       relation.setUser(user);
       relation.setRole(role);
@@ -508,7 +510,7 @@ private UserRoleEntity addUser(final UserEntity user, final RoleEntity role,
       relation.setOrigin(userOrigin);
       relation = this.userRoleRepository.save(relation);
     } else {
-        logger.debug("The user already had the system role={}", role.getName());
+        logger.debug("The user already had the role={}", role.getName());
     }
 
     return relation;