Merge pull request #249 from georchestra/fix-insert-roles

fix: add roles from org to users when created

Author: f-necas

gateway/src/main/java/org/georchestra/gateway/accounts/admin/ldap/LdapAccountsManager.java

@@ -22,13 +22,15 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 import com.google.common.annotations.VisibleForTesting;
 import org.apache.commons.lang3.StringUtils;
 import org.georchestra.ds.DataServiceException;
 import org.georchestra.ds.DuplicatedCommonNameException;
 import org.georchestra.ds.orgs.Org;
 import org.georchestra.ds.orgs.OrgsDao;
+import org.georchestra.ds.roles.Role;
 import org.georchestra.ds.roles.RoleDao;
 import org.georchestra.ds.roles.RoleFactory;
 import org.georchestra.ds.users.Account;
@@ -236,6 +238,11 @@ private void ensureRolesExist(GeorchestraUser mapped, Account newAccount) {
             if (!mapped.getRoles().contains("ROLE_USER")) {
                 roleDao.addUser("USER", newAccount);
             }
+            if (newAccount.getOrg() != null) {
+                List<Role> r = roleDao.findAllForOrg(orgsDao.findByCommonName(newAccount.getOrg()));
+                if (!r.isEmpty())
+                    roleDao.addUsersInRoles(r.stream().map(Role::getName).collect(Collectors.toList()), List.of(newAccount));
+            }
             for (String role : mapped.getRoles()) {
                 role = role.replaceFirst("^ROLE_", "");
                 ensureRoleExists(role);

pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.springframework.cloud</groupId>
     <artifactId>spring-cloud-starter-parent</artifactId>
-    <version>2024.0.1</version>
+    <version>2024.0.3</version>
     <relativePath></relativePath>
     <!-- lookup parent from repository -->
   </parent>