@budibase/server 1.0.49-alpha.3 → 1.0.49-alpha.7

package/dist/middleware/currentapp.js

@@ -16,9 +16,9 @@ const { generateUserMetadataID, isDevAppID } = require("../db/utils");
 const { dbExists } = require("@budibase/backend-core/db");
 const { isUserInAppTenant } = require("@budibase/backend-core/tenancy");
 const { getCachedSelf } = require("../utilities/global");
-const CouchDB = require("../db");
 const env = require("../environment");
 const { isWebhookEndpoint } = require("./utils");
+const { doInAppContext } = require("@budibase/backend-core/context");
 module.exports = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
     // try to get the appID from the request
     let requestAppId = getAppId(ctx);
@@ -36,7 +36,7 @@ module.exports = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
     // check the app exists referenced in cookie
     if (appCookie) {
         const appId = appCookie.appId;
-        const exists = yield dbExists(CouchDB, appId);
+        const exists = yield dbExists(appId);
         if (!exists) {
             clearCookie(ctx, Cookies.CurrentApp);
             return next();
@@ -45,11 +45,13 @@ module.exports = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
         requestAppId = requestAppId || appId;
     }
     // deny access to application preview
-    if (isDevAppID(requestAppId) &&
-        !isWebhookEndpoint(ctx) &&
-        (!ctx.user || !ctx.user.builder || !ctx.user.builder.global)) {
-        clearCookie(ctx, Cookies.CurrentApp);
-        return ctx.redirect("/");
+    if (!env.isTest()) {
+        if (isDevAppID(requestAppId) &&
+            !isWebhookEndpoint(ctx) &&
+            (!ctx.user || !ctx.user.builder || !ctx.user.builder.global)) {
+            clearCookie(ctx, Cookies.CurrentApp);
+            return ctx.redirect("/");
+        }
     }
     let appId, roleId = BUILTIN_ROLE_IDS.PUBLIC;
     if (!ctx.user) {
@@ -67,34 +69,36 @@ module.exports = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
     if (!appId) {
         return next();
     }
-    let noCookieSet = false;
-    // if the user not in the right tenant then make sure they have no permissions
-    // need to judge this only based on the request app ID,
-    if (env.MULTI_TENANCY &&
-        ctx.user &&
-        requestAppId &&
-        !isUserInAppTenant(requestAppId)) {
-        // don't error, simply remove the users rights (they are a public user)
-        delete ctx.user.builder;
-        delete ctx.user.admin;
-        delete ctx.user.roles;
-        roleId = BUILTIN_ROLE_IDS.PUBLIC;
-        noCookieSet = true;
-    }
-    ctx.appId = appId;
-    if (roleId) {
-        ctx.roleId = roleId;
-        const userId = ctx.user ? generateUserMetadataID(ctx.user._id) : null;
-        ctx.user = Object.assign(Object.assign({}, ctx.user), { 
-            // override userID with metadata one
-            _id: userId, userId,
-            roleId, role: yield getRole(appId, roleId) });
-    }
-    if ((requestAppId !== appId ||
-        appCookie == null ||
-        appCookie.appId !== requestAppId) &&
-        !noCookieSet) {
-        setCookie(ctx, { appId }, Cookies.CurrentApp);
-    }
-    return next();
+    return doInAppContext(appId, () => __awaiter(void 0, void 0, void 0, function* () {
+        let noCookieSet = false;
+        // if the user not in the right tenant then make sure they have no permissions
+        // need to judge this only based on the request app ID,
+        if (env.MULTI_TENANCY &&
+            ctx.user &&
+            requestAppId &&
+            !isUserInAppTenant(requestAppId)) {
+            // don't error, simply remove the users rights (they are a public user)
+            delete ctx.user.builder;
+            delete ctx.user.admin;
+            delete ctx.user.roles;
+            roleId = BUILTIN_ROLE_IDS.PUBLIC;
+            noCookieSet = true;
+        }
+        ctx.appId = appId;
+        if (roleId) {
+            ctx.roleId = roleId;
+            const userId = ctx.user ? generateUserMetadataID(ctx.user._id) : null;
+            ctx.user = Object.assign(Object.assign({}, ctx.user), { 
+                // override userID with metadata one
+                _id: userId, userId,
+                roleId, role: yield getRole(roleId) });
+        }
+        if ((requestAppId !== appId ||
+            appCookie == null ||
+            appCookie.appId !== requestAppId) &&
+            !noCookieSet) {
+            setCookie(ctx, { appId }, Cookies.CurrentApp);
+        }
+        return next();
+    }));
 });

package/dist/middleware/usageQuota.js

@@ -8,10 +8,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const CouchDB = require("../db");
 const usageQuota = require("../utilities/usageQuota");
 const { getUniqueRows } = require("../utilities/usageQuota/rows");
 const { isExternalTable, isRowId: isExternalRowId, } = require("../integrations/utils");
+const { getAppDB } = require("@budibase/backend-core/context");
 // currently only counting new writes and deletes
 const METHOD_MAP = {
     POST: 1,
@@ -48,7 +48,7 @@ module.exports = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
         const usageId = ctx.request.body._id;
         try {
             if (ctx.appId) {
-                const db = new CouchDB(ctx.appId);
+                const db = getAppDB();
                 yield db.get(usageId);
             }
             return next();

package/dist/migrations/functions/usageQuotas/syncApps.js

@@ -8,22 +8,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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.run = void 0;
-const { getGlobalDB, getTenantId } = require("@budibase/backend-core/tenancy");
-const { getAllApps } = require("@budibase/backend-core/db");
-const db_1 = __importDefault(require("../../../db"));
+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 = getGlobalDB();
+    const db = tenancy_1.getGlobalDB();
     // get app count
-    const devApps = yield getAllApps(db_1.default, { 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 usageQuota_1.getUsageQuotaDoc(db);
     usageDoc.usageQuota.apps = appCount;

package/dist/migrations/functions/usageQuotas/syncRows.js

@@ -8,25 +8,23 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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.run = void 0;
-const { getGlobalDB, getTenantId } = require("@budibase/backend-core/tenancy");
-const { getAllApps } = require("@budibase/backend-core/db");
-const db_1 = __importDefault(require("../../../db"));
+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 = getGlobalDB();
+    const db = tenancy_1.getGlobalDB();
     // get all rows in all apps
-    const allApps = yield getAllApps(db_1.default, { all: true });
+    // @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 usageQuota_1.getUsageQuotaDoc(db);
     usageDoc.usageQuota.rows = rowCount;

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.0.49-alpha.2",
+    "version": "1.0.49-alpha.6",
     "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.49-alpha.2",
-        "@budibase/client": "^1.0.49-alpha.2",
-        "@budibase/string-templates": "^1.0.49-alpha.2",
+        "@budibase/backend-core": "^1.0.49-alpha.6",
+        "@budibase/client": "^1.0.49-alpha.6",
+        "@budibase/string-templates": "^1.0.49-alpha.6",
         "@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";
@@ -59,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, } = {}) {
@@ -153,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;
@@ -163,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) {
@@ -393,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,11 @@ threadUtils.threadSetup();
 const ScriptRunner = require("../utilities/scriptRunner");
 const { integrations } = require("../integrations");
 const { processStringSync } = require("@budibase/string-templates");
-const CouchDB = require("../db");
+const { doInAppContext, getAppDB } = require("@budibase/backend-core/context");
 const IS_TRIPLE_BRACE = new RegExp(/^{{3}.*}{3}$/);
 const IS_HANDLEBARS = new RegExp(/^{{2}.*}{2}$/);
 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 +96,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,
@@ -212,12 +210,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);
+        });
     });
 };