Super admin flag in user collection

Thomasr · ludomikula · commit 042c7053fa70 · 2024-09-09T12:10:43.000+02:00
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/User.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/User.java
@@ -50,6 +50,8 @@ public class User extends HasIdAndAuditing implements BeforeMongodbWrite, AfterM
 
     private String tpAvatarLink;
 
+    private Boolean superAdmin;
+
     private UserState state;
 
     @Builder.Default
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
@@ -36,7 +36,7 @@ public interface UserService {
 
     Mono<User> findByAuthUserRawId(AuthUser authUser);
 
-    Mono<User> createNewUserByAuthUser(AuthUser authUser);
+    Mono<User> createNewUserByAuthUser(AuthUser authUser, boolean isSuperAdmin);
 
     Mono<Void> getUserAvatar(ServerWebExchange exchange, String userId);
 
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
@@ -160,11 +160,12 @@ public Mono<User> findByAuthUserRawId(AuthUser authUser) {
     }
 
     @Override
-    public Mono<User> createNewUserByAuthUser(AuthUser authUser) {
+    public Mono<User> createNewUserByAuthUser(AuthUser authUser, boolean isSuperAdmin) {
          User.UserBuilder userBuilder = User.builder()
                 .name(authUser.getUsername())
                 .email(authUser.getEmail())
                 .state(UserState.ACTIVATED)
+                .superAdmin(isSuperAdmin)
                 .isEnabled(true)
                 .tpAvatarLink(authUser.getAvatar());
 
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/service/AuthenticationApiServiceImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/service/AuthenticationApiServiceImpl.java
@@ -116,7 +116,7 @@ protected Mono<AuthUser> authenticate(String authId, @Deprecated String source,
     @Override
     public Mono<Void> loginOrRegister(AuthUser authUser, ServerWebExchange exchange,
                                       String invitationId, boolean linKExistingUser) {
-        return updateOrCreateUser(authUser, linKExistingUser)
+        return updateOrCreateUser(authUser, linKExistingUser, false)
                 .delayUntil(user -> ReactiveSecurityContextHolder.getContext()
                         .doOnNext(securityContext -> securityContext.setAuthentication(AuthenticationUtils.toAuthentication(user))))
                 // save token and set cookie
@@ -147,7 +147,7 @@ public Mono<Void> loginOrRegister(AuthUser authUser, ServerWebExchange exchange,
                 .then(businessEventPublisher.publishUserLoginEvent(authUser.getSource()));
     }
 
-    public Mono<User> updateOrCreateUser(AuthUser authUser, boolean linkExistingUser) {
+    public Mono<User> updateOrCreateUser(AuthUser authUser, boolean linkExistingUser, boolean isSuperAdmin) {
 
         if(linkExistingUser) {
             return sessionUserService.getVisitor()
@@ -188,7 +188,7 @@ public Mono<User> updateOrCreateUser(AuthUser authUser, boolean linkExistingUser
 
 
                     if (authUser.getAuthContext().getAuthConfig().isEnableRegister()) {
-                        return userService.createNewUserByAuthUser(authUser);
+                        return userService.createNewUserByAuthUser(authUser, isSuperAdmin);
                     }
                     return Mono.error(new BizException(USER_NOT_EXIST, "USER_NOT_EXIST"));
                 });
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
@@ -29,7 +29,7 @@ public void addOrUpdateSuperAdmin() {
 
         AuthUser authUser = formulateAuthUser();
 
-        authenticationApiService.updateOrCreateUser(authUser, false)
+        authenticationApiService.updateOrCreateUser(authUser, false, true)
                 .delayUntil(user -> {
                     if (user.getIsNewUser()) {
                         return authenticationApiService.onUserRegister(user, true);
