Merge pull request lowcoder-org#221 from neon-balcony/develop

neon-balcony · web-flow · commit 5c18c21faa3d · 2023-01-29T17:48:58.000+08:00
feat: move workspace &amp; request buffer limit settings to application.yml &amp; check org state in enterprise mode
diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/organization/repository/OrganizationRepository.java b/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/organization/repository/OrganizationRepository.java
@@ -13,6 +13,7 @@
 
 @Repository
 public interface OrganizationRepository extends ReactiveMongoRepository<Organization, String> {
+    Mono<Organization> findFirstByStateMatches(OrganizationState state);
 
     Flux<Organization> findByIdInAndState(Collection<String> id, OrganizationState state);
 
diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/organization/service/OrganizationServiceImpl.java b/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/organization/service/OrganizationServiceImpl.java
@@ -1,15 +1,19 @@
 package com.openblocks.domain.organization.service;
 
 import static com.openblocks.domain.organization.model.OrganizationState.ACTIVE;
+import static com.openblocks.domain.organization.model.OrganizationState.DELETED;
 import static com.openblocks.domain.util.QueryDslUtils.fieldName;
 import static com.openblocks.sdk.exception.BizError.UNABLE_TO_FIND_VALID_ORG;
 import static com.openblocks.sdk.util.ExceptionUtils.deferredError;
+import static com.openblocks.sdk.util.ExceptionUtils.ofError;
 import static com.openblocks.sdk.util.LocaleUtils.getLocale;
 import static com.openblocks.sdk.util.LocaleUtils.getMessage;
 
 import java.util.Collection;
 import java.util.Locale;
 
+import javax.annotation.Nonnull;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
@@ -114,14 +118,24 @@ public Mono<Organization> getOrganizationInEnterpriseMode() {
         if (commonConfig.getWorkspace().getMode() == WorkspaceMode.SAAS) {
             return Mono.empty();
         }
-        return Mono.defer(() -> {
-                    String enterpriseOrgId = commonConfig.getWorkspace().getEnterpriseOrgId();
-                    if (StringUtils.isNotBlank(enterpriseOrgId)) {
-                        return repository.findById(enterpriseOrgId);
-                    }
-                    return Mono.empty();
-                })
-                .switchIfEmpty(repository.findAll().next());
+        return getByEnterpriseOrgId()
+                .switchIfEmpty(repository.findFirstByStateMatches(ACTIVE));
+    }
+
+    @Nonnull
+    private Mono<Organization> getByEnterpriseOrgId() {
+        String enterpriseOrgId = commonConfig.getWorkspace().getEnterpriseOrgId();
+        if (StringUtils.isBlank(enterpriseOrgId)) {
+            return Mono.empty();
+        }
+        return repository.findById(enterpriseOrgId)
+                .delayUntil(org -> {
+                            if (org.getState() == DELETED) {
+                                return ofError(BizError.ORG_DELETED_FOR_ENTERPRISE_MODE, "ORG_DELETED_FOR_ENTERPRISE_MODE");
+                            }
+                            return Mono.empty();
+                        }
+                );
     }
 
     @Override
diff --git a/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/exception/BizError.java b/server/api-service/openblocks-sdk/src/main/java/com/openblocks/sdk/exception/BizError.java
@@ -31,6 +31,7 @@ public enum BizError {
     EXCEED_MAX_ORG_MEMBER_COUNT(500, 5104),
     UNABLE_TO_FIND_VALID_ORG(500, 5105),
     EXCEED_MAX_DEVELOPER_COUNT(500, 5106),
+    ORG_DELETED_FOR_ENTERPRISE_MODE(500, 5107),
 
     // GROUP related, code range 5150 - 5199
     INVALID_GROUP_ID(500, 5150),
diff --git a/server/api-service/openblocks-sdk/src/main/resources/locale_en.properties b/server/api-service/openblocks-sdk/src/main/resources/locale_en.properties
@@ -269,4 +269,5 @@ GOOGLESHEETS_REQUEST_ERROR=Google Sheets request failed.
 GOOGLESHEETS_DATASOURCE_CONFIG_ERROR=Fail to parse Google Sheets data source configuration.
 GOOGLESHEETS_EMPTY_ROW=No data found at this row index. Do you want to try inserting something first?
 APPLICATION_EDIT_ERROR_LACK_OF_DATASOURCE_PERMISSIONS=Current changes of this application will not be saved for lacking of some data sources'' permissions.
-CERTIFICATE_EMPTY=Certificate is empty.
+CERTIFICATE_EMPTY=Certificate is empty.
+ORG_DELETED_FOR_ENTERPRISE_MODE=Provided enterpriseOrgId workspace has been deleted, please contact Openblocks team.
diff --git a/server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/security/SecurityConfig.java b/server/api-service/openblocks-server/src/main/java/com/openblocks/api/framework/security/SecurityConfig.java
@@ -82,6 +82,7 @@ public SecurityWebFilterChain securityWebFilterChain(ServerHttpSecurity http) {
                         ServerWebExchangeMatchers.pathMatchers(HttpMethod.GET, INVITATION_URL + "/**"), // invitation
                         ServerWebExchangeMatchers.pathMatchers(HttpMethod.POST, CUSTOM_AUTH + "/logout"),
                         ServerWebExchangeMatchers.pathMatchers(HttpMethod.HEAD, STATE_URL + "/healthCheck"),
+
                         // used in public viewed apps
                         ServerWebExchangeMatchers.pathMatchers(HttpMethod.GET, CONFIG_URL), // system config
                         ServerWebExchangeMatchers.pathMatchers(HttpMethod.GET, CONFIG_URL + "/deploymentId"), // system config
diff --git a/server/api-service/openblocks-server/src/main/resources/selfhost/ce/application-selfhost.yml b/server/api-service/openblocks-server/src/main/resources/selfhost/ce/application-selfhost.yml
@@ -4,8 +4,6 @@ common:
     salt: ${ENCRYPTION_SALT:openblocks.dev}
   security:
     corsAllowedDomainString: ${CORS_ALLOWED_DOMAINS:*}
-  max-query-request-size-in-mb: 20
-  max-query-response-size-in-mb: 20
   workspace:
     mode: ENTERPRISE
 
@@ -14,6 +12,4 @@ spring:
     mongodb:
       uri: ${MONGODB_URI:mongodb://localhost:27017/openblocks?socketTimeoutMS=5000}
   redis:
-    url: ${REDIS_URL:redis://localhost:6379}
-  codec:
-    max-in-memory-size: 20MB
+    url: ${REDIS_URL:redis://localhost:6379}
diff --git a/server/api-service/openblocks-server/src/main/resources/selfhost/ce/application.yml b/server/api-service/openblocks-server/src/main/resources/selfhost/ce/application.yml
@@ -11,6 +11,8 @@ spring:
   main:
     allow-bean-definition-overriding: true
     allow-circular-references: true
+  codec:
+    max-in-memory-size: 20MB
 
 server:
   compression:
@@ -31,6 +33,8 @@ common:
   block-hound-enable: false
   js-executor:
     host: ${JS_EXECUTOR_URI:http://127.0.0.1:6060}
+  max-query-request-size-in-mb: 20
+  max-query-response-size-in-mb: 20
 
 material:
   mongodb-grid-fs:
