mark as super admin

Thomasr · ludomikula · commit b39d244fd8d5 · 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
@@ -157,6 +157,10 @@ private Mono<Boolean> setOrgAdmin(String userId, Organization newOrg, boolean is
         return orgMemberService.addMember(newOrg.getId(), userId, isSuperAdmin ? MemberRole.SUPER_ADMIN : MemberRole.ADMIN);
     }
 
+    private Mono<Boolean> setOrgSuperAdmin(String userId, Organization newOrg, boolean isSuperAdmin) {
+        return orgMemberService.addMember(newOrg.getId(), userId, isSuperAdmin ? MemberRole.SUPER_ADMIN : MemberRole.ADMIN);
+    }
+
     @Override
     public Mono<Organization> getById(String id) {
         if(FieldName.isGID(id))
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserService.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserService.java
@@ -55,6 +55,7 @@ public interface UserService {
     Mono<Boolean> resetLostPassword(String userEmail, String token, String newPassword);
 
     Mono<Boolean> setPassword(String userId, String password);
+    Mono<Boolean> markAsSuperAdmin(String userId);
 
     Mono<UserDetail> buildUserDetail(User user, boolean withoutDynamicGroups);
 
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
@@ -337,6 +337,17 @@ public Mono<Boolean> setPassword(String userId, String password) {
                 .thenReturn(true);
     }
 
+    @Override
+    public Mono<Boolean> markAsSuperAdmin(String userId) {
+        return findById(userId)
+                .map(user -> {
+                    user.setSuperAdmin(true);
+                    return user;
+                })
+                .flatMap(repository::save)
+                .thenReturn(true);
+    }
+
 
     @Override
     public Mono<UserDetail> buildUserDetail(User user, boolean withoutDynamicGroups) {
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/migrations/job/AddSuperAdminUserImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/migrations/job/AddSuperAdminUserImpl.java
@@ -46,6 +46,7 @@ public void addOrUpdateSuperAdmin() {
                     return Mono.empty();
                 })
                 .delayUntil(user -> userService.setPassword(user.getId(), ((FormAuthRequestContext)authUser.getAuthContext()).getPassword()))
+                .delayUntil(user -> userService.markAsSuperAdmin(user.getId()))
                 .delayUntil(user -> orgMemberService.addToAllOrgAsAdminIfNot(user.getId()))
                 .subscribe();
     }

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@ public void addOrUpdateSuperAdmin() {`
`46`	`46`	`return Mono.empty();`
`47`	`47`	`})`
`48`	`48`	`.delayUntil(user -> userService.setPassword(user.getId(), ((FormAuthRequestContext)authUser.getAuthContext()).getPassword()))`
	`49`	`+ .delayUntil(user -> userService.markAsSuperAdmin(user.getId()))`
`49`	`50`	`.delayUntil(user -> orgMemberService.addToAllOrgAsAdminIfNot(user.getId()))`
`50`	`51`	`.subscribe();`
`51`	`52`	`}`