Commit a6c28bb

authored

Merge pull request #1271 from lowcoder-org/dev

Dev -> Main v2.4.12

2 parents 5e6cf42 + 84d1ea3 commit a6c28bbCopy full SHA for a6c28bb

File tree

-1

lines changed

-1

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,8 @@ public interface UserService {`
`43`	`43`
`44`	`44`	`Mono<User> addNewConnectionAndReturnUser(String userId, AuthUser authUser);`
`45`	`45`
	`46`	`+ Mono<User> saveUser(User user);`
	`47`	`+`
`46`	`48`	`Mono<Void> deleteProfilePhoto(User visitor);`
`47`	`49`
`48`	`50`	`Mono<Boolean> updatePassword(String userId, String oldPassword, String newPassword);`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -225,6 +225,11 @@ public Mono<User> addNewConnectionAndReturnUser(String userId, AuthUser authUser`
`225`	`225`	`.flatMap(repository::save);`
`226`	`226`	`}`
`227`	`227`
	`228`	`+ @Override`
	`229`	`+ public Mono<User> saveUser(User user) {`
	`230`	`+ return repository.save(user);`
	`231`	`+ }`
	`232`	`+`
`228`	`233`	`@Override`
`229`	`234`	`public Mono<Void> deleteProfilePhoto(User visitor) {`
`230`	`235`	`String userAvatar = visitor.getAvatar();`

Lines changed: 1 addition & 1 deletion

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`

Comments

(0)