@budibase/server 1.0.219-alpha.8 → 1.0.220-alpha.0

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

@@ -84,7 +84,7 @@ function read(ctx, next) {
 exports.read = read;
 function update(ctx, next) {
     return __awaiter(this, void 0, void 0, function* () {
-        ctx.request.body = fixAppID(ctx.request.body, ctx.params);
+        ctx.request.body = yield (0, utils_1.addRev)(fixAppID(ctx.request.body, ctx.params));
         updateAppId(ctx.params.appId);
         yield controller.update(ctx);
         yield setResponseApp(ctx);

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

@@ -12,14 +12,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.search = exports.addRev = void 0;
 const { getAppDB } = require("@budibase/backend-core/context");
 const utils_1 = require("../../../integrations/utils");
+const utils_2 = require("../../../db/utils");
 function addRev(body, tableId) {
     return __awaiter(this, void 0, void 0, function* () {
         if (!body._id || (tableId && (0, utils_1.isExternalTable)(tableId))) {
             return body;
         }
+        let id = body._id;
+        if (body._id.startsWith(utils_2.APP_PREFIX)) {
+            id = utils_2.DocumentTypes.APP_METADATA;
+        }
         const db = getAppDB();
-        const dbDoc = yield db.get(body._id);
+        const dbDoc = yield db.get(id);
         body._rev = dbDoc._rev;
+        // update ID in case it is an app ID
+        body._id = id;
         return body;
     });
 }

package/dist/api/controllers/query/index.js

@@ -164,12 +164,15 @@ function preview(ctx) {
     });
 }
 exports.preview = preview;
-function execute(ctx, opts = { rowsOnly: false }) {
+function execute(ctx, opts = { rowsOnly: false, isAutomation: false }) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = (0, context_1.getAppDB)();
         const query = yield db.get(ctx.params.queryId);
         const datasource = yield db.get(query.datasourceId);
-        const authConfigCtx = getAuthConfig(ctx);
+        let authConfigCtx = {};
+        if (!opts.isAutomation) {
+            authConfigCtx = getAuthConfig(ctx);
+        }
         const enrichedParameters = ctx.request.body.parameters || {};
         // make sure parameters are fully enriched with defaults
         if (query && query.parameters) {
@@ -214,9 +217,9 @@ function executeV1(ctx) {
     });
 }
 exports.executeV1 = executeV1;
-function executeV2(ctx) {
+function executeV2(ctx, { isAutomation } = {}) {
     return __awaiter(this, void 0, void 0, function* () {
-        return execute(ctx, { rowsOnly: false });
+        return execute(ctx, { rowsOnly: false, isAutomation });
     });
 }
 exports.executeV2 = executeV2;

package/dist/api/controllers/row/internalSearch.js

@@ -18,7 +18,7 @@ const { getAppId } = require("@budibase/backend-core/context");
  */
 class QueryBuilder {
     constructor(base) {
-        this.query = Object.assign({ string: {}, fuzzy: {}, range: {}, equal: {}, notEqual: {}, empty: {}, notEmpty: {}, oneOf: {} }, base);
+        this.query = Object.assign({ allOr: false, string: {}, fuzzy: {}, range: {}, equal: {}, notEqual: {}, empty: {}, notEmpty: {}, oneOf: {} }, base);
         this.limit = 50;
         this.sortOrder = "ascending";
         this.sortType = "string";
@@ -127,8 +127,21 @@ class QueryBuilder {
     }
     buildSearchQuery() {
         const builder = this;
-        let query = "*:*";
+        let allOr = this.query && this.query.allOr;
+        let query = allOr ? "" : "*:*";
         const allPreProcessingOpts = { escape: true, lowercase: true, wrap: true };
+        let tableId;
+        if (this.query.equal.tableId) {
+            tableId = this.query.equal.tableId;
+            delete this.query.equal.tableId;
+        }
+        const equal = (key, value) => {
+            // 0 evaluates to false, which means we would return all rows if we don't check it
+            if (!value && value !== 0) {
+                return null;
+            }
+            return `${key}:${builder.preprocess(value, allPreProcessingOpts)}`;
+        };
         function build(structure, queryFn) {
             for (let [key, value] of Object.entries(structure)) {
                 key = builder.preprocess(key.replace(/ /g, "_"), {
@@ -138,7 +151,10 @@ class QueryBuilder {
                 if (expression == null) {
                     continue;
                 }
-                query += ` AND ${expression}`;
+                if (query.length > 0) {
+                    query += ` ${allOr ? "OR" : "AND"} `;
+                }
+                query += expression;
             }
         }
         // Construct the actual lucene search query string from JSON structure
@@ -183,13 +199,7 @@ class QueryBuilder {
             });
         }
         if (this.query.equal) {
-            build(this.query.equal, (key, value) => {
-                // 0 evaluates to false, which means we would return all rows if we don't check it
-                if (!value && value !== 0) {
-                    return null;
-                }
-                return `${key}:${builder.preprocess(value, allPreProcessingOpts)}`;
-            });
+            build(this.query.equal, equal);
         }
         if (this.query.notEqual) {
             build(this.query.notEqual, (key, value) => {
@@ -222,6 +232,12 @@ class QueryBuilder {
                 return `${key}:(${orStatement})`;
             });
         }
+        // make sure table ID is always added as an AND
+        if (tableId) {
+            query = `(${query})`;
+            allOr = false;
+            build({ tableId }, equal);
+        }
         return query;
     }
     buildSearchBody() {

package/dist/api/routes/public/rows.js

@@ -144,6 +144,11 @@ read.push(new Endpoint_1.default("get", "/tables/:tableId/rows/:rowId", rows_1.d
  *               query:
  *                 type: object
  *                 properties:
+ *                   allOr:
+ *                     type: boolean
+ *                     description: Specifies that a row should be returned if it satisfies
+ *                       any of the specified options, rather than requiring it to fulfill all
+ *                       the search parameters. This defaults to false, meaning AND logic will be used.
  *                   string:
  *                     type: object
  *                     example:
@@ -161,9 +166,9 @@ read.push(new Endpoint_1.default("get", "/tables/:tableId/rows/:rowId", rows_1.d
  *                   range:
  *                     type: object
  *                     description: Searches within a range, the format of this must be
- *                       columnName -> [low, high].
+ *                       in the format of an object with a "low" and "high" property.
  *                     example:
- *                       columnName1: [10, 20]
+ *                       columnName1: { low: 10, high: 20 }
  *                   equal:
  *                     type: object
  *                     description: Searches for rows that have a column value that is

package/dist/api/routes/utils/validators.js

@@ -51,6 +51,7 @@ function filterObject() {
         oneOf: Joi.object().optional(),
         contains: Joi.object().optional(),
         notContains: Joi.object().optional(),
+        allOr: Joi.boolean().optional(),
     }).unknown(true);
 }
 exports.internalSearchValidator = () => {

package/dist/app.js

@@ -54,6 +54,7 @@ const { Thread } = require("./threads");
 const redis_1 = __importDefault(require("./utilities/redis"));
 const migrations = __importStar(require("./migrations"));
 const backend_core_1 = require("@budibase/backend-core");
+const workerRequests_1 = require("./utilities/workerRequests");
 const app = new Koa();
 // set up top level koa middleware
 app.use(koaBody({
@@ -112,6 +113,7 @@ server.on("close", () => __awaiter(void 0, void 0, void 0, function* () {
     }
 }));
 module.exports = server.listen(env.PORT || 0, () => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
     console.log(`Budibase running on ${JSON.stringify(server.address())}`);
     env._set("PORT", server.address().port);
     eventEmitter.emitPort(env.PORT);
@@ -128,6 +130,24 @@ module.exports = server.listen(env.PORT || 0, () => __awaiter(void 0, void 0, vo
             shutdown();
         }
     }
+    // check and create admin user if required
+    if (env.SELF_HOSTED &&
+        !env.MULTI_TENANCY &&
+        env.BB_ADMIN_USER_EMAIL &&
+        env.BB_ADMIN_USER_PASSWORD) {
+        const checklist = yield (0, workerRequests_1.getChecklist)();
+        if (!((_a = checklist === null || checklist === void 0 ? void 0 : checklist.adminUser) === null || _a === void 0 ? void 0 : _a.checked)) {
+            try {
+                const tenantId = backend_core_1.tenancy.getTenantId();
+                yield (0, workerRequests_1.createAdminUser)(env.BB_ADMIN_USER_EMAIL, env.BB_ADMIN_USER_PASSWORD, tenantId);
+                console.log("Admin account automatically created for", env.BB_ADMIN_USER_EMAIL);
+            }
+            catch (e) {
+                logAlert("Error creating initial admin user. Exiting.", e);
+                shutdown();
+            }
+        }
+    }
     // check for version updates
     yield backend_core_1.installation.checkInstallVersion();
     // done last - this will never complete

package/dist/automations/steps/executeQuery.js

@@ -88,7 +88,7 @@ exports.run = function ({ inputs, appId, emitter }) {
             },
         });
         try {
-            yield queryController.executeV2(ctx);
+            yield queryController.executeV2(ctx, { isAutomation: true });
             const _b = ctx.body, { data } = _b, rest = __rest(_b, ["data"]);
             return {
                 response: data,

package/dist/environment.js

@@ -62,6 +62,8 @@ module.exports = {
     DYNAMO_ENDPOINT: process.env.DYNAMO_ENDPOINT,
     QUERY_THREAD_TIMEOUT: parseIntSafe(process.env.QUERY_THREAD_TIMEOUT),
     SQL_MAX_ROWS: process.env.SQL_MAX_ROWS,
+    BB_ADMIN_USER_EMAIL: process.env.BB_ADMIN_USER_EMAIL,
+    BB_ADMIN_USER_PASSWORD: process.env.BB_ADMIN_USER_PASSWORD,
     // flags
     ALLOW_DEV_AUTOMATIONS: process.env.ALLOW_DEV_AUTOMATIONS,
     DISABLE_THREADING: process.env.DISABLE_THREADING,

package/dist/integrations/base/sql.js

@@ -97,8 +97,10 @@ function generateSelectStatement(json, knex) {
         const fieldNames = field.split(/\./g);
         const tableName = fieldNames[0];
         const columnName = fieldNames[1];
-        if (columnName && knex.client.config.client === utils_1.SqlClients.POSTGRES) {
-            const externalType = schema === null || schema === void 0 ? void 0 : schema[columnName].externalType;
+        if (columnName &&
+            (schema === null || schema === void 0 ? void 0 : schema[columnName]) &&
+            knex.client.config.client === utils_1.SqlClients.POSTGRES) {
+            const externalType = schema[columnName].externalType;
             if (externalType === null || externalType === void 0 ? void 0 : externalType.includes("money")) {
                 return knex.raw(`"${tableName}"."${columnName}"::money::numeric as "${field}"`);
             }

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.0.219-alpha.7",
+    "version": "1.0.219",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -77,11 +77,10 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "10.0.3",
-        "@budibase/backend-core": "^1.0.219-alpha.7",
-        "@budibase/client": "^1.0.219-alpha.7",
-        "@budibase/pro": "1.0.219-alpha.7",
-        "@budibase/string-templates": "^1.0.219-alpha.7",
-        "@budibase/types": "^1.0.219-alpha.7",
+        "@budibase/backend-core": "^1.0.219",
+        "@budibase/client": "^1.0.219",
+        "@budibase/pro": "1.0.219",
+        "@budibase/string-templates": "^1.0.219",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",
@@ -152,6 +151,7 @@
         "@babel/core": "7.17.4",
         "@babel/preset-env": "7.16.11",
         "@budibase/standard-components": "^0.9.139",
+        "@budibase/types": "^1.0.219",
         "@jest/test-sequencer": "24.9.0",
         "@types/apidoc": "0.50.0",
         "@types/bson": "4.2.0",

package/dist/threads/query.js

@@ -17,6 +17,7 @@ const { doInAppContext, getAppDB } = require("@budibase/backend-core/context");
 const { refreshOAuthToken, updateUserOAuth, } = require("@budibase/backend-core/auth");
 const { user: userCache } = require("@budibase/backend-core/cache");
 const { getGlobalIDFromUserMetadataID } = require("../db/utils");
+const { cloneDeep } = require("lodash/fp");
 const { isSQL } = require("../integrations/utils");
 const { enrichQueryFields, interpolateSQL, } = require("../integrations/queries/sql");
 class QueryRunner {
@@ -43,16 +44,19 @@ class QueryRunner {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             let { datasource, fields, queryVerb, transformer } = this;
-            const Integration = integrations[datasource.source];
+            let datasourceClone = cloneDeep(datasource);
+            let fieldsClone = cloneDeep(fields);
+            const Integration = integrations[datasourceClone.source];
             if (!Integration) {
                 throw "Integration type does not exist.";
             }
-            if (datasource.config.authConfigs) {
-                datasource.config.authConfigs = datasource.config.authConfigs.map(config => {
-                    return enrichQueryFields(config, this.ctx);
-                });
+            if (datasourceClone.config.authConfigs) {
+                datasourceClone.config.authConfigs =
+                    datasourceClone.config.authConfigs.map(config => {
+                        return enrichQueryFields(config, this.ctx);
+                    });
             }
-            const integration = new Integration(datasource.config);
+            const integration = new Integration(datasourceClone.config);
             // pre-query, make sure datasource variables are added to parameters
             const parameters = yield this.addDatasourceVariables();
             // Enrich the parameters with the addition context items.
@@ -60,16 +64,16 @@ class QueryRunner {
             const enrichedParameters = enrichQueryFields(parameters, this.ctx);
             const enrichedContext = Object.assign(Object.assign({}, enrichedParameters), this.ctx);
             // Parse global headers
-            if (datasource.config.defaultHeaders) {
-                datasource.config.defaultHeaders = enrichQueryFields(datasource.config.defaultHeaders, enrichedContext);
+            if (datasourceClone.config.defaultHeaders) {
+                datasourceClone.config.defaultHeaders = enrichQueryFields(datasourceClone.config.defaultHeaders, enrichedContext);
             }
             let query;
             // handle SQL injections by interpolating the variables
-            if (isSQL(datasource)) {
-                query = interpolateSQL(fields, enrichedParameters, integration);
+            if (isSQL(datasourceClone)) {
+                query = interpolateSQL(fieldsClone, enrichedParameters, integration);
             }
             else {
-                query = enrichQueryFields(fields, enrichedContext);
+                query = enrichQueryFields(fieldsClone, enrichedContext);
             }
             // Add pagination values for REST queries
             if (this.pagination) {
@@ -100,7 +104,9 @@ class QueryRunner {
                     // Attempt to refresh the access token from the provider
                     this.hasRefreshedOAuth = true;
                 }
-                this.hasRerun = true;
+                else {
+                    this.hasRerun = true;
+                }
                 yield threadUtils.invalidateDynamicVariables(this.cachedVariables);
                 return this.execute();
             }
@@ -156,7 +162,8 @@ class QueryRunner {
             else {
                 // In this event the user may have oAuth issues that
                 // could require re-authenticating with their provider.
-                throw new Error("OAuth2 access token could not be refreshed: " + resp.err.toString());
+                let errorMessage = resp.err.data ? resp.err.data : resp.err.toString();
+                throw new Error("OAuth2 access token could not be refreshed: " + errorMessage);
             }
             return resp;
         });