Add email field to user and match users by email

lowcoder-org · FalkWolsky · Jul 9, 2024 · Jul 8, 2024 · Jul 9, 2024 · Jul 9, 2024
commit ed66ed39221fad1d8e129e256c8be87d43c49f5b
diff --git a/...omain/src/main/java/org/lowcoder/domain/organization/service/OrganizationServiceImpl.java b/...omain/src/main/java/org/lowcoder/domain/organization/service/OrganizationServiceImpl.java
@@ -98,7 +98,7 @@ public Mono<Organization> createDefault(User user, boolean isSuperAdmin) {
 
     private Mono<Boolean> joinOrganizationInEnterpriseMode(String userId) {
         return getOrganizationInEnterpriseMode()
-                .flatMap(organization -> orgMemberService.addMember(organization.getGid(), userId, MemberRole.MEMBER))
+                .flatMap(organization -> orgMemberService.addMember(organization.getId(), userId, MemberRole.MEMBER))
                 .defaultIfEmpty(false);
     }
 

diff --git a/...er/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/AuthUser.java b/...er/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/AuthUser.java
@@ -18,6 +18,7 @@ public class AuthUser {
 
     private String uid;
     private String username;
+    private String email;
     private String avatar;
     private Map<String, Object> rawUserInfo;
     private Map<String, Object> extra;

diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/User.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/User.java
@@ -42,6 +42,8 @@ public class User extends HasIdAndAuditing implements BeforeMongodbWrite, AfterM
 
     private String name;
 
+    private String email;
+
     private String uiLanguage;
 
     private String avatar;

diff --git a/...rvice/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserServiceImpl.java b/...rvice/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserServiceImpl.java
@@ -158,6 +158,7 @@ public Mono<User> findByAuthUserRawId(AuthUser authUser) {
     public Mono<User> createNewUserByAuthUser(AuthUser authUser) {
          User.UserBuilder userBuilder = User.builder()
                 .name(authUser.getUsername())
+                .email(authUser.getEmail())
                 .state(UserState.ACTIVATED)
                 .isEnabled(true)
                 .tpAvatarLink(authUser.getAvatar());

diff --git a/...wcoder-server/src/main/java/org/lowcoder/api/authentication/util/AuthenticationUtils.java b/...wcoder-server/src/main/java/org/lowcoder/api/authentication/util/AuthenticationUtils.java
@@ -96,6 +96,7 @@ public static AuthUser mapToAuthUser(Map<String, Object> map, HashMap<String, St
         return AuthUser.builder()
                 .uid(uid)
                 .username(username)
+                .email(email)
                 .avatar(avatar)
                 .rawUserInfo(map)
                 .build();
@@ -111,6 +112,7 @@ public static AuthUser mergeAuthUser(AuthUser low, AuthUser high) {
         return AuthUser.builder()
                 .uid(high.getUid() != null ? high.getUid() : low.getUid())
                 .username(high.getUsername() != null ? high.getUsername() : low.getUsername())
+                .email(high.getEmail() != null ? high.getEmail() : low.getEmail())
                 .avatar(high.getAvatar() != null ? high.getAvatar() : low.getAvatar())
                 .rawUserInfo(high.getRawUserInfo() != null ? high.getRawUserInfo() : low.getRawUserInfo())
                 .authToken(high.getAuthToken() != null ? high.getAuthToken() : low.getAuthToken())

diff --git a/...rvice/lowcoder-server/src/main/java/org/lowcoder/runner/migrations/DatabaseChangelog.java b/...rvice/lowcoder-server/src/main/java/org/lowcoder/runner/migrations/DatabaseChangelog.java
@@ -219,6 +219,30 @@ public void addGidToDBObjects(MongockTemplate mongoTemplate) {
         }
     }
 
+    @ChangeSet(order = "023", id = "add-email", author = "")
+    public void addEmailField(MongockTemplate mongoTemplate) {
+        // Create a query to match all documents
+        Query query = new Query();
+
+        // Use a DocumentCallbackHandler to iterate through each document
+        mongoTemplate.executeQuery(query, "user", new DocumentCallbackHandler() {
+            @Override
+            public void processDocument(Document document) {
+                // Generate a random UUID and ensure it is unique within the collection
+                String username = document.getString("name");
+                // Create an update object to add the 'gid' field
+                Update update = new Update();
+                update.set("email", username);
+
+                // Create a query to match the current document by its _id
+                Query idQuery = new Query(Criteria.where("_id").is(document.getObjectId("_id")));
+
+                // Update the document with the new 'gid' field
+                mongoTemplate.updateFirst(idQuery, update, "user");
+            }
+        });
+    }
+
     private void addGidField(MongockTemplate mongoTemplate, String collectionName) {
         // Create a query to match all documents
         Query query = new Query();