#1088 Fix activeauthid issue

Thomasr · ludomikula · commit 2cd0b06ad6f9 · 2024-09-11T10:56:58.000+02:00
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
@@ -40,8 +40,6 @@ public interface UserService {
 
     Mono<Void> getUserAvatar(ServerWebExchange exchange, String userId);
 
-    Mono<Boolean> addNewConnection(String userId, Connection connection);
-
     Mono<User> addNewConnectionAndReturnUser(String userId, AuthUser authUser);
 
     Mono<Void> deleteProfilePhoto(User visitor);
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
@@ -179,6 +179,7 @@ public Mono<User> createNewUserByAuthUser(AuthUser authUser, boolean isSuperAdmi
         Connection connection = authUser.toAuthConnection();
         connections.add(connection);
         newUser.setConnections(connections);
+        newUser.setActiveAuthId(connection.getAuthId());
         newUser.setIsNewUser(true);
         return create(newUser);
     }
@@ -207,17 +208,6 @@ public Mono<Boolean> bindEmail(User user, String email) {
                 });
     }
 
-    @Override
-    public Mono<Boolean> addNewConnection(String userId, Connection connection) {
-        return findById(userId)
-                .doOnNext(user -> {
-                    user.getConnections().add(connection);
-                    user.setActiveAuthId(connection.getAuthId());
-                })
-                .flatMap(repository::save)
-                .then(Mono.just(true));
-    }
-
     @Override
     public Mono<User> addNewConnectionAndReturnUser(String userId, AuthUser authUser) {
         Connection connection = authUser.toAuthConnection();
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
@@ -174,19 +174,6 @@ public Mono<User> updateOrCreateUser(AuthUser authUser, boolean linkExistingUser
                         return userService.addNewConnectionAndReturnUser(user.getId(), authUser);
                     }
 
-                    // if the user is logging/registering via OAuth provider for the first time,
-                    // but is not anonymous, then just add a new connection
-
-                     userService.findById(authUser.getUid())
-                             .switchIfEmpty(Mono.empty())
-                             .filter(user -> {
-                                 // not logged in yet
-                                 return !user.isAnonymous();
-                             }).doOnNext(user -> {
-                                 userService.addNewConnection(user.getId(), authUser.toAuthConnection());
-                             }).subscribe();
-
-
                     if (authUser.getAuthContext().getAuthConfig().isEnableRegister()) {
                         return userService.createNewUserByAuthUser(authUser, isSuperAdmin);
                     }
