From efd6dbe35b212aa0b99260ec140d241993a5c6e7 Mon Sep 17 00:00:00 2001 From: Abdul Qadir Date: Mon, 26 Feb 2024 19:54:31 +0500 Subject: [PATCH 1/2] Revert the validation that stops unpiblished apps to be viewed --- .../org/lowcoder/api/application/ApplicationApiService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiService.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiService.java index fb05dcf87..e43e48fba 100644 --- a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiService.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiService.java @@ -249,7 +249,8 @@ private Mono checkApplicationStatus(Application application, ApplicationSt } private Mono checkApplicationViewRequest(Application application, ApplicationEndpoints.ApplicationRequestType expected) { - if (expected == ApplicationEndpoints.ApplicationRequestType.PUBLIC_TO_ALL && application.isPublicToAll()) { + // TODO: The check is correct ( logically ) but we need to provide some time for the users to adapt. Will bring it back in the next release + if (expected == ApplicationEndpoints.ApplicationRequestType.PUBLIC_TO_ALL /* && application.isPublicToAll() */) { return Mono.empty(); } if (expected == ApplicationEndpoints.ApplicationRequestType.PUBLIC_TO_MARKETPLACE && application.isPublicToMarketplace()) { From cffdba8fb1dbbd86ac3ef3a8c540c1a74e22d431 Mon Sep 17 00:00:00 2001 From: Abdul Qadir Date: Mon, 26 Feb 2024 20:00:56 +0500 Subject: [PATCH 2/2] Rename marketplace env var --- deploy/docker/README.md | 54 +++++++++---------- .../resources/selfhost/ce/application.yml | 2 +- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/deploy/docker/README.md b/deploy/docker/README.md index 4fba9a727..6a672bb05 100644 --- a/deploy/docker/README.md +++ b/deploy/docker/README.md @@ -21,33 +21,33 @@ DOCKER_BUILDKIT=1 docker build -f deploy/docker/Dockerfile -t lowcoderorg/lowcod Image can be configured by setting environment variables. -| Environment variable | Description | Value | -| --------------------------------- | ----------------------------------------------------------------------- | ----------------------------------------------------- | -| `LOWCODER_REDIS_ENABLED` | If **true** redis server is started in the container | `true` | -| `LOWCODER_MONGODB_ENABLED` | If **true** mongo database is started in the container | `true` | -| `LOWCODER_API_SERVICE_ENABLED` | If **true** lowcoder api-service is started in the container | `true` | -| `LOWCODER_NODE_SERVICE_ENABLED` | If **true** lowcoder node-service is started in the container | `true` | -| `LOWCODER_FRONTEND_ENABLED` | If **true** lowcoder web frontend is started in the container | `true` | -| `LOWCODER_PUID` | ID of user running services. It will own all created logs and data. | `9001` | -| `LOWCODER_PGID` | ID of group of the user running services. | `9001` | -| `LOWCODER_MONGODB_URL` | Mongo database connection string | `mongodb://localhost:27017/lowcoder?authSource=admin` | -| `LOWCODER_REDIS_URL` | Redis server URL | `redis://localhost:6379` | -| `LOWCODER_DB_ENCRYPTION_PASSWORD` | Encryption password | `lowcoder.org` | -| `LOWCODER_DB_ENCRYPTION_SALT` | Salt used for encrypting password | `lowcoder.org` | -| `LOWCODER_CORS_DOMAINS` | CORS allowed domains | `*` | -| `LOWCODER_MAX_REQUEST_SIZE` | Lowcoder max request size | `20m` | -| `LOWCODER_MAX_QUERY_TIMEOUT` | Lowcoder max query timeout (in seconds) | `120` | -| `LOWCODER_API_SERVICE_URL` | Lowcoder API service URL | `http://localhost:8080` | -| `LOWCODER_NODE_SERVICE_URL` | Lowcoder Node service (js executor) URL | `http://localhost:6060` | -| `LOWCODER_MAX_ORGS_PER_USER` | Default maximum organizations per user | `100` | -| `LOWCODER_MAX_MEMBERS_PER_ORG` | Default maximum members per organization | `1000` | -| `LOWCODER_MAX_GROUPS_PER_ORG` | Default maximum groups per organization | `100` | -| `LOWCODER_MAX_APPS_PER_ORG` | Default maximum applications per organization | `1000` | -| `LOWCODER_MAX_DEVELOPERS` | Default maximum developers | `100` | -| `LOWCODER_WORKSPACE_MODE` | SAAS to activate, ENTERPRISE to switch off - Workspaces | `SAAS` | -| `LOWCODER_EMAIL_SIGNUP_ENABLED` | Control if users create their own Workspace automatic when Sign Up | `true` | -| `LOWCODER_EMAIL_AUTH_ENABLED` | Control to show the eMail Login after Admin user is set | `true` | -| `MARKETPLACE_PRIVATE_MODE` | Control if not to show Apps on the local Marketplace to anonymous users | `true` | +| Environment variable | Description | Value | +|-------------------------------------| ----------------------------------------------------------------------- | ----------------------------------------------------- | +| `LOWCODER_REDIS_ENABLED` | If **true** redis server is started in the container | `true` | +| `LOWCODER_MONGODB_ENABLED` | If **true** mongo database is started in the container | `true` | +| `LOWCODER_API_SERVICE_ENABLED` | If **true** lowcoder api-service is started in the container | `true` | +| `LOWCODER_NODE_SERVICE_ENABLED` | If **true** lowcoder node-service is started in the container | `true` | +| `LOWCODER_FRONTEND_ENABLED` | If **true** lowcoder web frontend is started in the container | `true` | +| `LOWCODER_PUID` | ID of user running services. It will own all created logs and data. | `9001` | +| `LOWCODER_PGID` | ID of group of the user running services. | `9001` | +| `LOWCODER_MONGODB_URL` | Mongo database connection string | `mongodb://localhost:27017/lowcoder?authSource=admin` | +| `LOWCODER_REDIS_URL` | Redis server URL | `redis://localhost:6379` | +| `LOWCODER_DB_ENCRYPTION_PASSWORD` | Encryption password | `lowcoder.org` | +| `LOWCODER_DB_ENCRYPTION_SALT` | Salt used for encrypting password | `lowcoder.org` | +| `LOWCODER_CORS_DOMAINS` | CORS allowed domains | `*` | +| `LOWCODER_MAX_REQUEST_SIZE` | Lowcoder max request size | `20m` | +| `LOWCODER_MAX_QUERY_TIMEOUT` | Lowcoder max query timeout (in seconds) | `120` | +| `LOWCODER_API_SERVICE_URL` | Lowcoder API service URL | `http://localhost:8080` | +| `LOWCODER_NODE_SERVICE_URL` | Lowcoder Node service (js executor) URL | `http://localhost:6060` | +| `LOWCODER_MAX_ORGS_PER_USER` | Default maximum organizations per user | `100` | +| `LOWCODER_MAX_MEMBERS_PER_ORG` | Default maximum members per organization | `1000` | +| `LOWCODER_MAX_GROUPS_PER_ORG` | Default maximum groups per organization | `100` | +| `LOWCODER_MAX_APPS_PER_ORG` | Default maximum applications per organization | `1000` | +| `LOWCODER_MAX_DEVELOPERS` | Default maximum developers | `100` | +| `LOWCODER_WORKSPACE_MODE` | SAAS to activate, ENTERPRISE to switch off - Workspaces | `SAAS` | +| `LOWCODER_EMAIL_SIGNUP_ENABLED` | Control if users create their own Workspace automatic when Sign Up | `true` | +| `LOWCODER_EMAIL_AUTH_ENABLED` | Control to show the eMail Login after Admin user is set | `true` | +| `LOWCODER_MARKETPLACE_PRIVATE_MODE` | Control if not to show Apps on the local Marketplace to anonymous users | `true` | ## Building api-service image diff --git a/server/api-service/lowcoder-server/src/main/resources/selfhost/ce/application.yml b/server/api-service/lowcoder-server/src/main/resources/selfhost/ce/application.yml index 11c0511c2..258833aea 100644 --- a/server/api-service/lowcoder-server/src/main/resources/selfhost/ce/application.yml +++ b/server/api-service/lowcoder-server/src/main/resources/selfhost/ce/application.yml @@ -54,7 +54,7 @@ common: workspace: mode: ${LOWCODER_WORKSPACE_MODE:SAAS} marketplace: - private-mode: ${MARKETPLACE_PRIVATE_MODE:true} + private-mode: ${LOWCODER_MARKETPLACE_PRIVATE_MODE:true} material: mongodb-grid-fs: