@budibase/server 1.0.49-alpha.6 → 1.0.49

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(appId);
+        const exists = yield dbExists(CouchDB, appId);
         if (!exists) {
             clearCookie(ctx, Cookies.CurrentApp);
             return next();
@@ -45,13 +45,11 @@ module.exports = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
         requestAppId = requestAppId || appId;
     }
     // deny access to application preview
-    if (!env.isTest()) {
-        if (isDevAppID(requestAppId) &&
-            !isWebhookEndpoint(ctx) &&
-            (!ctx.user || !ctx.user.builder || !ctx.user.builder.global)) {
-            clearCookie(ctx, Cookies.CurrentApp);
-            return ctx.redirect("/");
-        }
+    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) {
@@ -69,36 +67,34 @@ module.exports = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
     if (!appId) {
         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();
-    }));
+    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();
 });

package/dist/middleware/usageQuota.js

@@ -8,10 +8,13 @@ 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 env = require("../environment");
+const { getTenantId } = require("@budibase/backend-core/tenancy");
 const { isExternalTable, isRowId: isExternalRowId, } = require("../integrations/utils");
-const { getAppDB } = require("@budibase/backend-core/context");
+// tenants without limits
+const EXCLUDED_TENANTS = ["bb", "default", "bbtest", "bbstaging"];
 // currently only counting new writes and deletes
 const METHOD_MAP = {
     POST: 1,
@@ -19,13 +22,13 @@ const METHOD_MAP = {
 };
 const DOMAIN_MAP = {
     rows: usageQuota.Properties.ROW,
-    // upload: usageQuota.Properties.UPLOAD,            // doesn't work yet
-    // views: usageQuota.Properties.VIEW,               // doesn't work yet
-    // users: usageQuota.Properties.USER,               // doesn't work yet
+    upload: usageQuota.Properties.UPLOAD,
+    views: usageQuota.Properties.VIEW,
+    users: usageQuota.Properties.USER,
     applications: usageQuota.Properties.APPS,
     // this will not be updated by endpoint calls
     // instead it will be updated by triggerInfo
-    // automationRuns: usageQuota.Properties.AUTOMATION, // doesn't work yet
+    automationRuns: usageQuota.Properties.AUTOMATION,
 };
 function getProperty(url) {
     for (let domain of Object.keys(DOMAIN_MAP)) {
@@ -35,7 +38,9 @@ function getProperty(url) {
     }
 }
 module.exports = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
-    if (!usageQuota.useQuotas()) {
+    const tenantId = getTenantId();
+    // if in development or a self hosted cloud usage quotas should not be executed
+    if (env.isDev() || env.SELF_HOSTED || EXCLUDED_TENANTS.includes(tenantId)) {
         return next();
     }
     let usage = METHOD_MAP[ctx.req.method];
@@ -48,7 +53,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 = getAppDB();
+                const db = new CouchDB(ctx.appId);
                 yield db.get(usageId);
             }
             return next();
@@ -73,82 +78,10 @@ module.exports = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
         usage = files.map(file => file.size).reduce((total, size) => total + size);
     }
     try {
-        yield performRequest(ctx, next, property, usage);
+        yield usageQuota.update(property, usage);
+        return next();
     }
     catch (err) {
         ctx.throw(400, err);
     }
 });
-const performRequest = (ctx, next, property, usage) => __awaiter(void 0, void 0, void 0, function* () {
-    const usageContext = {
-        skipNext: false,
-        skipUsage: false,
-        [usageQuota.Properties.APPS]: {},
-    };
-    if (usage === -1) {
-        if (PRE_DELETE[property]) {
-            yield PRE_DELETE[property](ctx, usageContext);
-        }
-    }
-    else {
-        if (PRE_CREATE[property]) {
-            yield PRE_CREATE[property](ctx, usageContext);
-        }
-    }
-    // run the request
-    if (!usageContext.skipNext) {
-        yield usageQuota.update(property, usage, { dryRun: true });
-        yield next();
-    }
-    if (usage === -1) {
-        if (POST_DELETE[property]) {
-            yield POST_DELETE[property](ctx, usageContext);
-        }
-    }
-    else {
-        if (POST_CREATE[property]) {
-            yield POST_CREATE[property](ctx, usageContext);
-        }
-    }
-    // update the usage
-    if (!usageContext.skipUsage) {
-        yield usageQuota.update(property, usage);
-    }
-});
-const appPreDelete = (ctx, usageContext) => __awaiter(void 0, void 0, void 0, function* () {
-    if (ctx.query.unpublish) {
-        // don't run usage decrement for unpublish
-        usageContext.skipUsage = true;
-        return;
-    }
-    // store the row count to delete
-    const rows = yield getUniqueRows([ctx.appId]);
-    if (rows.length) {
-        usageContext[usageQuota.Properties.APPS] = { rowCount: rows.length };
-    }
-});
-const appPostDelete = (ctx, usageContext) => __awaiter(void 0, void 0, void 0, function* () {
-    // delete the app rows from usage
-    const rowCount = usageContext[usageQuota.Properties.APPS].rowCount;
-    if (rowCount) {
-        yield usageQuota.update(usageQuota.Properties.ROW, -rowCount);
-    }
-});
-const appPostCreate = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    // app import & template creation
-    if (ctx.request.body.useTemplate === "true") {
-        const rows = yield getUniqueRows([ctx.response.body.appId]);
-        const rowCount = rows ? rows.length : 0;
-        yield usageQuota.update(usageQuota.Properties.ROW, rowCount);
-    }
-});
-const PRE_DELETE = {
-    [usageQuota.Properties.APPS]: appPreDelete,
-};
-const POST_DELETE = {
-    [usageQuota.Properties.APPS]: appPostDelete,
-};
-const PRE_CREATE = {};
-const POST_CREATE = {
-    [usageQuota.Properties.APPS]: appPostCreate,
-};

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.0.49-alpha.5",
+    "version": "1.0.48",
     "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.5",
-        "@budibase/client": "^1.0.49-alpha.5",
-        "@budibase/string-templates": "^1.0.49-alpha.5",
+        "@budibase/backend-core": "^1.0.48",
+        "@budibase/client": "^1.0.48",
+        "@budibase/string-templates": "^1.0.48",
         "@bull-board/api": "^3.7.0",
         "@bull-board/koa": "^3.7.0",
         "@elastic/elasticsearch": "7.10.0",
@@ -92,8 +92,6 @@
         "fix-path": "3.0.0",
         "form-data": "^4.0.0",
         "fs-extra": "8.1.0",
-        "google-auth-library": "^7.11.0",
-        "google-spreadsheet": "^3.2.0",
         "jimp": "0.16.1",
         "joi": "17.2.1",
         "js-yaml": "^4.1.0",
@@ -112,7 +110,7 @@
         "mongodb": "3.6.3",
         "mssql": "6.2.3",
         "mysql2": "^2.3.1",
-        "node-fetch": "2.6.7",
+        "node-fetch": "2.6.0",
         "open": "^8.4.0",
         "pg": "8.5.1",
         "pino-pretty": "4.0.0",
@@ -141,7 +139,6 @@
         "@jest/test-sequencer": "^24.8.0",
         "@types/apidoc": "^0.50.0",
         "@types/bull": "^3.15.1",
-        "@types/google-spreadsheet": "^3.1.5",
         "@types/jest": "^26.0.23",
         "@types/koa": "^2.13.3",
         "@types/koa-router": "^7.4.2",

package/dist/tests/utilities/TestConfiguration.js

@@ -8,9 +8,6 @@ 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");
@@ -19,14 +16,14 @@ 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 newid = require("../../db/newid");
-const context = require("@budibase/backend-core/context");
+const CouchDB = require("../../db");
+core.init(CouchDB);
 const GLOBAL_USER_ID = "us_uuid1";
 const EMAIL = "babs@babs.com";
