Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit04ab0c6

Browse files
author
Thomasr
committed
Fixed login flow - group mapping issue
1 parent2b36ad3 commit04ab0c6

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ public Mono<Void> onUserRegister(User user, boolean isSuperAdmin) {
245245
returnorganizationService.createDefault(user,isSuperAdmin).then();
246246
}
247247

248-
protectedMono<Void>onUserLogin(StringorgId,Useruser,Stringsource,StringgroupId) {
248+
protectedMono<Void>onUserLogin(StringorgId,Useruser,Stringsource,StringgroupIdToJoin) {
249249
Mono<String>orgMono;
250250
if(commonConfig.getWorkspace().getMode() ==WorkspaceMode.ENTERPRISE) {
251251
orgMono =organizationService.getOrganizationInEnterpriseMode().map(HasIdAndAuditing::getId);
@@ -255,12 +255,12 @@ protected Mono<Void> onUserLogin(String orgId, User user, String source, String
255255
}
256256
orgMono =Mono.just(orgId);
257257
}
258-
Mono<GroupMember>groupMember =groupMemberService.getGroupMember(groupId,user.getId()).switchIfEmpty(Mono.defer(() -> {
258+
Mono<GroupMember>groupMember =groupIdToJoin ==null ?Mono.empty() :groupMemberService.getGroupMember(groupIdToJoin,user.getId()).switchIfEmpty(Mono.defer(() -> {
259259
GroupMembergroupMember1 =GroupMember.builder()
260-
.groupId(groupId)
260+
.groupId(groupIdToJoin)
261261
.userId(user.getId())
262262
.build();
263-
returngroupMemberService.addMember(orgId,groupId,user.getId(),MemberRole.MEMBER).thenReturn(groupMember1);
263+
returngroupMemberService.addMember(orgId,groupIdToJoin,user.getId(),MemberRole.MEMBER).thenReturn(groupMember1);
264264
}));
265265
returnorgMono.flatMap(orgId2 ->orgApiService.tryAddUserToOrgAndSwitchOrg(orgId2,user.getId())).then(groupMember).then();
266266
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp