Skip to content

Commit 01d1297

Browse files
committed
Expose email in currentUser endpoint.
1 parent 1fcf17b commit 01d1297

File tree

1 file changed

+4
-1
lines changed
  • server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service

1 file changed

+4
-1
lines changed

server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserServiceImpl.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,10 @@ public Mono<Boolean> bindEmail(User user, String email) {
197197
.source(AuthSourceConstants.EMAIL)
198198
.name(email)
199199
.rawId(email)
200+
.email(email)
200201
.build();
201202
user.getConnections().add(connection);
203+
user.setEmail(email);
202204
return repository.save(user)
203205
.then(Mono.just(true))
204206
.onErrorResume(throwable -> {
@@ -215,6 +217,7 @@ public Mono<User> addNewConnectionAndReturnUser(String userId, AuthUser authUser
215217
return findById(userId)
216218
.doOnNext(user -> {
217219
user.getConnections().add(connection);
220+
if(StringUtils.isEmpty(user.getEmail())) user.setEmail(connection.getEmail());
218221
user.setActiveAuthId(connection.getAuthId());
219222

220223
if (AuthSourceConstants.EMAIL.equals(authUser.getSource())
@@ -365,7 +368,7 @@ public Mono<UserDetail> buildUserDetail(User user, boolean withoutDynamicGroups)
365368
.name(StringUtils.isEmpty(user.getName())?user.getId():user.getName())
366369
.avatarUrl(user.getAvatarUrl())
367370
.uiLanguage(user.getUiLanguage())
368-
.email(convertEmail(user.getConnections()))
371+
.email(user.getEmail())
369372
.ip(ip)
370373
.groups(groups)
371374
.extra(getUserDetailExtra(user, orgMember.getOrgId()))

0 commit comments

Comments
 (0)