Set Password when linking with email auth

Thomasr · ludomikula · commit 2cc74ee6e0bf · 2024-07-19T23:34:18.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
@@ -42,7 +42,7 @@ public interface UserService {
 
     Mono<Boolean> addNewConnection(String userId, Connection connection);
 
-    Mono<User> addNewConnectionAndReturnUser(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
@@ -215,11 +215,17 @@ public Mono<Boolean> addNewConnection(String userId, Connection connection) {
     }
 
     @Override
-    public Mono<User> addNewConnectionAndReturnUser(String userId, Connection connection) {
+    public Mono<User> addNewConnectionAndReturnUser(String userId, AuthUser authUser) {
+        Connection connection = authUser.toAuthConnection();
         return findById(userId)
                 .doOnNext(user -> {
                     user.getConnections().add(connection);
                     user.setActiveAuthId(connection.getAuthId());
+
+                    if (AuthSourceConstants.EMAIL.equals(authUser.getSource())
+                            && authUser.getAuthContext() instanceof FormAuthRequestContext formAuthRequestContext) {
+                        user.setPassword(encryptionService.encryptPassword(formAuthRequestContext.getPassword()));
+                    }
                 })
                 .flatMap(repository::save);
     }
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
@@ -151,7 +151,7 @@ public Mono<User> updateOrCreateUser(AuthUser authUser, boolean linkExistingUser
 
         if(linkExistingUser) {
             return sessionUserService.getVisitor()
-                    .flatMap(user -> userService.addNewConnectionAndReturnUser(user.getId(), authUser.toAuthConnection()));
+                    .flatMap(user -> userService.addNewConnectionAndReturnUser(user.getId(), authUser));
         }
 
         return findByAuthUserSourceAndRawId(authUser).zipWith(findByAuthUserRawId(authUser))
@@ -171,7 +171,7 @@ public Mono<User> updateOrCreateUser(AuthUser authUser, boolean linkExistingUser
                     // found for the same id in some different connection, then just add a new connection to the user
                     if(findByAuthUserSecond.userExist()) {
                         User user = findByAuthUserSecond.user();
-                        return userService.addNewConnectionAndReturnUser(user.getId(), authUser.toAuthConnection());
+                        return userService.addNewConnectionAndReturnUser(user.getId(), authUser);
                     }
 
                     // if the user is logging/registering via OAuth provider for the first time,

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ public Mono<User> updateOrCreateUser(AuthUser authUser, boolean linkExistingUser`
`151`	`151`
`152`	`152`	`if(linkExistingUser) {`
`153`	`153`	`return sessionUserService.getVisitor()`
`154`		`- .flatMap(user -> userService.addNewConnectionAndReturnUser(user.getId(), authUser.toAuthConnection()));`
	`154`	`+ .flatMap(user -> userService.addNewConnectionAndReturnUser(user.getId(), authUser));`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`return findByAuthUserSourceAndRawId(authUser).zipWith(findByAuthUserRawId(authUser))`
`@@ -171,7 +171,7 @@ public Mono<User> updateOrCreateUser(AuthUser authUser, boolean linkExistingUser`
`171`	`171`	`// found for the same id in some different connection, then just add a new connection to the user`
`172`	`172`	`if(findByAuthUserSecond.userExist()) {`
`173`	`173`	`User user = findByAuthUserSecond.user();`
`174`		`- return userService.addNewConnectionAndReturnUser(user.getId(), authUser.toAuthConnection());`
	`174`	`+ return userService.addNewConnectionAndReturnUser(user.getId(), authUser);`
`175`	`175`	`}`
`176`	`176`
`177`	`177`	`// if the user is logging/registering via OAuth provider for the first time,`