Finalize fixes

Author: aq-ikhwa-tech

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

@@ -16,8 +16,7 @@ public interface UserRepository extends ReactiveMongoRepository<User, String> {
 
  Mono<User> findByConnections_SourceAndConnections_RawId(String source, String rawId);
 
- Flux<User> findByConnections_RawId(String rawId);
-
  Flux<User> findByConnections_SourceAndConnections_RawIdIn(String source, Collection<String> rawIds);
 
+ Mono<User> findByName(String rawUuid);
 }

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

@@ -34,7 +34,7 @@ public interface UserService {
 
  Mono<User> findByAuthUserSourceAndRawId(AuthUser authUser);
 
- Flux<User> findByAuthUserRawId(AuthUser authUser);
+ Mono<User> findByAuthUserRawId(AuthUser authUser);
 
  Mono<User> createNewUserByAuthUser(AuthUser authUser);
 

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

@@ -111,8 +111,8 @@ public Mono<User> findBySourceAndId(String source, String sourceUuid) {
  return repository.findByConnections_SourceAndConnections_RawId(source, sourceUuid);
  }
 
- public Flux<User> findByRawId(String rawUuid) {
- return repository.findByConnections_RawId(rawUuid);
+ public Mono<User> findByName(String rawUuid) {
+ return repository.findByName(rawUuid);
  }
 
  @Override
@@ -152,8 +152,8 @@ public Mono<User> findByAuthUserSourceAndRawId(AuthUser authUser) {
  }
 
  @Override
- public Flux<User> findByAuthUserRawId(AuthUser authUser) {
- return findByRawId(authUser.getUid());
+ public Mono<User> findByAuthUserRawId(AuthUser authUser) {
+ return findByName(authUser.getUsername());
  }
 
  @Override

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

@@ -116,7 +116,7 @@ protected Mono<AuthUser> getAuthUser(AuthToken authToken) {
  }
  AuthUser authUser = AuthUser.builder()
  .uid(MapUtils.getString(map, "sub"))
- .username(MapUtils.getString(map, "name"))
+ .username(MapUtils.getString(map, "email"))
  .rawUserInfo(map)
  .build();
  return Mono.just(authUser);

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

@@ -208,8 +208,8 @@ protected Mono<FindByAuthUser> findByAuthUserSourceAndRawId(AuthUser authUser) {
  }
 
  protected Mono<FindByAuthUser> findByAuthUserRawId(AuthUser authUser) {
- return userService.findByAuthUserRawId(authUser).collectList()
- .map(user -> new FindByAuthUser(true, user.stream().findFirst().get()))
+ return userService.findByAuthUserRawId(authUser)
+ .map(user -> new FindByAuthUser(true, user))
  .defaultIfEmpty(new FindByAuthUser(false, null));
  }