Merge pull request #1271 from lowcoder-org/dev

Dev -> Main v2.4.12

Author: FalkWolsky

server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserService.java

@@ -43,6 +43,8 @@ public interface UserService {
 
     Mono<User> addNewConnectionAndReturnUser(String userId, AuthUser authUser);
 
+    Mono<User> saveUser(User user);
+
     Mono<Void> deleteProfilePhoto(User visitor);
 
     Mono<Boolean> updatePassword(String userId, String oldPassword, String newPassword);

server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserServiceImpl.java

@@ -225,6 +225,11 @@ public Mono<User> addNewConnectionAndReturnUser(String userId, AuthUser authUser
                 .flatMap(repository::save);
     }
 
+    @Override
+    public Mono<User> saveUser(User user) {
+        return repository.save(user);
+    }
+
     @Override
     public Mono<Void> deleteProfilePhoto(User visitor) {
         String userAvatar = visitor.getAvatar();

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/service/AuthenticationApiServiceImpl.java

@@ -164,7 +164,7 @@ public Mono<User> updateOrCreateUser(AuthUser authUser, boolean linkExistingUser
                     if (findByAuthUserFirst.userExist()) {
                         User user = findByAuthUserFirst.user();
                         updateConnection(authUser, user);
-                        return userService.update(user.getId(), user);
+                        return userService.saveUser(user);
                     }
 
                     //If the user connection is not found with login id, but the user is