Merge pull request #1271 from lowcoder-org/dev

FalkWolsky · web-flow · commit a6c28bbe51ed · 2024-10-30T13:23:54.000+01:00
Dev -&gt; Main v2.4.12
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
@@ -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);
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
@@ -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();
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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ public Mono<User> updateOrCreateUser(AuthUser authUser, boolean linkExistingUser`
`164`	`164`	`if (findByAuthUserFirst.userExist()) {`
`165`	`165`	`User user = findByAuthUserFirst.user();`
`166`	`166`	`updateConnection(authUser, user);`
`167`		`- return userService.update(user.getId(), user);`
	`167`	`+ return userService.saveUser(user);`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`//If the user connection is not found with login id, but the user is`