Fixed login flow - group mapping issue

dragonpoo · dragonpoo · commit 04ab0c609dee · 2025-04-23T11:39:39.000-04:00
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/service/AuthenticationApiServiceImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/service/AuthenticationApiServiceImpl.java
@@ -245,7 +245,7 @@ public Mono<Void> onUserRegister(User user, boolean isSuperAdmin) {
         return organizationService.createDefault(user, isSuperAdmin).then();
     }
 
-    protected Mono<Void> onUserLogin(String orgId, User user, String source, String groupId) {
+    protected Mono<Void> onUserLogin(String orgId, User user, String source, String groupIdToJoin) {
         Mono<String> orgMono;
         if(commonConfig.getWorkspace().getMode() == WorkspaceMode.ENTERPRISE) {
             orgMono = organizationService.getOrganizationInEnterpriseMode().map(HasIdAndAuditing::getId);
@@ -255,12 +255,12 @@ protected Mono<Void> onUserLogin(String orgId, User user, String source, String
             }
             orgMono = Mono.just(orgId);
         }
-        Mono<GroupMember> groupMember = groupMemberService.getGroupMember(groupId, user.getId()).switchIfEmpty(Mono.defer(() -> {
+        Mono<GroupMember> groupMember = groupIdToJoin == null ? Mono.empty() : groupMemberService.getGroupMember(groupIdToJoin, user.getId()).switchIfEmpty(Mono.defer(() -> {
             GroupMember groupMember1 = GroupMember.builder()
-                    .groupId(groupId)
+                    .groupId(groupIdToJoin)
                     .userId(user.getId())
                     .build();
-            return groupMemberService.addMember(orgId, groupId, user.getId(), MemberRole.MEMBER).thenReturn(groupMember1);
+            return groupMemberService.addMember(orgId, groupIdToJoin, user.getId(), MemberRole.MEMBER).thenReturn(groupMember1);
         }));
         return orgMono.flatMap(orgId2 -> orgApiService.tryAddUserToOrgAndSwitchOrg(orgId2, user.getId())).then(groupMember).then();
     }

Original file line number	Diff line number	Diff line change
`@@ -245,7 +245,7 @@ public Mono<Void> onUserRegister(User user, boolean isSuperAdmin) {`
`245`	`245`	`return organizationService.createDefault(user, isSuperAdmin).then();`
`246`	`246`	`}`
`247`	`247`
`248`		`- protected Mono<Void> onUserLogin(String orgId, User user, String source, String groupId) {`
	`248`	`+ protected Mono<Void> onUserLogin(String orgId, User user, String source, String groupIdToJoin) {`
`249`	`249`	`Mono<String> orgMono;`
`250`	`250`	`if(commonConfig.getWorkspace().getMode() == WorkspaceMode.ENTERPRISE) {`
`251`	`251`	`orgMono = organizationService.getOrganizationInEnterpriseMode().map(HasIdAndAuditing::getId);`
`@@ -255,12 +255,12 @@ protected Mono<Void> onUserLogin(String orgId, User user, String source, String`
`255`	`255`	`}`
`256`	`256`	`orgMono = Mono.just(orgId);`
`257`	`257`	`}`
`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(() -> {`
`259`	`259`	`GroupMember groupMember1 = GroupMember.builder()`
`260`		`- .groupId(groupId)`
	`260`	`+ .groupId(groupIdToJoin)`
`261`	`261`	`.userId(user.getId())`
`262`	`262`	`.build();`
`263`		`- return groupMemberService.addMember(orgId, groupId, user.getId(), MemberRole.MEMBER).thenReturn(groupMember1);`
	`263`	`+ return groupMemberService.addMember(orgId, groupIdToJoin, user.getId(), MemberRole.MEMBER).thenReturn(groupMember1);`
`264`	`264`	`}));`
`265`	`265`	`return orgMono.flatMap(orgId2 -> orgApiService.tryAddUserToOrgAndSwitchOrg(orgId2, user.getId())).then(groupMember).then();`
`266`	`266`	`}`