@budibase/server 1.0.167-alpha.8 → 1.0.169

package/coverage/lcov.info

@@ -1372,36 +1372,36 @@ BRH:0
 end_of_record
 TN:
 SF:src/api/controllers/templates.js
-FN:9,(anonymous_0)
+FN:8,(anonymous_0)
 FNF:1
 FNH:1
 FNDA:1,(anonymous_0)
 DA:1,24
 DA:2,24
-DA:3,24
-DA:7,24
-DA:9,24
-DA:10,1
+DA:6,24
+DA:8,24
+DA:9,1
+DA:11,1
 DA:12,1
 DA:13,1
 DA:14,1
-DA:15,1
-DA:16,0
-DA:19,0
+DA:15,0
+DA:18,0
+DA:21,1
 DA:22,1
 DA:23,1
-DA:24,1
-DA:26,0
-LF:16
-LH:13
-BRDA:15,0,0,0
-BRDA:15,0,1,1
-BRDA:22,1,0,1
-BRDA:22,1,1,0
-BRDA:22,2,0,1
-BRDA:22,2,1,1
-BRF:6
-BRH:4
+DA:25,0
+LF:15
+LH:12
+BRDA:9,0,0,1
+BRDA:14,1,0,0
+BRDA:14,1,1,1
+BRDA:21,2,0,1
+BRDA:21,2,1,0
+BRDA:21,3,0,1
+BRDA:21,3,1,1
+BRF:7
+BRH:5
 end_of_record
 TN:
 SF:src/api/controllers/user.js
@@ -3354,10 +3354,8 @@ LF:11
 LH:11
 BRDA:9,0,0,0
 BRDA:9,0,1,2
-BRDA:9,1,0,2
-BRDA:9,1,1,0
-BRF:4
-BRH:2
+BRF:2
+BRH:1
 end_of_record
 TN:
 SF:src/api/controllers/view/index.js
@@ -4770,8 +4768,8 @@ BRH:12
 end_of_record
 TN:
 SF:src/automations/steps/queryRows.js
-FN:75,getTable
-FN:85,(anonymous_1)
+FN:74,getTable
+FN:84,(anonymous_1)
 FNF:2
 FNH:2
 FNDA:1,getTable
@@ -4784,35 +4782,35 @@ DA:5,41
 DA:7,41
 DA:12,41
 DA:17,41
-DA:76,1
+DA:75,1
+DA:80,1
 DA:81,1
-DA:82,1
-DA:85,41
+DA:84,41
+DA:85,1
 DA:86,1
 DA:87,1
 DA:88,1
 DA:89,1
 DA:90,1
-DA:91,1
-DA:94,1
+DA:93,1
+DA:105,1
 DA:106,1
 DA:107,1
-DA:108,1
-DA:113,0
+DA:112,0
 LF:23
 LH:22
-BRDA:89,0,0,1
-BRDA:89,0,1,0
-BRDA:89,1,0,1
-BRDA:89,1,1,1
-BRDA:89,1,2,1
-BRDA:89,1,3,1
-BRDA:92,2,0,0
-BRDA:92,2,1,1
-BRDA:102,3,0,1
-BRDA:102,3,1,0
-BRDA:109,4,0,1
-BRDA:109,4,1,0
+BRDA:88,0,0,1
+BRDA:88,0,1,0
+BRDA:88,1,0,1
+BRDA:88,1,1,1
+BRDA:88,1,2,1
+BRDA:88,1,3,1
+BRDA:91,2,0,0
+BRDA:91,2,1,1
+BRDA:101,3,0,1
+BRDA:101,3,1,0
+BRDA:108,4,0,1
+BRDA:108,4,1,0
 BRF:12
 BRH:8
 end_of_record
@@ -7073,13 +7071,22 @@ BRH:0
 end_of_record
 TN:
 SF:src/utilities/budibaseDir.js
-FNF:0
+FN:6,(anonymous_0)
+FNF:1
 FNH:0
+FNDA:0,(anonymous_0)
 DA:1,42
+DA:2,42
 DA:3,42
-LF:2
-LH:2
-BRF:0
+DA:4,42
+DA:6,42
+DA:7,0
+DA:10,42
+LF:7
+LH:6
+BRDA:7,0,0,0
+BRDA:7,0,1,0
+BRF:2
 BRH:0
 end_of_record
 TN:
@@ -7616,25 +7623,48 @@ BRH:0
 end_of_record
 TN:
 SF:src/utilities/users.js
-FN:5,(anonymous_0)
-FNF:1
-FNH:1
+FN:6,(anonymous_0)
+FN:27,(anonymous_1)
+FNF:2
+FNH:2
 FNDA:2,(anonymous_0)
+FNDA:2,(anonymous_1)
 DA:1,41
 DA:2,41
 DA:3,41
-DA:5,41
-DA:6,2
-DA:8,2
-DA:10,2
+DA:4,41
+DA:6,41
+DA:7,2
+DA:9,2
 DA:11,2
-DA:14,2
+DA:12,2
 DA:15,2
