georchestra#174 georchestra#158 - change o or set user's rg if orgUni…

…queId don't match
jdev-org · Feb 3, 2025 · daee66c · daee66c
1 parent 2a36294
commit daee66c
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/gateway/src/main/java/org/georchestra/gateway/accounts/admin/ldap/LdapAccountsManager.java b/gateway/src/main/java/org/georchestra/gateway/accounts/admin/ldap/LdapAccountsManager.java
@@ -109,7 +109,13 @@ protected void createInternal(GeorchestraUser mapped) throws DuplicatedEmailFoun
         }
 
         try {
-            ensureOrgExists(newAccount);
+            String providerName = newAccount.getOAuth2Provider();
+            if (providerName.isEmpty() || providerName == null) {
+                ensureOrgExists(newAccount);
+            }
+            if (providerName.equals("proconnect")) {
+                ensureOrgUniqueIdExists(newAccount);
+            }
         } catch (IllegalStateException orgError) {
             log.error("Error when trying to create / update the organisation {}, reverting the account creation",
                     newAccount.getOrg(), orgError);
@@ -254,7 +260,11 @@ protected Optional<Org> findOrg(String orgId) {
 
     private Optional<Org> findByOrgUniqueId(String orgUniqueId) {
         try {
-            return Optional.of(orgsDao.findByOrgUniqueId(orgUniqueId));
+            Org existingOrg = orgsDao.findByOrgUniqueId(orgUniqueId);
+            if (existingOrg == null) {
+                return Optional.empty();
+            }
+            return Optional.of(orgsDao.findByCommonName(existingOrg.getId()));
         } catch (NameNotFoundException e) {
             return Optional.empty();
         }