-const CSRF_TOKEN = "e3727778-7af0-4226-b5eb-f43cbe60a306";
 class TestConfiguration {
     constructor(openServer = true) {
         if (openServer) {
@@ -45,9 +42,6 @@ class TestConfiguration {
     getAppId() {
         return this.appId;
     }
-    getCouch() {
-        return CouchDB;
-    }
     _req(config, params, controlFunc) {
         return __awaiter(this, void 0, void 0, function* () {
             const request = {};
@@ -60,24 +54,11 @@ class TestConfiguration {
             request.request = {
                 body: config,
             };
-            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();
+            if (params) {
+                request.params = params;
             }
+            yield controlFunc(request);
+            return request.body;
         });
     }
     globalUser({ id = GLOBAL_USER_ID, builder = true, email = EMAIL, roles, } = {}) {
@@ -91,11 +72,7 @@ class TestConfiguration {
                 existing = { email };
             }
             const user = Object.assign(Object.assign({ _id: id }, existing), { roles: roles || {}, tenantId: TENANT_ID });
-            yield createASession(id, {
-                sessionId: "sessionid",
-                tenantId: TENANT_ID,
-                csrfToken: CSRF_TOKEN,
-            });
+            yield createASession(id, { sessionId: "sessionid", tenantId: TENANT_ID });
             if (builder) {
                 user.builder = { global: true };
             }
@@ -106,8 +83,7 @@ class TestConfiguration {
             return Object.assign({ _rev: resp._rev }, user);
         });
     }
-    // use a new id as the name to avoid name collisions
-    init(appName = newid()) {
+    init(appName = "test_application") {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.globalUser();
             return this.createApp(appName);
@@ -140,7 +116,6 @@ class TestConfiguration {
                 `${Cookies.Auth}=${authToken}`,
                 `${Cookies.CurrentApp}=${appToken}`,
             ],
-            [Headers.CSRF_TOKEN]: CSRF_TOKEN,
         };
         if (this.appId) {
             headers[Headers.APP_ID] = this.appId;
@@ -167,7 +142,6 @@ 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;
@@ -178,12 +152,10 @@ class TestConfiguration {
     }
     deploy() {
         return __awaiter(this, void 0, void 0, function* () {
-            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;
-            }));
+            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;
         });
     }
     updateTable(config = null) {
@@ -410,46 +382,44 @@ class TestConfiguration {
     login({ roleId, userId, builder, prodApp = false } = {}) {
         return __awaiter(this, void 0, void 0, function* () {
             const appId = prodApp ? this.prodAppId : this.appId;
-            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 = !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,
-                    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,
-                };
-            }));
+                    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,
+            };
         });
     }
 }

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,10 +67,11 @@ class Orchestrator {
     }
     getApp() {
         return __awaiter(this, void 0, void 0, function* () {
+            const appId = this._appId;
             if (this._app) {
                 return this._app;
             }
-            const db = getAppDB();
+            const db = new CouchDB(appId);
             this._app = yield db.get(DocumentTypes.APP_METADATA);
             return this._app;
         });
@@ -132,16 +133,13 @@ class Orchestrator {
     }
 }
 module.exports = (input, callback) => {
-    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);
-        });
+    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,11 +13,10 @@ threadUtils.threadSetup();
 const ScriptRunner = require("../utilities/scriptRunner");
 const { integrations } = require("../integrations");
 const { processStringSync } = require("@budibase/string-templates");
-const { doInAppContext, getAppDB } = require("@budibase/backend-core/context");
-const IS_TRIPLE_BRACE = new RegExp(/^{{3}.*}{3}$/);
-const IS_HANDLEBARS = new RegExp(/^{{2}.*}{2}$/);
+const CouchDB = require("../db");
 class QueryRunner {
     constructor(input, flags = { noRecursiveQuery: false }) {
+        this.appId = input.appId;
         this.datasource = input.datasource;
         this.queryVerb = input.queryVerb;
         this.fields = input.fields;
@@ -74,10 +73,6 @@ class QueryRunner {
                 yield threadUtils.invalidateDynamicVariables(this.cachedVariables);
                 return this.execute();
             }
-            // check for undefined response
-            if (!rows) {
-                rows = [];
-            }
             // needs to an array for next step
             if (!Array.isArray(rows)) {
                 rows = [rows];
@@ -96,10 +91,11 @@ class QueryRunner {
     }
     runAnotherQuery(queryId, parameters) {
         return __awaiter(this, void 0, void 0, function* () {
-            const db = getAppDB();
+            const db = new CouchDB(this.appId);
             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,
@@ -180,12 +176,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,
                 });
             }
@@ -210,14 +202,12 @@ class QueryRunner {
     }
 }
 module.exports = (input, callback) => {
-    doInAppContext(input.appId, () => {
-        const Runner = new QueryRunner(input);
-        Runner.execute()
-            .then(response => {
-            callback(null, response);
-        })
-            .catch(err => {
-            callback(err);
-        });
+    const Runner = new QueryRunner(input);
+    Runner.execute()
+        .then(response => {
+        callback(null, response);
+    })
+        .catch(err => {
+        callback(err);
     });
 };