#1379: Fix errors that were choosing wrong organization when enterprise mode is active

In enterprise mode, all login and apis deals with one organization.

Author: Thomasr

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

@@ -32,8 +32,11 @@
 import org.lowcoder.domain.user.service.UserService;
 import org.lowcoder.sdk.auth.AbstractAuthConfig;
 import org.lowcoder.sdk.config.AuthProperties;
+import org.lowcoder.sdk.config.CommonConfig;
+import org.lowcoder.sdk.constants.WorkspaceMode;
 import org.lowcoder.sdk.exception.BizError;
 import org.lowcoder.sdk.exception.BizException;
+import org.lowcoder.sdk.models.HasIdAndAuditing;
 import org.lowcoder.sdk.util.CookieHelper;
 import org.springframework.security.core.context.ReactiveSecurityContextHolder;
 import org.springframework.stereotype.Service;
@@ -69,6 +72,7 @@ public class AuthenticationApiServiceImpl implements AuthenticationApiService {
     private final OrgMemberService orgMemberService;
     private final JWTUtils jwtUtils;
     private final AuthProperties authProperties;
+    private final CommonConfig commonConfig;
 
     @Override
     public Mono<AuthUser> authenticateByForm(String loginId, String password, String source, boolean register, String authId, String orgId) {
@@ -238,10 +242,16 @@ public Mono<Void> onUserRegister(User user, boolean isSuperAdmin) {
     }
 
     protected Mono<Void> onUserLogin(String orgId, User user, String source) {
-        if (StringUtils.isEmpty(orgId)) {
-            return Mono.empty();
+        Mono<String> orgMono;
+        if(commonConfig.getWorkspace().getMode() == WorkspaceMode.ENTERPRISE) {
+            orgMono = organizationService.getOrganizationInEnterpriseMode().map(HasIdAndAuditing::getId);
+        } else {
+            if (StringUtils.isEmpty(orgId)) {
+                return Mono.empty();
+            }
+            orgMono = Mono.just(orgId);
         }
-        return orgApiService.tryAddUserToOrgAndSwitchOrg(orgId, user.getId()).then();
+        return orgMono.flatMap(orgId2 -> orgApiService.tryAddUserToOrgAndSwitchOrg(orgId2, user.getId())).then();
     }
 
     @Override

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrganizationController.java

@@ -19,10 +19,13 @@
 import org.lowcoder.domain.plugin.DatasourceMetaInfo;
 import org.lowcoder.domain.plugin.service.DatasourceMetaInfoService;
 import org.lowcoder.domain.user.service.UserService;
+import org.lowcoder.sdk.config.CommonConfig;
+import org.lowcoder.sdk.constants.WorkspaceMode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.codec.multipart.Part;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.server.ServerWebExchange;
+import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 import java.util.List;
@@ -47,14 +50,21 @@ public class OrganizationController implements OrganizationEndpoints
     private OrganizationService organizationService;
     @Autowired
     private UserService userService;
+    @Autowired
+    private CommonConfig commonConfig;
 
     @Override
     public Mono<PageResponseView<?>> getOrganizationByUser(@PathVariable String email,
                                                            @RequestParam(required = false, defaultValue = "1") Integer pageNum,
                                                            @RequestParam(required = false, defaultValue = "0") Integer pageSize) {
-        var flux = userService.findByEmailDeep(email).flux().flatMap(user -> orgMemberService.getAllActiveOrgs(user.getId()))
-                .flatMap(orgMember -> organizationService.getById(orgMember.getOrgId()))
-                .map(OrgView::new).cache();
+        Flux<?> 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();
+        }
         return fluxToPageResponseView(pageNum, pageSize, flux);
     }