Skip to content

Commit afa3104

Browse files
committed
Finalize fixes
1 parent e2bc358 commit afa3104

File tree

5 files changed

+9
-10
lines changed

5 files changed

+9
-10
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ public interface UserRepository extends ReactiveMongoRepository<User, String> {
1616

1717
Mono<User> findByConnections_SourceAndConnections_RawId(String source, String rawId);
1818

19-
Flux<User> findByConnections_RawId(String rawId);
20-
2119
Flux<User> findByConnections_SourceAndConnections_RawIdIn(String source, Collection<String> rawIds);
2220

21+
Mono<User> findByName(String rawUuid);
2322
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public interface UserService {
3434

3535
Mono<User> findByAuthUserSourceAndRawId(AuthUser authUser);
3636

37-
Flux<User> findByAuthUserRawId(AuthUser authUser);
37+
Mono<User> findByAuthUserRawId(AuthUser authUser);
3838

3939
Mono<User> createNewUserByAuthUser(AuthUser authUser);
4040

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ public Mono<User> findBySourceAndId(String source, String sourceUuid) {
111111
return repository.findByConnections_SourceAndConnections_RawId(source, sourceUuid);
112112
}
113113

114-
public Flux<User> findByRawId(String rawUuid) {
115-
return repository.findByConnections_RawId(rawUuid);
114+
public Mono<User> findByName(String rawUuid) {
115+
return repository.findByName(rawUuid);
116116
}
117117

118118
@Override
@@ -152,8 +152,8 @@ public Mono<User> findByAuthUserSourceAndRawId(AuthUser authUser) {
152152
}
153153

154154
@Override
155-
public Flux<User> findByAuthUserRawId(AuthUser authUser) {
156-
return findByRawId(authUser.getUid());
155+
public Mono<User> findByAuthUserRawId(AuthUser authUser) {
156+
return findByName(authUser.getUsername());
157157
}
158158

159159
@Override

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/oauth2/request/KeycloakRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ protected Mono<AuthUser> getAuthUser(AuthToken authToken) {
116116
}
117117
AuthUser authUser = AuthUser.builder()
118118
.uid(MapUtils.getString(map, "sub"))
119-
.username(MapUtils.getString(map, "name"))
119+
.username(MapUtils.getString(map, "email"))
120120
.rawUserInfo(map)
121121
.build();
122122
return Mono.just(authUser);

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/service/AuthenticationApiServiceImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,8 @@ protected Mono<FindByAuthUser> findByAuthUserSourceAndRawId(AuthUser authUser) {
208208
}
209209

210210
protected Mono<FindByAuthUser> findByAuthUserRawId(AuthUser authUser) {
211-
return userService.findByAuthUserRawId(authUser).collectList()
212-
.map(user -> new FindByAuthUser(true, user.stream().findFirst().get()))
211+
return userService.findByAuthUserRawId(authUser)
212+
.map(user -> new FindByAuthUser(true, user))
213213
.defaultIfEmpty(new FindByAuthUser(false, null));
214214
}
215215

0 commit comments

Comments
 (0)