@budibase/server 1.0.49-alpha.0 → 1.0.49-alpha.12

package/dist/migrations/functions/quotas1.js

@@ -0,0 +1,50 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.run = void 0;
+const usageQuotas_1 = require("./usageQuotas");
+const syncApps = __importStar(require("./usageQuotas/syncApps"));
+const syncRows = __importStar(require("./usageQuotas/syncRows"));
+/**
+ * Date:
+ * January 2022
+ *
+ * Description:
+ * Synchronise the app and row quotas to the state of the db after it was
+ * discovered that the quota resets were still in place and the row quotas
+ * weren't being decremented correctly.
+ */
+const run = () => __awaiter(void 0, void 0, void 0, function* () {
+    yield usageQuotas_1.runQuotaMigration(() => __awaiter(void 0, void 0, void 0, function* () {
+        yield syncApps.run();
+        yield syncRows.run();
+    }));
+});
+exports.run = run;

package/dist/migrations/{usageQuotas → functions/usageQuotas}/index.js

@@ -8,17 +8,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const { MIGRATIONS, MIGRATION_DBS, migrateIfRequired, } = require("@budibase/backend-core/migrations");
-const { useQuotas } = require("../../utilities/usageQuota");
-const syncApps = require("./syncApps");
-const syncRows = require("./syncRows");
-exports.run = () => __awaiter(void 0, void 0, void 0, function* () {
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runQuotaMigration = void 0;
+const { useQuotas } = require("../../../utilities/usageQuota");
+const runQuotaMigration = (migration) => __awaiter(void 0, void 0, void 0, function* () {
     if (!useQuotas()) {
         return;
     }
-    // Jan 2022
-    yield migrateIfRequired(MIGRATION_DBS.GLOBAL_DB, MIGRATIONS.QUOTAS_1, () => __awaiter(void 0, void 0, void 0, function* () {
-        yield syncApps.run();
-        yield syncRows.run();
-    }));
+    yield migration();
 });
+exports.runQuotaMigration = runQuotaMigration;

package/dist/migrations/{usageQuotas → functions/usageQuotas}/syncApps.js

@@ -8,19 +8,22 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const { getGlobalDB, getTenantId } = require("@budibase/backend-core/tenancy");
-const { getAllApps } = require("@budibase/backend-core/db");
-const CouchDB = require("../../db");
-const { getUsageQuotaDoc } = require("../../utilities/usageQuota");
-exports.run = () => __awaiter(void 0, void 0, void 0, function* () {
-    const db = getGlobalDB();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.run = void 0;
+const tenancy_1 = require("@budibase/backend-core/tenancy");
+const db_1 = require("@budibase/backend-core/db");
+const usageQuota_1 = require("../../../utilities/usageQuota");
+const run = () => __awaiter(void 0, void 0, void 0, function* () {
+    const db = tenancy_1.getGlobalDB();
     // get app count
-    const devApps = yield getAllApps(CouchDB, { dev: true });
+    // @ts-ignore
+    const devApps = yield db_1.getAllApps({ dev: true });
     const appCount = devApps ? devApps.length : 0;
     // sync app count
-    const tenantId = getTenantId();
+    const tenantId = tenancy_1.getTenantId();
     console.log(`[Tenant: ${tenantId}] Syncing app count: ${appCount}`);
-    const usageDoc = yield getUsageQuotaDoc(db);
+    const usageDoc = yield usageQuota_1.getUsageQuotaDoc(db);
     usageDoc.usageQuota.apps = appCount;
     yield db.put(usageDoc);
 });
+exports.run = run;

package/dist/migrations/{usageQuotas → functions/usageQuotas}/syncRows.js

@@ -8,22 +8,26 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const { getGlobalDB, getTenantId } = require("@budibase/backend-core/tenancy");
-const { getAllApps } = require("@budibase/backend-core/db");
-const CouchDB = require("../../db");
-const { getUsageQuotaDoc } = require("../../utilities/usageQuota");
-const { getUniqueRows } = require("../../utilities/usageQuota/rows");
-exports.run = () => __awaiter(void 0, void 0, void 0, function* () {
-    const db = getGlobalDB();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.run = void 0;
+const tenancy_1 = require("@budibase/backend-core/tenancy");
+const db_1 = require("@budibase/backend-core/db");
+const usageQuota_1 = require("../../../utilities/usageQuota");
+const rows_1 = require("../../../utilities/usageQuota/rows");
+const run = () => __awaiter(void 0, void 0, void 0, function* () {
+    const db = tenancy_1.getGlobalDB();
     // get all rows in all apps
-    const allApps = yield getAllApps(CouchDB, { all: true });
-    const appIds = allApps ? allApps.map(app => app.appId) : [];
-    const rows = yield getUniqueRows(appIds);
+    // @ts-ignore
+    const allApps = yield db_1.getAllApps({ all: true });
+    // @ts-ignore
+    const appIds = allApps ? allApps.map((app) => app.appId) : [];
+    const rows = yield rows_1.getUniqueRows(appIds);
     const rowCount = rows ? rows.length : 0;
     // sync row count
-    const tenantId = getTenantId();
+    const tenantId = tenancy_1.getTenantId();
     console.log(`[Tenant: ${tenantId}] Syncing row count: ${rowCount}`);
-    const usageDoc = yield getUsageQuotaDoc(db);
+    const usageDoc = yield usageQuota_1.getUsageQuotaDoc(db);
     usageDoc.usageQuota.rows = rowCount;
     yield db.put(usageDoc);
 });
+exports.run = run;

package/dist/migrations/functions/userEmailViewCasing.js

@@ -0,0 +1,24 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.run = void 0;
+const { createUserEmailView } = require("@budibase/backend-core/db");
+/**
+ * Date:
+ * October 2021
+ *
+ * Description:
+ * Recreate the user email view to include latest changes i.e. lower casing the email address
+ */
+const run = (db) => __awaiter(void 0, void 0, void 0, function* () {
+    yield createUserEmailView(db);
+});
+exports.run = run;

package/dist/migrations/index.js

@@ -0,0 +1,62 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.migrate = exports.MIGRATIONS = void 0;
+const db_1 = __importDefault(require("../db"));
+const { MIGRATION_TYPES, runMigrations, } = require("@budibase/backend-core/migrations");
+// migration functions
+const userEmailViewCasing = __importStar(require("./functions/userEmailViewCasing"));
+const quota1 = __importStar(require("./functions/quotas1"));
+const appUrls = __importStar(require("./functions/appUrls"));
+exports.MIGRATIONS = [
+    {
+        type: MIGRATION_TYPES.GLOBAL,
+        name: "user_email_view_casing",
+        fn: userEmailViewCasing.run,
+    },
+    {
+        type: MIGRATION_TYPES.GLOBAL,
+        name: "quotas_1",
+        fn: quota1.run,
+    },
+    {
+        type: MIGRATION_TYPES.APP,
+        name: "app_urls",
+        opts: { all: true },
+        fn: appUrls.run,
+    },
+];
+const migrate = (options) => __awaiter(void 0, void 0, void 0, function* () {
+    yield runMigrations(db_1.default, exports.MIGRATIONS, options);
+});
+exports.migrate = migrate;

package/dist/package.json

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

package/dist/tests/utilities/TestConfiguration.js

@@ -8,6 +8,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+const core = require("@budibase/backend-core");
+const CouchDB = require("../../db");
+core.init(CouchDB);
 const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles");
 const env = require("../../environment");
 const { basicTable, basicRow, basicRole, basicAutomation, basicDatasource, basicQuery, basicScreen, basicLayout, basicWebhook, TENANT_ID, } = require("./structures");
@@ -16,13 +19,11 @@ const supertest = require("supertest");
 const { cleanup } = require("../../utilities/fileSystem");
 const { Cookies, Headers } = require("@budibase/backend-core/constants");
 const { jwt } = require("@budibase/backend-core/auth");
-const core = require("@budibase/backend-core");
 const { getGlobalDB } = require("@budibase/backend-core/tenancy");
 const { createASession } = require("@budibase/backend-core/sessions");
 const { user: userCache } = require("@budibase/backend-core/cache");
-const CouchDB = require("../../db");
 const newid = require("../../db/newid");
-core.init(CouchDB);
+const context = require("@budibase/backend-core/context");
 const GLOBAL_USER_ID = "us_uuid1";
 const EMAIL = "babs@babs.com";
 const CSRF_TOKEN = "e3727778-7af0-4226-b5eb-f43cbe60a306";
@@ -44,6 +45,9 @@ class TestConfiguration {
     getAppId() {
         return this.appId;
     }
+    getCouch() {
+        return CouchDB;
+    }
     _req(config, params, controlFunc) {
         return __awaiter(this, void 0, void 0, function* () {
             const request = {};
@@ -56,11 +60,24 @@ class TestConfiguration {
             request.request = {
                 body: config,
             };
-            if (params) {
-                request.params = params;
+            function run() {
+                return __awaiter(this, void 0, void 0, function* () {
+                    if (params) {
+                        request.params = params;
+                    }
+                    yield controlFunc(request);
+                    return request.body;
+                });
+            }
+            // check if already in a context
+            if (context.getAppId() == null) {
+                return context.doInAppContext(this.appId, () => __awaiter(this, void 0, void 0, function* () {
+                    return run();
+                }));
+            }
+            else {
+                return run();
             }
-            yield controlFunc(request);
-            return request.body;
         });
     }
     globalUser({ id = GLOBAL_USER_ID, builder = true, email = EMAIL, roles, } = {}) {
@@ -150,6 +167,7 @@ class TestConfiguration {
             // create dev app
             this.app = yield this._req({ name: appName }, null, controllers.app.create);
             this.appId = this.app.appId;
+            context.updateAppId(this.appId);
             // create production app
             this.prodApp = yield this.deploy();
             this.prodAppId = this.prodApp.appId;
@@ -160,10 +178,12 @@ class TestConfiguration {
     }
     deploy() {
         return __awaiter(this, void 0, void 0, function* () {
-            const deployment = yield this._req(null, null, controllers.deploy.deployApp);
-            const prodAppId = deployment.appId.replace("_dev", "");
-            const appPackage = yield this._req(null, { appId: prodAppId }, controllers.app.fetchAppPackage);
-            return appPackage.application;
+            yield this._req(null, null, controllers.deploy.deployApp);
+            const prodAppId = this.getAppId().replace("_dev", "");
+            return context.doInAppContext(prodAppId, () => __awaiter(this, void 0, void 0, function* () {
+                const appPackage = yield this._req(null, { appId: prodAppId }, controllers.app.fetchAppPackage);
+                return appPackage.application;
+            }));
         });
     }
     updateTable(config = null) {
@@ -390,40 +410,46 @@ class TestConfiguration {
     login({ roleId, userId, builder, prodApp = false } = {}) {
         return __awaiter(this, void 0, void 0, function* () {
             const appId = prodApp ? this.prodAppId : this.appId;
-            userId = !userId ? `us_uuid1` : userId;
-            if (!this.request) {
-                throw "Server has not been opened, cannot login.";
-            }
-            // make sure the user exists in the global DB
-            if (roleId !== BUILTIN_ROLE_IDS.PUBLIC) {
-                yield this.globalUser({
-                    userId,
-                    builder,
-                    roles: { [this.prodAppId]: roleId },
+            return context.doInAppContext(appId, () => __awaiter(this, void 0, void 0, function* () {
+                userId = !userId ? `us_uuid1` : userId;
+                if (!this.request) {
+                    throw "Server has not been opened, cannot login.";
+                }
+                // make sure the user exists in the global DB
+                if (roleId !== BUILTIN_ROLE_IDS.PUBLIC) {
+                    yield this.globalUser({
+                        id: userId,
+                        builder,
+                        roles: { [this.prodAppId]: roleId },
+                    });
+                }
+                yield createASession(userId, {
+                    sessionId: "sessionid",
+                    tenantId: TENANT_ID,
                 });
-            }
-            // have to fake this
-            const auth = {
-                userId,
-                sessionId: "sessionid",
-                tenantId: TENANT_ID,
-            };
-            const app = {
-                roleId: roleId,
-                appId,
-            };
-            const authToken = jwt.sign(auth, env.JWT_SECRET);
-            const appToken = jwt.sign(app, env.JWT_SECRET);
-            // returning necessary request headers
-            yield userCache.invalidateUser(userId);
-            return {
-                Accept: "application/json",
-                Cookie: [
-                    `${Cookies.Auth}=${authToken}`,
-                    `${Cookies.CurrentApp}=${appToken}`,
-                ],
-                [Headers.APP_ID]: appId,
-            };
+                // have to fake this
+                const auth = {
+                    userId,
+                    sessionId: "sessionid",
+                    tenantId: TENANT_ID,
+                };
+                const app = {
+                    roleId: roleId,
+                    appId,
+                };
+                const authToken = jwt.sign(auth, env.JWT_SECRET);
+                const appToken = jwt.sign(app, env.JWT_SECRET);
+                // returning necessary request headers
+                yield userCache.invalidateUser(userId);
+                return {
+                    Accept: "application/json",
+                    Cookie: [
+                        `${Cookies.Auth}=${authToken}`,
+                        `${Cookies.CurrentApp}=${appToken}`,
+                    ],
+                    [Headers.APP_ID]: appId,
+                };
+            }));
         });
     }
 }

package/dist/threads/automation.js

@@ -15,11 +15,11 @@ const automationUtils = require("../automations/automationUtils");
 const AutomationEmitter = require("../events/AutomationEmitter");
 const { processObject } = require("@budibase/string-templates");
 const { DEFAULT_TENANT_ID } = require("@budibase/backend-core/constants");
-const CouchDB = require("../db");
 const { DocumentTypes, isDevAppID } = require("../db/utils");
 const { doInTenant } = require("@budibase/backend-core/tenancy");
 const usage = require("../utilities/usageQuota");
 const { definitions: triggerDefs } = require("../automations/triggerInfo");
+const { doInAppContext, getAppDB } = require("@budibase/backend-core/context");
 const FILTER_STEP_ID = actions.ACTION_DEFINITIONS.FILTER.stepId;
 const CRON_STEP_ID = triggerDefs.CRON.stepId;
 const STOPPED_STATUS = { success: false, status: "STOPPED" };
@@ -67,11 +67,10 @@ class Orchestrator {
     }
     getApp() {
         return __awaiter(this, void 0, void 0, function* () {
-            const appId = this._appId;
             if (this._app) {
                 return this._app;
             }
-            const db = new CouchDB(appId);
+            const db = getAppDB();
             this._app = yield db.get(DocumentTypes.APP_METADATA);
             return this._app;
         });
@@ -133,13 +132,16 @@ class Orchestrator {
     }
 }
 module.exports = (input, callback) => {
-    const automationOrchestrator = new Orchestrator(input.data.automation, input.data.event);
-    automationOrchestrator
-        .execute()
-        .then(response => {
-        callback(null, response);
-    })
-        .catch(err => {
-        callback(err);
+    const appId = input.data.event.appId;
+    doInAppContext(appId, () => {
+        const automationOrchestrator = new Orchestrator(input.data.automation, input.data.event);
+        automationOrchestrator
+            .execute()
+            .then(response => {
+            callback(null, response);
+        })
+            .catch(err => {
+            callback(err);
+        });
     });
 };

package/dist/threads/query.js

@@ -13,12 +13,9 @@ threadUtils.threadSetup();
 const ScriptRunner = require("../utilities/scriptRunner");
 const { integrations } = require("../integrations");
 const { processStringSync } = require("@budibase/string-templates");
-const CouchDB = require("../db");
-const IS_TRIPLE_BRACE = new RegExp(/^{{3}.*}{3}$/);
-const IS_HANDLEBARS = new RegExp(/^{{2}.*}{2}$/);
+const { doInAppContext, getAppDB } = require("@budibase/backend-core/context");
 class QueryRunner {
     constructor(input, flags = { noRecursiveQuery: false }) {
-        this.appId = input.appId;
         this.datasource = input.datasource;
         this.queryVerb = input.queryVerb;
         this.fields = input.fields;
@@ -97,11 +94,10 @@ class QueryRunner {
     }
     runAnotherQuery(queryId, parameters) {
         return __awaiter(this, void 0, void 0, function* () {
-            const db = new CouchDB(this.appId);
+            const db = getAppDB();
             const query = yield db.get(queryId);
             const datasource = yield db.get(query.datasourceId);
             return new QueryRunner({
-                appId: this.appId,
                 datasource,
                 queryVerb: query.queryVerb,
                 fields: query.fields,
@@ -182,12 +178,8 @@ class QueryRunner {
             }
             else if (typeof fields[key] === "string") {
                 // enrich string value as normal
-                let value = fields[key];
-                // add triple brace to avoid escaping e.g. '=' in cookie header
-                if (IS_HANDLEBARS.test(value) && !IS_TRIPLE_BRACE.test(value)) {
-                    value = `{${value}}`;
-                }
-                enrichedQuery[key] = processStringSync(value, parameters, {
+                enrichedQuery[key] = processStringSync(fields[key], parameters, {
+                    noEscaping: true,
                     noHelpers: true,
                 });
             }
@@ -212,12 +204,14 @@ class QueryRunner {
     }
 }
 module.exports = (input, callback) => {
-    const Runner = new QueryRunner(input);
-    Runner.execute()
-        .then(response => {
-        callback(null, response);
-    })
-        .catch(err => {
-        callback(err);
+    doInAppContext(input.appId, () => {
+        const Runner = new QueryRunner(input);
+        Runner.execute()
+            .then(response => {
+            callback(null, response);
+        })
+            .catch(err => {
+            callback(err);
+        });
     });
 };