@budibase/server 1.0.49-alpha.1 → 1.0.49-alpha.13

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);
+        });
     });
 };