#1322: Expose email in currentUser endpoint.

dragonpoo · ludomikula · commit 2655e5c525ed · 2025-02-04T11:58:49.000+01:00
Add userAuth(jwt, provider) to the currentUser endpoint.
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/UserDetail.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/UserDetail.java
@@ -31,4 +31,5 @@ public class UserDetail {
     private String ip;
     private List<Map<String, String>> groups;
     private Map<String, Object> extra;
+    private Map<String, Object> userAuth;
 }
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
@@ -8,6 +8,7 @@
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.jetbrains.annotations.NotNull;
 import org.lowcoder.domain.asset.model.Asset;
 import org.lowcoder.domain.asset.service.AssetService;
 import org.lowcoder.domain.authentication.AuthenticationService;
@@ -197,8 +198,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 +218,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())
@@ -360,20 +364,41 @@ public Mono<UserDetail> buildUserDetail(User user, boolean withoutDynamicGroups)
                     .map(tuple2 -> {
                         OrgMember orgMember = tuple2.getT1();
                         List<Map<String, String>> groups = tuple2.getT2();
+                        String activeAuthId = user.getActiveAuthId();
+                        Optional<Connection> connection = user.getConnections().stream().filter(con -> con.getAuthId().equals(activeAuthId)).findFirst();
+                        HashMap<String, Object> userAuth = connectionToUserAuthDetail(connection);
                         return UserDetail.builder()
                                 .id(user.getId())
                                 .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()))
+                                .userAuth(userAuth)
                                 .build();
                     });
         });
     }
 
+    private static @NotNull HashMap<String, Object> connectionToUserAuthDetail(Optional<Connection> connection) {
+        HashMap<String, Object> userAuth = new HashMap<String, Object>();
+        if(connection.isPresent()) {
+            if(connection.get().getSource().equals(AuthSourceConstants.EMAIL)) {
+                userAuth.put("jwt", "");
+                userAuth.put("provider", AuthSourceConstants.EMAIL);
+            } else if(connection.get().getAuthConnectionAuthToken() != null) {
+                userAuth.put("jwt", connection.get().getAuthConnectionAuthToken().getAccessToken());
+                userAuth.put("provider", connection.get().getSource());
+            } else {
+                userAuth.put("jwt", "");
+                userAuth.put("provider", connection.get().getSource());
+            }
+        }
+        return userAuth;
+    }
+
     /**
      * In enterprise mode, user can be deleted and then related connections should be released here by appending a timestamp after the source field.
      */

Original file line number	Diff line number	Diff line change
`@@ -31,4 +31,5 @@ public class UserDetail {`
`31`	`31`	`private String ip;`
`32`	`32`	`private List<Map<String, String>> groups;`
`33`	`33`	`private Map<String, Object> extra;`
	`34`	`+ private Map<String, Object> userAuth;`
`34`	`35`	`}`