Skip to content

Link User Accounts Based on Common/Matching Auth-Id(email) #566

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 7, 2023
Merged

Link User Accounts Based on Common/Matching Auth-Id(email) #566

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
70a2284
Link accounts based on common authid(email)
aq-ikhwa-tech Dec 5, 2023
e2bc358
Merge branch 'dev' into fix-oauth-issues
aq-ikhwa-tech Dec 5, 2023
afa3104
Finalize fixes
aq-ikhwa-tech Dec 6, 2023
5cc8acd
Merge branch 'dev' into fix-oauth-issues
aq-ikhwa-tech Dec 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Finalize fixes
  • Loading branch information
@aq-ikhwa-tech
aq-ikhwa-tech committed Dec 6, 2023
commit afa310432ee0eb79c21c8095c5f672b9e8871ac9
3 changes: 1 addition & 2 deletions ...ice/lowcoder-domain/src/main/java/org/lowcoder/domain/user/repository/UserRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
2 changes: 1 addition & 1 deletion ...i-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
8 changes: 4 additions & 4 deletions ...rvice/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/org/lowcoder/api/authentication/request/oauth2/request/KeycloakRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions ...r/src/main/java/org/lowcoder/api/authentication/service/AuthenticationApiServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}

Expand Down