Merge pull request #401 from lowcoder-org/fix-for-email-sign-up-env-var-not-applicable

FalkWolsky · web-flow · commit 93a002332634 · 2023-10-20T17:37:01.000+02:00
Mongo DB Datasource Query Failure Fix + SIGNUP Enablement Always On Fix
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/authentication/AuthenticationServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/authentication/AuthenticationServiceImpl.java
@@ -1,10 +1,13 @@
 package org.lowcoder.domain.authentication;
 
 import lombok.extern.slf4j.Slf4j;
+import org.lowcoder.domain.organization.service.OrgMemberService;
 import org.lowcoder.domain.organization.service.OrganizationService;
 import org.lowcoder.sdk.auth.AbstractAuthConfig;
+import org.lowcoder.sdk.auth.EmailAuthConfig;
 import org.lowcoder.sdk.config.AuthProperties;
 import org.lowcoder.sdk.config.CommonConfig;
+import org.lowcoder.sdk.constants.AuthSourceConstants;
 import org.lowcoder.sdk.constants.WorkspaceMode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -24,6 +27,10 @@ public class AuthenticationServiceImpl implements AuthenticationService {
 
     @Autowired
     private OrganizationService organizationService;
+
+    @Autowired
+    private OrgMemberService orgMemberService;
+
     @Autowired
     private CommonConfig commonConfig;
     @Autowired
@@ -49,16 +56,27 @@ private Mono<FindAuthConfig> findAuthConfig(String orgId, Function<AbstractAuthC
 
     @Override
     public Flux<FindAuthConfig> findAllAuthConfigs(String orgId, boolean enableOnly) {
-        return findAllAuthConfigsByDomain()
+
+        Mono<FindAuthConfig> emailAuthConfigMono = orgMemberService.doesAtleastOneAdminExist()
+                .map(doesAtleastOneAdminExist -> {
+                    boolean shouldEnableRegister = !doesAtleastOneAdminExist && authProperties.getEmail().isEnableRegister();
+                    return new FindAuthConfig
+                            (new EmailAuthConfig(AuthSourceConstants.EMAIL, authProperties.getEmail().isEnable(), shouldEnableRegister), null);
+                });
+
+
+        Flux<FindAuthConfig> findAuthConfigFlux = findAllAuthConfigsByDomain()
                 .switchIfEmpty(findAllAuthConfigsForEnterpriseMode())
                 .switchIfEmpty(findAllAuthConfigsForSaasMode(orgId))
                 .filter(findAuthConfig -> {
                     if (enableOnly) {
                         return findAuthConfig.authConfig().isEnable();
                     }
                     return true;
-                })
-                .concatWithValues(new FindAuthConfig(DEFAULT_AUTH_CONFIG, null));
+                });
+
+        return Flux.concat(findAuthConfigFlux, emailAuthConfigMono);
+
     }
 
     private Flux<FindAuthConfig> findAllAuthConfigsByDomain() {
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service/OrgMemberService.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service/OrgMemberService.java
@@ -24,6 +24,8 @@ public interface OrgMemberService {
 
     Mono<Long> getOrgMemberCount(String orgId);
 
+    Mono<Boolean> doesAtleastOneAdminExist();
+
     Mono<Long> countAllActiveOrgs(String userId);
 
     Mono<OrgMember> getOrgMember(String orgId, String userId);
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service/OrgMemberServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service/OrgMemberServiceImpl.java
@@ -125,6 +125,13 @@ public Mono<Long> getOrgMemberCount(String orgId) {
         return biRelationService.countBySourceId(ORG_MEMBER, orgId);
     }
 
+    @Override
+    public Mono<Boolean> doesAtleastOneAdminExist() {
+        return biRelationService.countByRelation(ORG_MEMBER, MemberRole.ADMIN.getValue())
+                .single()
+                .map(count -> count != 0);
+    }
+
     @Override
     public Mono<Boolean> addMember(String orgId, String userId, MemberRole memberRole) {
         return biRelationService.addBiRelation(ORG_MEMBER, orgId,
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/service/QueryExecutionService.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/service/QueryExecutionService.java
@@ -48,7 +48,7 @@ public Mono<QueryExecutionResult> executeQuery(Datasource datasource, Map<String
             String timeoutStr, QueryVisitorContext queryVisitorContext) {
 
         int timeoutMs = QueryTimeoutUtils.parseQueryTimeoutMs(timeoutStr, requestParams, common.getMaxQueryTimeout());
-        queryConfig.putIfAbsent("timeoutMs", timeoutMs);
+        queryConfig.putIfAbsent("timeoutMs", String.valueOf(timeoutMs));
 
         return Mono.defer(() -> {
                     if (datasourceMetaInfoService.isJsDatasourcePlugin(datasource.getType())) {
diff --git a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/birelation/BiRelationRepository.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/birelation/BiRelationRepository.java
@@ -26,6 +26,8 @@ public interface BiRelationRepository extends ReactiveMongoRepository<BiRelation
 
     Flux<BiRelation> findByBizTypeAndSourceIdAndRelation(BiRelationBizType bizType, String sourceId, String relation);
 
+    Mono<Long> countByBizTypeAndRelation(BiRelationBizType bizType, String relation);
+
     Mono<Long> countByBizTypeAndSourceId(BiRelationBizType bizType, String sourceId);
 
     Mono<Long> countByBizTypeAndTargetId(BiRelationBizType bizType, String targetId);
diff --git a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/birelation/BiRelationService.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/birelation/BiRelationService.java
@@ -166,6 +166,10 @@ public Flux<BiRelation> getBySourceIdAndRelation(BiRelationBizType bizType, Stri
         return biRelationRepository.findByBizTypeAndSourceIdAndRelation(bizType, sourceId, relation);
     }
 
+    public Mono<Long> countByRelation(BiRelationBizType bizType, String relation) {
+        return biRelationRepository.countByBizTypeAndRelation(bizType, relation);
+    }
+
     public Mono<Long> countBySourceId(BiRelationBizType bizType, String sourceId) {
         return biRelationRepository.countByBizTypeAndSourceId(bizType, sourceId);
     }
diff --git a/server/api-service/lowcoder-server/src/main/resources/application-lowcoder.yml b/server/api-service/lowcoder-server/src/main/resources/application-lowcoder.yml
@@ -3,9 +3,9 @@ spring:
     mongodb:
       authentication-database: admin
       auto-index-creation: false
-      uri: mongodb://lowcoder:secret123@127.0.0.1/lowcoder?authSource=admin
+      uri: mongodb://192.168.8.100:27017/lowcoder?authSource=admin
     redis:
-      url: redis://localhost:6379
+      url: redis://192.168.8.100:6379
   main:
     allow-bean-definition-overriding: true
     allow-circular-references: true
@@ -41,6 +41,8 @@ common:
       - '*'
   version: 1.1.8
   block-hound-enable: false
+  js-executor:
+    host: http://127.0.0.1:6060
 
 material:
   mongodb-grid-fs:
@@ -52,3 +54,8 @@ springdoc:
   swagger-ui:
     path: /api/docs/swagger-ui
   paths-to-exclude: /api/v1/**
+
+auth:
+  email:
+    enable: true
+    enable-register: false

Original file line number	Diff line number	Diff line change
`@@ -166,6 +166,10 @@ public Flux<BiRelation> getBySourceIdAndRelation(BiRelationBizType bizType, Stri`
`166`	`166`	`return biRelationRepository.findByBizTypeAndSourceIdAndRelation(bizType, sourceId, relation);`
`167`	`167`	`}`
`168`	`168`
	`169`	`+ public Mono<Long> countByRelation(BiRelationBizType bizType, String relation) {`
	`170`	`+ return biRelationRepository.countByBizTypeAndRelation(bizType, relation);`
	`171`	`+ }`
	`172`	`+`
`169`	`173`	`public Mono<Long> countBySourceId(BiRelationBizType bizType, String sourceId) {`
`170`	`174`	`return biRelationRepository.countByBizTypeAndSourceId(bizType, sourceId);`
`171`	`175`	`}`