Add superuser to org as it is created

Thomasr · ludomikula · commit 796adc2bf0e8 · 2024-09-09T12:10:43.000+02:00
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service/OrganizationServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service/OrganizationServiceImpl.java
@@ -15,6 +15,8 @@
 import org.lowcoder.domain.organization.model.Organization.OrganizationCommonSettings;
 import org.lowcoder.domain.organization.repository.OrganizationRepository;
 import org.lowcoder.domain.user.model.User;
+import org.lowcoder.domain.user.repository.UserRepository;
+import org.lowcoder.domain.user.service.UserService;
 import org.lowcoder.infra.annotation.PossibleEmptyMono;
 import org.lowcoder.infra.mongo.MongoUpsertHelper;
 import org.lowcoder.sdk.config.CommonConfig;
@@ -51,6 +53,7 @@
 @Service
 public class OrganizationServiceImpl implements OrganizationService {
 
+    private final UserRepository userRepository;
     private Conf<Integer> logoMaxSizeInKb;
     private final AssetRepository assetRepository;
     private final AssetService assetService;
@@ -150,6 +153,12 @@ private Mono<Organization> onOrgCreated(String userId, Organization newOrg, bool
         return groupService.createAllUserGroup(newOrg.getId())
                 .then(groupService.createDevGroup(newOrg.getId()))
                 .then(setOrgAdmin(userId, newOrg, isSuperAdmin))
+                .then(userRepository.findAll().filter(User::getSuperAdmin).last().map(superAdminUser -> {
+                    if(!userId.equals(superAdminUser.getId())) {
+                        return setOrgSuperAdmin(superAdminUser.getId(), newOrg, true);
+                    }
+                    return Mono.empty();
+                }))
                 .thenReturn(newOrg);
     }
 
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserServiceImpl.java
@@ -348,7 +348,6 @@ public Mono<Boolean> markAsSuperAdmin(String userId) {
                 .thenReturn(true);
     }
 
-
     @Override
     public Mono<UserDetail> buildUserDetail(User user, boolean withoutDynamicGroups) {
         if (user.isAnonymous()) {

Original file line number	Diff line number	Diff line change
`@@ -348,7 +348,6 @@ public Mono<Boolean> markAsSuperAdmin(String userId) {`
`348`	`348`	`.thenReturn(true);`
`349`	`349`	`}`
`350`	`350`
`351`		`-`
`352`	`351`	`@Override`
`353`	`352`	`public Mono<UserDetail> buildUserDetail(User user, boolean withoutDynamicGroups) {`
`354`	`353`	`if (user.isAnonymous()) {`