Merge branch 'dev' into list-comp-sortable

raheeliftikhar5 · web-flow · commit 29201c7ddd5d · 2025-04-18T03:54:18.000-07:00
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/AuthUser.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/AuthUser.java
@@ -25,6 +25,9 @@ public class AuthUser {
 
     private String orgId;
 
+    // Add groupId for group mapping
+    private String groupId;
+
     private AuthRequestContext authContext;
 
     /**
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserServiceImpl.java
@@ -418,7 +418,7 @@ protected Map<String, Object> getUserDetailExtra(User user, String orgId) {
         return Optional.ofNullable(user.getOrgTransformedUserInfo())
                 .map(orgTransformedUserInfo -> orgTransformedUserInfo.get(orgId))
                 .map(TransformedUserInfo::extra)
-                .orElse(convertConnections(user.getConnections()));
+                .orElse(convertConnections(user.getConnections().stream().filter(c -> c.getAuthId().equals(user.getActiveAuthId())).collect(Collectors.toSet())));
     }
 
     protected Mono<List<Map<String, String>>> buildUserDetailGroups(String userId, OrgMember orgMember, boolean withoutDynamicGroups,
@@ -443,7 +443,7 @@ protected Map<String, Object> convertConnections(Set<Connection> connections) {
         return connections.stream()
                 .filter(connection -> !AuthSourceConstants.EMAIL.equals(connection.getSource()) &&
                         !AuthSourceConstants.PHONE.equals(connection.getSource()))
-                .collect(Collectors.toMap(Connection::getAuthId, Connection::getRawUserInfo));
+                .collect(Collectors.toMap(Connection::getSource, Connection::getRawUserInfo));
     }
 
     protected String convertEmail(Set<Connection> connections) {
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
@@ -23,6 +23,9 @@
 import org.lowcoder.domain.authentication.FindAuthConfig;
 import org.lowcoder.domain.authentication.context.AuthRequestContext;
 import org.lowcoder.domain.authentication.context.FormAuthRequestContext;
+import org.lowcoder.domain.group.model.GroupMember;
+import org.lowcoder.domain.group.service.GroupMemberService;
+import org.lowcoder.domain.organization.model.MemberRole;
 import org.lowcoder.domain.organization.model.OrgMember;
 import org.lowcoder.domain.organization.model.Organization;
 import org.lowcoder.domain.organization.model.OrganizationDomain;
@@ -73,6 +76,7 @@ public class AuthenticationApiServiceImpl implements AuthenticationApiService {
     private final JWTUtils jwtUtils;
     private final AuthProperties authProperties;
     private final CommonConfig commonConfig;
+    private final GroupMemberService groupMemberService;
 
     @Override
     public Mono<AuthUser> authenticateByForm(String loginId, String password, String source, boolean register, String authId, String orgId) {
@@ -143,7 +147,7 @@ public Mono<Void> loginOrRegister(AuthUser authUser, ServerWebExchange exchange,
                     return Mono.empty();
                 })
                 // after login
-                .delayUntil(user -> onUserLogin(authUser.getOrgId(), user, authUser.getSource()))
+                .delayUntil(user -> onUserLogin(authUser.getOrgId(), user, authUser.getSource(), authUser.getGroupId()))
                 // process invite
                 .delayUntil(__ -> {
                     if (StringUtils.isBlank(invitationId)) {
@@ -241,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) {
+    protected Mono<Void> onUserLogin(String orgId, User user, String source, String groupId) {
         Mono<String> orgMono;
         if(commonConfig.getWorkspace().getMode() == WorkspaceMode.ENTERPRISE) {
             orgMono = organizationService.getOrganizationInEnterpriseMode().map(HasIdAndAuditing::getId);
@@ -251,7 +255,14 @@ protected Mono<Void> onUserLogin(String orgId, User user, String source) {
             }
             orgMono = Mono.just(orgId);
         }
-        return orgMono.flatMap(orgId2 -> orgApiService.tryAddUserToOrgAndSwitchOrg(orgId2, user.getId())).then();
+        Mono<GroupMember> groupMember = groupMemberService.getGroupMember(groupId, user.getId()).switchIfEmpty(Mono.defer(() -> {
+            GroupMember groupMember1 = GroupMember.builder()
+                    .groupId(groupId)
+                    .userId(user.getId())
+                    .build();
+            return groupMemberService.addMember(orgId, groupId, user.getId(), MemberRole.MEMBER).thenReturn(groupMember1);
+        }));
+        return orgMono.flatMap(orgId2 -> orgApiService.tryAddUserToOrgAndSwitchOrg(orgId2, user.getId())).then(groupMember).then();
     }
 
     @Override
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/util/AuthenticationUtils.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/util/AuthenticationUtils.java
@@ -93,11 +93,14 @@ public static AuthUser mapToAuthUser(Map<String, Object> map, HashMap<String, St
         if(StringUtils.isEmpty(username)) username = email;
         if(StringUtils.isEmpty(username)) username = uid;
         String avatar = AdvancedMapUtils.getString(map, MapUtils.getString(sourceMappings, "avatar"));
+        // Add group id mapping
+        String groupId = AdvancedMapUtils.getString(map, MapUtils.getString(sourceMappings, "group_id"));
         return AuthUser.builder()
                 .uid(uid)
                 .username(username)
                 .email(email)
                 .avatar(avatar)
+                .groupId(groupId) // Make sure AuthUser has this field and builder method
                 .rawUserInfo(map)
                 .build();
     }
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrganizationController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrganizationController.java
@@ -30,6 +30,7 @@
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
+import java.util.Comparator;
 import java.util.List;
 
 import static org.lowcoder.api.util.Pagination.fluxToPageResponseView;
@@ -59,15 +60,21 @@ public class OrganizationController implements OrganizationEndpoints
     public Mono<PageResponseView<?>> getOrganizationByUser(@PathVariable String email,
                                                            @RequestParam(required = false, defaultValue = "1") Integer pageNum,
                                                            @RequestParam(required = false, defaultValue = "0") Integer pageSize) {
-        Flux<?> flux;
+        Flux<OrgView> flux;
         if (commonConfig.getWorkspace().getMode() == WorkspaceMode.SAAS) {
             flux = userService.findByEmailDeep(email).flux().flatMap(user -> orgMemberService.getAllActiveOrgs(user.getId()))
                     .flatMap(orgMember -> organizationService.getById(orgMember.getOrgId()))
                     .map(OrgView::new).cache();
         } else {
-            flux = organizationService.getOrganizationInEnterpriseMode().flux().cache();
+            flux = organizationService.getOrganizationInEnterpriseMode().flux().map(OrgView::new).cache();
         }
-        return fluxToPageResponseView(pageNum, pageSize, flux);
+        var newflux = flux.sort((OrgView o1, OrgView o2) -> {
+            if (o1.getOrgName() == null || o2.getOrgName() == null) {
+                return 0;
+            }
+            return o1.getOrgName().compareTo(o2.getOrgName());
+        });
+        return fluxToPageResponseView(pageNum, pageSize, newflux);
     }
 
     @Override
