Commit2cd0b06

Thomasr

authored and

committed

#1088 Fix activeauthid issue

1 parent0e17b30 commit2cd0b06Copy full SHA for 2cd0b06

File tree

-26

lines changed

-26

lines changed

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,6 @@ public interface UserService {`
`40`	`40`
`41`	`41`	`Mono<Void>getUserAvatar(ServerWebExchangeexchange,StringuserId);`
`42`	`42`
`43`		`-Mono<Boolean>addNewConnection(StringuserId,Connectionconnection);`
`44`		`-`
`45`	`43`	`Mono<User>addNewConnectionAndReturnUser(StringuserId,AuthUserauthUser);`
`46`	`44`
`47`	`45`	`Mono<Void>deleteProfilePhoto(Uservisitor);`

Lines changed: 1 addition & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -179,6 +179,7 @@ public Mono<User> createNewUserByAuthUser(AuthUser authUser, boolean isSuperAdmi`
`179`	`179`	`Connectionconnection =authUser.toAuthConnection();`
`180`	`180`	`connections.add(connection);`
`181`	`181`	`newUser.setConnections(connections);`
	`182`	`+newUser.setActiveAuthId(connection.getAuthId());`
`182`	`183`	`newUser.setIsNewUser(true);`
`183`	`184`	`returncreate(newUser);`
`184`	`185`	`}`
`@@ -207,17 +208,6 @@ public Mono<Boolean> bindEmail(User user, String email) {`
`207`	`208`	`});`
`208`	`209`	`}`
`209`	`210`
`210`		`-@Override`
`211`		`-publicMono<Boolean>addNewConnection(StringuserId,Connectionconnection) {`
`212`		`-returnfindById(userId)`
`213`		`- .doOnNext(user -> {`
`214`		`-user.getConnections().add(connection);`
`215`		`-user.setActiveAuthId(connection.getAuthId());`
`216`		`- })`
`217`		`- .flatMap(repository::save)`
`218`		`- .then(Mono.just(true));`
`219`		`- }`
`220`		`-`
`221`	`211`	`@Override`
`222`	`212`	`publicMono<User>addNewConnectionAndReturnUser(StringuserId,AuthUserauthUser) {`
`223`	`213`	`Connectionconnection =authUser.toAuthConnection();`

Lines changed: 0 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -174,19 +174,6 @@ public Mono<User> updateOrCreateUser(AuthUser authUser, boolean linkExistingUser`
`174`	`174`	`returnuserService.addNewConnectionAndReturnUser(user.getId(),authUser);`
`175`	`175`	`}`
`176`	`176`
`177`		`-// if the user is logging/registering via OAuth provider for the first time,`
`178`		`-// but is not anonymous, then just add a new connection`
`179`		`-`
`180`		`-userService.findById(authUser.getUid())`
`181`		`- .switchIfEmpty(Mono.empty())`
`182`		`- .filter(user -> {`
`183`		`-// not logged in yet`
`184`		`-return !user.isAnonymous();`
`185`		`- }).doOnNext(user -> {`
`186`		`-userService.addNewConnection(user.getId(),authUser.toAuthConnection());`
`187`		`- }).subscribe();`
`188`		`-`
`189`		`-`
`190`	`177`	`if (authUser.getAuthContext().getAuthConfig().isEnableRegister()) {`
`191`	`178`	`returnuserService.createNewUserByAuthUser(authUser,isSuperAdmin);`
`192`	`179`	`}`

Comments

(0)