Expose email in currentUser endpoint.

dragonpoo · dragonpoo · commit 01d12970b2fb · 2025-01-30T11:37:56.000-05:00
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
@@ -197,8 +197,10 @@ public Mono<Boolean> bindEmail(User user, String email) {
                 .source(AuthSourceConstants.EMAIL)
                 .name(email)
                 .rawId(email)
+                .email(email)
                 .build();
         user.getConnections().add(connection);
+        user.setEmail(email);
         return repository.save(user)
                 .then(Mono.just(true))
                 .onErrorResume(throwable -> {
@@ -215,6 +217,7 @@ public Mono<User> addNewConnectionAndReturnUser(String userId, AuthUser authUser
         return findById(userId)
                 .doOnNext(user -> {
                     user.getConnections().add(connection);
+                    if(StringUtils.isEmpty(user.getEmail())) user.setEmail(connection.getEmail());
                     user.setActiveAuthId(connection.getAuthId());
 
                     if (AuthSourceConstants.EMAIL.equals(authUser.getSource())
@@ -365,7 +368,7 @@ public Mono<UserDetail> buildUserDetail(User user, boolean withoutDynamicGroups)
                                 .name(StringUtils.isEmpty(user.getName())?user.getId():user.getName())
                                 .avatarUrl(user.getAvatarUrl())
                                 .uiLanguage(user.getUiLanguage())
-                                .email(convertEmail(user.getConnections()))
+                                .email(user.getEmail())
                                 .ip(ip)
                                 .groups(groups)
                                 .extra(getUserDetailExtra(user, orgMember.getOrgId()))
