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

Thomasr · ludomikula · commit 6233a03c8159 · 2024-07-09T23:57:19.000+02:00
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/AuthUser.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/AuthUser.java
@@ -42,6 +42,7 @@ public Connection toAuthConnection() {
                 .authId(getAuthContext().getAuthConfig().getId())
                 .source(getSource())
                 .name(getUsername())
+                .email(getEmail())
                 .rawId(getUid())
                 .avatar(getAvatar())
                 .orgIds(StringUtils.isBlank(getOrgId()) ? Set.of() : Set.of(getOrgId()))
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/Connection.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/Connection.java
@@ -46,6 +46,8 @@ public class Connection implements Serializable {
 
     private final String name;
 
+    private final String email;
+
     private final String avatar;
 
     private Set<String> orgIds;
@@ -59,12 +61,13 @@ public class Connection implements Serializable {
     private Set<String> tokens;
 
     @JsonCreator
-    private Connection(String authId, String source, String rawId, String name, String avatar, Set<String> orgIds, @Nullable
+    private Connection(String authId, String source, String rawId, String name, String email, String avatar, Set<String> orgIds, @Nullable
     ConnectionAuthToken authConnectionAuthToken, Map<String, Object> rawUserInfo, Set<String> tokens) {
         this.authId = authId;
         this.source = source;
         this.rawId = rawId;
         this.name = name;
+        this.email = email;
         this.avatar = avatar;
         this.orgIds = CollectionUtils.isEmpty(orgIds) ? new HashSet<>() : orgIds;
         this.authConnectionAuthToken = authConnectionAuthToken;
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/repository/UserRepository.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/repository/UserRepository.java
@@ -19,5 +19,7 @@ public interface UserRepository extends ReactiveMongoRepository<User, String> {
     Flux<User> findByConnections_SourceAndConnections_RawIdIn(String source, Collection<String> rawIds);
 
     Mono<User> findByName(String rawUuid);
-    Mono<User> findByEmail(String rawUuid);
+
+    //email1 and email2 should be equal
+    Mono<User> findByEmailOrConnections_Email(String email1, String email2);
 }
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
@@ -112,8 +112,8 @@ public Mono<User> findByName(String rawUuid) {
         return repository.findByName(rawUuid);
     }
 
-    public Mono<User> findByEmail(String rawUuid) {
-        return repository.findByEmail(rawUuid);
+    public Mono<User> findByEmailDeep(String email) {
+        return repository.findByEmailOrConnections_Email(email, email);
     }
 
     @Override
@@ -155,7 +155,7 @@ public Mono<User> findByAuthUserSourceAndRawId(AuthUser authUser) {
 
     @Override
     public Mono<User> findByAuthUserRawId(AuthUser authUser) {
-        return findByEmail(authUser.getEmail());
+        return findByEmailDeep(authUser.getEmail());
     }
 
     @Override

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(String source, Collection<String> rawIds);`
`20`	`20`
`21`	`21`	`Mono<User> findByName(String rawUuid);`
`22`		`- Mono<User> findByEmail(String rawUuid);`
	`22`	`+`
	`23`	`+ //email1 and email2 should be equal`
	`24`	`+ Mono<User> findByEmailOrConnections_Email(String email1, String email2);`
`23`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -112,8 +112,8 @@ public Mono<User> findByName(String rawUuid) {`
`112`	`112`	`return repository.findByName(rawUuid);`
`113`	`113`	`}`
`114`	`114`
`115`		`- public Mono<User> findByEmail(String rawUuid) {`
`116`		`- return repository.findByEmail(rawUuid);`
	`115`	`+ public Mono<User> findByEmailDeep(String email) {`
	`116`	`+ return repository.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`	`public Mono<User> findByAuthUserRawId(AuthUser authUser) {`
`158`		`- return findByEmail(authUser.getEmail());`
	`158`	`+ return findByEmailDeep(authUser.getEmail());`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`@Override`