Commit6233a03

Thomasr

authored and

committed

check connections' email deeply to match the email address with all possible connections

1 parentf9aeb42 commit6233a03Copy full SHA for 6233a03

File tree

+11

-5

lines changed

+11

-5

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ public Connection toAuthConnection() {`
`42`	`42`	`.authId(getAuthContext().getAuthConfig().getId())`
`43`	`43`	`.source(getSource())`
`44`	`44`	`.name(getUsername())`
	`45`	`+ .email(getEmail())`
`45`	`46`	`.rawId(getUid())`
`46`	`47`	`.avatar(getAvatar())`
`47`	`48`	`.orgIds(StringUtils.isBlank(getOrgId()) ?Set.of() :Set.of(getOrgId()))`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,8 @@ public class Connection implements Serializable {`
`46`	`46`
`47`	`47`	`privatefinalStringname;`
`48`	`48`
	`49`	`+privatefinalStringemail;`
	`50`	`+`
`49`	`51`	`privatefinalStringavatar;`
`50`	`52`
`51`	`53`	`privateSet<String>orgIds;`
`@@ -59,12 +61,13 @@ public class Connection implements Serializable {`
`59`	`61`	`privateSet<String>tokens;`
`60`	`62`
`61`	`63`	`@JsonCreator`
`62`		`-privateConnection(StringauthId,Stringsource,StringrawId,Stringname,Stringavatar,Set<String>orgIds,@Nullable`
	`64`	`+privateConnection(StringauthId,Stringsource,StringrawId,Stringname,Stringemail,Stringavatar,Set<String>orgIds,@Nullable`
`63`	`65`	`ConnectionAuthTokenauthConnectionAuthToken,Map<String,Object>rawUserInfo,Set<String>tokens) {`
`64`	`66`	`this.authId =authId;`
`65`	`67`	`this.source =source;`
`66`	`68`	`this.rawId =rawId;`
`67`	`69`	`this.name =name;`
	`70`	`+this.email =email;`
`68`	`71`	`this.avatar =avatar;`
`69`	`72`	`this.orgIds =CollectionUtils.isEmpty(orgIds) ?newHashSet<>() :orgIds;`
`70`	`73`	`this.authConnectionAuthToken =authConnectionAuthToken;`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -19,5 +19,7 @@ public interface UserRepository extends ReactiveMongoRepository<User, String> {`
`19`	`19`	`Flux<User>findByConnections_SourceAndConnections_RawIdIn(Stringsource,Collection<String>rawIds);`
`20`	`20`
`21`	`21`	`Mono<User>findByName(StringrawUuid);`
`22`		`-Mono<User>findByEmail(StringrawUuid);`
	`22`	`+`
	`23`	`+//email1 and email2 should be equal`
	`24`	`+Mono<User>findByEmailOrConnections_Email(Stringemail1,Stringemail2);`
`23`	`25`	`}`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -112,8 +112,8 @@ public Mono<User> findByName(String rawUuid) {`
`112`	`112`	`returnrepository.findByName(rawUuid);`
`113`	`113`	`}`
`114`	`114`
`115`		`-publicMono<User>findByEmail(StringrawUuid) {`
`116`		`-returnrepository.findByEmail(rawUuid);`
	`115`	`+publicMono<User>findByEmailDeep(Stringemail) {`
	`116`	`+returnrepository.findByEmailOrConnections_Email(email,email);`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`@Override`
`@@ -155,7 +155,7 @@ public Mono<User> findByAuthUserSourceAndRawId(AuthUser authUser) {`
`155`	`155`
`156`	`156`	`@Override`
`157`	`157`	`publicMono<User>findByAuthUserRawId(AuthUserauthUser) {`
`158`		`-returnfindByEmail(authUser.getEmail());`
	`158`	`+returnfindByEmailDeep(authUser.getEmail());`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`@Override`

Comments

(0)