-DA:17,2
-LF:11
-LH:11
-BRF:0
-BRH:0
+DA:16,2
+DA:18,2
+DA:27,41
+DA:28,2
+DA:29,0
+DA:31,2
+DA:32,1
+DA:34,2
+DA:35,2
+DA:37,0
+DA:38,0
+DA:40,0
+DA:42,0
+DA:44,2
+LF:24
+LH:19
+BRDA:28,0,0,0
+BRDA:28,0,1,2
+BRDA:31,1,0,1
+BRDA:31,1,1,1
+BRDA:31,2,0,2
+BRDA:31,2,1,2
+BRDA:34,3,0,2
+BRDA:34,3,1,0
+BRF:8
+BRH:6
 end_of_record
 TN:
 SF:src/utilities/workerRequests.js

package/dist/api/controllers/application.js

@@ -385,6 +385,13 @@ const destroy = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
 });
 exports.destroy = destroy;
 const sync = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
+    if (environment_1.default.DISABLE_AUTO_PROD_APP_SYNC) {
+        ctx.status = 200;
+        ctx.body = {
+            message: "App sync disabled. You can reenable with the DISABLE_AUTO_PROD_APP_SYNC environment variable.",
+        };
+        return next();
+    }
     const appId = ctx.params.appId;
     if (!isDevAppID(appId)) {
         ctx.throw(400, "This action cannot be performed for production apps");

package/dist/api/controllers/public/users.js

@@ -11,28 +11,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.destroy = exports.update = exports.read = exports.create = exports.search = void 0;
 const workerRequests_1 = require("../../../utilities/workerRequests");
+const users_1 = require("../../../utilities/users");
 const utils_1 = require("./utils");
-const { getProdAppID } = require("@budibase/backend-core/db");
-function fixUser(ctx) {
-    if (!ctx.request.body) {
-        return ctx;
-    }
-    if (!ctx.request.body._id && ctx.params.userId) {
-        ctx.request.body._id = ctx.params.userId;
-    }
-    if (!ctx.request.body.roles) {
-        ctx.request.body.roles = {};
-    }
-    else {
-        const newRoles = {};
-        for (let [appId, role] of Object.entries(ctx.request.body.roles)) {
-            // @ts-ignore
-            newRoles[getProdAppID(appId)] = role;
-        }
-        ctx.request.body.roles = newRoles;
-    }
-    return ctx;
-}
 function getUser(ctx, userId) {
     var _a;
     if (userId) {
@@ -54,7 +34,7 @@ function search(ctx, next) {
 exports.search = search;
 function create(ctx, next) {
     return __awaiter(this, void 0, void 0, function* () {
-        const response = yield (0, workerRequests_1.saveGlobalUser)(fixUser(ctx));
+        const response = yield (0, workerRequests_1.saveGlobalUser)((0, users_1.publicApiUserFix)(ctx));
         ctx.body = yield getUser(ctx, response._id);
         yield next();
     });
@@ -71,7 +51,7 @@ function update(ctx, next) {
     return __awaiter(this, void 0, void 0, function* () {
         const user = yield (0, workerRequests_1.readGlobalUser)(ctx);
         ctx.request.body = Object.assign(Object.assign({}, ctx.request.body), { _rev: user._rev });
-        const response = yield (0, workerRequests_1.saveGlobalUser)(fixUser(ctx));
+        const response = yield (0, workerRequests_1.saveGlobalUser)((0, users_1.publicApiUserFix)(ctx));
         ctx.body = yield getUser(ctx, response._id);
         yield next();
     });

package/dist/api/controllers/templates.js

@@ -10,12 +10,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 const fetch = require("node-fetch");
 const { downloadTemplate } = require("../../utilities/fileSystem");
-const env = require("../../environment");
 // development flag, can be used to test against templates exported locally
 const DEFAULT_TEMPLATES_BUCKET = "prod-budi-templates.s3-eu-west-1.amazonaws.com";
 exports.fetch = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        let type = env.TEMPLATE_REPOSITORY;
+        const { type = "app" } = ctx.query;
         let response, error = false;
         try {
             response = yield fetch(`https://${DEFAULT_TEMPLATES_BUCKET}/manifest.json`);

package/dist/api/controllers/view/exporters.js

@@ -6,7 +6,7 @@ exports.csv = function (headers, rows) {
             .map(header => {
             let val = row[header];
             val =
-                typeof val === "object" && !(val instanceof Date)
+                typeof val === "object"
                     ? `"${JSON.stringify(val).replace(/"/g, "'")}"`
                     : `"${val}"`;
             return val.trim();

package/dist/automations/steps/queryRows.js

@@ -57,7 +57,6 @@ exports.definition = {
                 limit: {
                     type: "number",
                     title: "Limit",
-                    customType: "queryLimit",
                 },
             },
             required: ["tableId"],

package/dist/environment.js

@@ -1,4 +1,5 @@
 "use strict";
+const { join } = require("path");
 function isTest() {
     return (process.env.NODE_ENV === "jest" ||
         process.env.NODE_ENV === "cypress" ||
@@ -14,7 +15,9 @@ function isCypress() {
 }
 let LOADED = false;
 if (!LOADED && isDev() && !isTest()) {
-    require("dotenv").config();
+    require("dotenv").config({
+        path: join(__dirname, "..", ".env"),
+    });
     LOADED = true;
 }
 function parseIntSafe(number) {
@@ -30,12 +33,15 @@ module.exports = {
     COUCH_DB_URL: process.env.COUCH_DB_URL,
     MINIO_URL: process.env.MINIO_URL,
     WORKER_URL: process.env.WORKER_URL,
+    SELF_HOSTED: process.env.SELF_HOSTED,
     AWS_REGION: process.env.AWS_REGION,
+    ENABLE_ANALYTICS: process.env.ENABLE_ANALYTICS,
     MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY,
     MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY,
     REDIS_URL: process.env.REDIS_URL,
     REDIS_PASSWORD: process.env.REDIS_PASSWORD,
     INTERNAL_API_KEY: process.env.INTERNAL_API_KEY,
+    MULTI_TENANCY: process.env.MULTI_TENANCY,
     HTTP_MIGRATIONS: process.env.HTTP_MIGRATIONS,
     API_REQ_LIMIT_PER_SEC: process.env.API_REQ_LIMIT_PER_SEC,
     GOOGLE_CLIENT_ID: process.env.GOOGLE_CLIENT_ID,
@@ -45,26 +51,28 @@ module.exports = {
     JEST_WORKER_ID: process.env.JEST_WORKER_ID,
     BUDIBASE_ENVIRONMENT: process.env.BUDIBASE_ENVIRONMENT,
     DISABLE_ACCOUNT_PORTAL: process.env.DISABLE_ACCOUNT_PORTAL,
-    TEMPLATE_REPOSITORY: process.env.TEMPLATE_REPOSITORY || "app",
+    DISABLE_AUTO_PROD_APP_SYNC: process.env.DISABLE_AUTO_PROD_APP_SYNC,
     // minor
     SALT_ROUNDS: process.env.SALT_ROUNDS,
     LOGGER: process.env.LOGGER,
     LOG_LEVEL: process.env.LOG_LEVEL,
+    AUTOMATION_DIRECTORY: process.env.AUTOMATION_DIRECTORY,
+    AUTOMATION_BUCKET: process.env.AUTOMATION_BUCKET,
     AUTOMATION_MAX_ITERATIONS: process.env.AUTOMATION_MAX_ITERATIONS,
     SENDGRID_API_KEY: process.env.SENDGRID_API_KEY,
     DYNAMO_ENDPOINT: process.env.DYNAMO_ENDPOINT,
     POSTHOG_TOKEN: process.env.POSTHOG_TOKEN,
     QUERY_THREAD_TIMEOUT: parseIntSafe(process.env.QUERY_THREAD_TIMEOUT),
-    SQL_MAX_ROWS: process.env.SQL_MAX_ROWS,
-    // flags
+    // old - to remove
+    CLIENT_ID: process.env.CLIENT_ID,
+    BUDIBASE_DIR: process.env.BUDIBASE_DIR,
+    DEPLOYMENT_DB_URL: process.env.DEPLOYMENT_DB_URL,
+    BUDIBASE_API_KEY: process.env.BUDIBASE_API_KEY,
+    USERID_API_KEY: process.env.USERID_API_KEY,
+    DEPLOYMENT_CREDENTIALS_URL: process.env.DEPLOYMENT_CREDENTIALS_URL,
     ALLOW_DEV_AUTOMATIONS: process.env.ALLOW_DEV_AUTOMATIONS,
     DISABLE_THREADING: process.env.DISABLE_THREADING,
-    DISABLE_DEVELOPER_LICENSE: process.env.DISABLE_DEVELOPER_LICENSE,
-    MULTI_TENANCY: process.env.MULTI_TENANCY,
-    ENABLE_ANALYTICS: process.env.ENABLE_ANALYTICS,
-    SELF_HOSTED: process.env.SELF_HOSTED,
-    // old
-    CLIENT_ID: process.env.CLIENT_ID,
+    SQL_MAX_ROWS: process.env.SQL_MAX_ROWS,
     _set(key, value) {
         process.env[key] = value;
         module.exports[key] = value;

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.0.167-alpha.7",
+    "version": "1.0.168",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -69,10 +69,10 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "^10.0.3",
-        "@budibase/backend-core": "^1.0.167-alpha.7",
-        "@budibase/client": "^1.0.167-alpha.7",
-        "@budibase/pro": "1.0.167-alpha.7",
-        "@budibase/string-templates": "^1.0.167-alpha.7",
+        "@budibase/backend-core": "^1.0.168",
+        "@budibase/client": "^1.0.168",
+        "@budibase/pro": "1.0.168",
+        "@budibase/string-templates": "^1.0.168",
         "@bull-board/api": "^3.7.0",
         "@bull-board/koa": "^3.7.0",
         "@elastic/elasticsearch": "7.10.0",