@budibase/server 1.0.49-alpha.6 → 1.0.49

package/dist/api/controllers/webhook.js

@@ -8,12 +8,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+const CouchDB = require("../../db");
 const { generateWebhookID, getWebhookParams } = require("../../db/utils");
 const toJsonSchema = require("to-json-schema");
 const validate = require("jsonschema").validate;
 const triggers = require("../../automations/triggers");
-const { getProdAppID } = require("@budibase/backend-core/db");
-const { getAppDB, updateAppId } = require("@budibase/backend-core/context");
+const { getDeployedAppID } = require("@budibase/backend-core/db");
 const AUTOMATION_DESCRIPTION = "Generated from Webhook Schema";
 function Webhook(name, type, target) {
     this.live = true;
@@ -28,14 +28,14 @@ exports.WebhookType = {
     AUTOMATION: "automation",
 };
 exports.fetch = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = getAppDB();
+    const db = new CouchDB(ctx.appId);
     const response = yield db.allDocs(getWebhookParams(null, {
         include_docs: true,
     }));
     ctx.body = response.rows.map(row => row.doc);
 });
 exports.save = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = getAppDB();
+    const db = new CouchDB(ctx.appId);
     const webhook = ctx.request.body;
     webhook.appId = ctx.appId;
     // check that the webhook exists
@@ -53,12 +53,11 @@ exports.save = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     };
 });
 exports.destroy = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = getAppDB();
+    const db = new CouchDB(ctx.appId);
     ctx.body = yield db.remove(ctx.params.id, ctx.params.rev);
 });
 exports.buildSchema = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    updateAppId(ctx.params.instance);
-    const db = getAppDB();
+    const db = new CouchDB(ctx.params.instance);
     const webhook = yield db.get(ctx.params.id);
     webhook.bodySchema = toJsonSchema(ctx.request.body);
     // update the automation outputs
@@ -81,10 +80,9 @@ exports.buildSchema = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     ctx.body = yield db.put(webhook);
 });
 exports.trigger = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const prodAppId = getProdAppID(ctx.params.instance);
-    updateAppId(prodAppId);
+    const prodAppId = getDeployedAppID(ctx.params.instance);
     try {
-        const db = getAppDB();
+        const db = new CouchDB(prodAppId);
         const webhook = yield db.get(ctx.params.id);
         // validate against the schema
         if (webhook.bodySchema) {

package/dist/api/routes/hosting.js

@@ -0,0 +1,11 @@
+"use strict";
+const Router = require("@koa/router");
+const controller = require("../controllers/hosting");
+const authorized = require("../../middleware/authorized");
+const { BUILDER } = require("@budibase/backend-core/permissions");
+const router = Router();
+router
+    .get("/api/hosting/urls", authorized(BUILDER), controller.fetchUrls)
+    // this isn't risky, doesn't return anything about apps other than names and URLs
+    .get("/api/hosting/apps", controller.getDeployedApps);
+module.exports = router;

package/dist/api/routes/index.js

@@ -21,11 +21,11 @@ const integrationRoutes = require("./integration");
 const permissionRoutes = require("./permission");
 const datasourceRoutes = require("./datasource");
 const queryRoutes = require("./query");
+const hostingRoutes = require("./hosting");
 const backupRoutes = require("./backup");
 const metadataRoutes = require("./metadata");
 const devRoutes = require("./dev");
 const cloudRoutes = require("./cloud");
-const migrationRoutes = require("./migrations");
 exports.mainRoutes = [
     authRoutes,
     deployRoutes,
@@ -46,6 +46,7 @@ exports.mainRoutes = [
     permissionRoutes,
     datasourceRoutes,
     queryRoutes,
+    hostingRoutes,
     backupRoutes,
     metadataRoutes,
     devRoutes,
@@ -54,6 +55,5 @@ exports.mainRoutes = [
     // this could be breaking as koa may recognise other routes as this
     tableRoutes,
     rowRoutes,
-    migrationRoutes,
 ];
 exports.staticRoutes = staticRoutes;

package/dist/api/routes/static.js

@@ -43,6 +43,5 @@ router
     .post("/api/attachments/process", authorized(BUILDER), controller.uploadFile)
     .post("/api/attachments/:tableId/upload", paramResource("tableId"), authorized(PermissionTypes.TABLE, PermissionLevels.WRITE), controller.uploadFile)
     // TODO: this likely needs to be secured in some way
-    .get("/:appId/:path*", controller.serveApp)
-    .post("/api/attachments/:datasourceId/url", authorized(PermissionTypes.TABLE, PermissionLevels.READ), controller.getSignedUploadURL);
+    .get("/:appId/:path*", controller.serveApp);
 module.exports = router;

package/dist/api/routes/tests/utilities/TestFunctions.js

@@ -10,24 +10,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 const rowController = require("../../../controllers/row");
 const appController = require("../../../controllers/application");
+const CouchDB = require("../../../../db");
 const { AppStatus } = require("../../../../db/utils");
 const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles");
 const { TENANT_ID } = require("../../../../tests/utilities/structures");
-const { getAppDB, doInAppContext } = require("@budibase/backend-core/context");
-const env = require("../../../../environment");
 function Request(appId, params) {
     this.appId = appId;
     this.params = params;
     this.request = {};
 }
-function runRequest(appId, controlFunc, request) {
-    return doInAppContext(appId, () => __awaiter(this, void 0, void 0, function* () {
-        return controlFunc(request);
-    }));
-}
 exports.getAllTableRows = (config) => __awaiter(void 0, void 0, void 0, function* () {
     const req = new Request(config.appId, { tableId: config.table._id });
-    yield runRequest(config.appId, rowController.fetch, req);
+    yield rowController.fetch(req);
     return req.body;
 });
 exports.clearAllApps = (tenantId = TENANT_ID) => __awaiter(void 0, void 0, void 0, function* () {
@@ -39,16 +33,13 @@ exports.clearAllApps = (tenantId = TENANT_ID) => __awaiter(void 0, void 0, void
     }
     for (let app of apps) {
         const { appId } = app;
-        const req = new Request(null, { appId });
-        yield runRequest(appId, appController.delete, req);
+        yield appController.delete(new Request(null, { appId }));
     }
 });
 exports.clearAllAutomations = (config) => __awaiter(void 0, void 0, void 0, function* () {
     const automations = yield config.getAllAutomations();
     for (let auto of automations) {
-        yield doInAppContext(config.appId, () => __awaiter(void 0, void 0, void 0, function* () {
-            yield config.deleteAutomation(auto);
-        }));
+        yield config.deleteAutomation(auto);
     }
 });
 exports.createRequest = (request, method, url, body) => {
@@ -101,30 +92,19 @@ exports.checkPermissionsEndpoint = ({ config, method, url, body, passRole, failR
         .set(failHeader)
         .expect(403);
 });
-exports.getDB = () => {
-    return getAppDB();
+exports.getDB = config => {
+    return new CouchDB(config.getAppId());
 };
 exports.testAutomation = (config, automation) => __awaiter(void 0, void 0, void 0, function* () {
-    return runRequest(automation.appId, () => __awaiter(void 0, void 0, void 0, function* () {
-        return yield config.request
-            .post(`/api/automations/${automation._id}/test`)
-            .send({
-            row: {
-                name: "Test",
-                description: "TEST",
-            },
-        })
-            .set(config.defaultHeaders())
-            .expect("Content-Type", /json/)
-            .expect(200);
-    }));
-});
-exports.runInProd = (func) => __awaiter(void 0, void 0, void 0, function* () {
-    const nodeEnv = env.NODE_ENV;
-    const workerId = env.JEST_WORKER_ID;
-    env._set("NODE_ENV", "PRODUCTION");
-    env._set("JEST_WORKER_ID", null);
-    yield func();
-    env._set("NODE_ENV", nodeEnv);
-    env._set("JEST_WORKER_ID", workerId);
+    return yield config.request
+        .post(`/api/automations/${automation._id}/test`)
+        .send({
+        row: {
+            name: "Test",
+            description: "TEST",
+        },
+    })
+        .set(config.defaultHeaders())
+        .expect("Content-Type", /json/)
+        .expect(200);
 });

package/dist/app.js

@@ -1,23 +1,4 @@
 "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) {
@@ -28,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const env = __importStar(require("./environment"));
+const env = require("./environment");
 const CouchDB = require("./db");
 require("@budibase/backend-core").init(CouchDB);
 const Koa = require("koa");
@@ -43,7 +24,6 @@ const Sentry = require("@sentry/node");
 const fileSystem = require("./utilities/fileSystem");
 const bullboard = require("./automations/bullboard");
 const redis = require("./utilities/redis");
-const migrations = __importStar(require("./migrations"));
 const app = new Koa();
 // set up top level koa middleware
 app.use(koaBody({
@@ -96,22 +76,12 @@ module.exports = server.listen(env.PORT || 0, () => __awaiter(void 0, void 0, vo
     yield redis.init();
     yield automations.init();
 }));
-const shutdown = () => {
-    server.close();
-    server.destroy();
-};
 process.on("uncaughtException", err => {
     console.error(err);
-    shutdown();
+    server.close();
+    server.destroy();
 });
 process.on("SIGTERM", () => {
-    shutdown();
+    server.close();
+    server.destroy();
 });
-// run migrations on startup if not done via http
-// not recommended in a clustered environment
-if (!env.HTTP_MIGRATIONS) {
-    migrations.migrate().catch(err => {
-        console.error("Error performing migrations. Exiting.\n", err);
-        shutdown();
-    });
-}

package/dist/automations/automationUtils.js

@@ -61,12 +61,13 @@ exports.cleanInputValues = (inputs, schema) => {
  * the automation but is instead part of the Table/Table. This function will get the table schema and use it to instead
  * perform the cleanInputValues function on the input row.
  *
+ * @param {string} appId The instance which the Table/Table is contained under.
  * @param {string} tableId The ID of the Table/Table which the schema is to be retrieved for.
  * @param {object} row The input row structure which requires clean-up after having been through template statements.
  * @returns {Promise<Object>} The cleaned up rows object, will should now have all the required primitive types.
  */
-exports.cleanUpRow = (tableId, row) => __awaiter(void 0, void 0, void 0, function* () {
-    let table = yield getTable(tableId);
+exports.cleanUpRow = (appId, tableId, row) => __awaiter(void 0, void 0, void 0, function* () {
+    let table = yield getTable(appId, tableId);
     return exports.cleanInputValues(row, { properties: table.schema });
 });
 exports.getError = err => {

package/dist/automations/steps/createRow.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 const rowController = require("../../api/controllers/row");
 const automationUtils = require("../automationUtils");
+const env = require("../../environment");
 const usage = require("../../utilities/usageQuota");
 const { buildCtx } = require("./utils");
 exports.definition = {
@@ -85,10 +86,11 @@ exports.run = function ({ inputs, appId, emitter }) {
             },
         });
         try {
-            inputs.row = yield automationUtils.cleanUpRow(inputs.row.tableId, inputs.row);
-            yield usage.update(usage.Properties.ROW, 1, { dryRun: true });
+            inputs.row = yield automationUtils.cleanUpRow(appId, inputs.row.tableId, inputs.row);
+            if (env.USE_QUOTAS) {
+                yield usage.update(usage.Properties.ROW, 1);
+            }
             yield rowController.save(ctx);
-            yield usage.update(usage.Properties.ROW, 1);
             return {
                 row: inputs.row,
                 response: ctx.body,

package/dist/automations/steps/deleteRow.js

@@ -9,6 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 const rowController = require("../../api/controllers/row");
+const env = require("../../environment");
 const usage = require("../../utilities/usageQuota");
 const { buildCtx } = require("./utils");
 const automationUtils = require("../automationUtils");
@@ -80,7 +81,9 @@ exports.run = function ({ inputs, appId, emitter }) {
             },
         });
         try {
-            yield usage.update(usage.Properties.ROW, -1);
+            if (env.isProd()) {
+                yield usage.update(usage.Properties.ROW, -1);
+            }
             yield rowController.destroy(ctx);
             return {
                 response: ctx.body,

package/dist/automations/steps/updateRow.js

@@ -90,7 +90,7 @@ exports.run = function ({ inputs, appId, emitter }) {
         });
         try {
             if (tableId) {
-                inputs.row = yield automationUtils.cleanUpRow(tableId, inputs.row);
+                inputs.row = yield automationUtils.cleanUpRow(appId, tableId, inputs.row);
             }
             yield rowController.patch(ctx);
             return {

package/dist/automations/triggers.js

@@ -8,6 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+const CouchDB = require("../db");
 const emitter = require("../events/index");
 const { getAutomationParams } = require("../db/utils");
 const { coerce } = require("../utilities/rowProcessor");
@@ -18,7 +19,6 @@ const { queue } = require("./bullboard");
 const { checkTestFlag } = require("../utilities/redis");
 const utils = require("./utils");
 const env = require("../environment");
-const { doInAppContext, getAppDB } = require("@budibase/backend-core/context");
 const TRIGGER_DEFINITIONS = definitions;
 const JOB_OPTS = {
     removeOnComplete: true,
@@ -29,33 +29,31 @@ function queueRelevantRowAutomations(event, eventType) {
         if (event.appId == null) {
             throw `No appId specified for ${eventType} - check event emitters.`;
         }
-        doInAppContext(event.appId, () => __awaiter(this, void 0, void 0, function* () {
-            const db = getAppDB();
-            let automations = yield db.allDocs(getAutomationParams(null, { include_docs: true }));
-            // filter down to the correct event type
-            automations = automations.rows
-                .map(automation => automation.doc)
-                .filter(automation => {
-                const trigger = automation.definition.trigger;
-                return trigger && trigger.event === eventType;
-            });
-            for (let automation of automations) {
-                let automationDef = automation.definition;
-                let automationTrigger = automationDef ? automationDef.trigger : {};
-                // don't queue events which are for dev apps, only way to test automations is
-                // running tests on them, in production the test flag will never
-                // be checked due to lazy evaluation (first always false)
-                if (!env.ALLOW_DEV_AUTOMATIONS &&
-                    isDevAppID(event.appId) &&
-                    !(yield checkTestFlag(automation._id))) {
-                    continue;
-                }
-                if (automationTrigger.inputs &&
-                    automationTrigger.inputs.tableId === event.row.tableId) {
-                    yield queue.add({ automation, event }, JOB_OPTS);
-                }
+        const db = new CouchDB(event.appId);
+        let automations = yield db.allDocs(getAutomationParams(null, { include_docs: true }));
+        // filter down to the correct event type
+        automations = automations.rows
+            .map(automation => automation.doc)
+            .filter(automation => {
+            const trigger = automation.definition.trigger;
+            return trigger && trigger.event === eventType;
+        });
+        for (let automation of automations) {
+            let automationDef = automation.definition;
+            let automationTrigger = automationDef ? automationDef.trigger : {};
+            // don't queue events which are for dev apps, only way to test automations is
+            // running tests on them, in production the test flag will never
+            // be checked due to lazy evaluation (first always false)
+            if (!env.ALLOW_DEV_AUTOMATIONS &&
+                isDevAppID(event.appId) &&
+                !(yield checkTestFlag(automation._id))) {
+                continue;
             }
-        }));
+            if (automationTrigger.inputs &&
+                automationTrigger.inputs.tableId === event.row.tableId) {
+                yield queue.add({ automation, event }, JOB_OPTS);
+            }
+        }
     });
 }
 emitter.on("row:save", function (event) {

package/dist/automations/utils.js

@@ -16,9 +16,8 @@ const { queue } = require("./bullboard");
 const newid = require("../db/newid");
 const { updateEntityMetadata } = require("../utilities");
 const { MetadataTypes } = require("../constants");
-const { getProdAppID } = require("@budibase/backend-core/db");
+const { getDeployedAppID } = require("@budibase/backend-core/db");
 const { cloneDeep } = require("lodash/fp");
-const { getAppDB, getAppId } = require("@budibase/backend-core/context");
 const WH_STEP_ID = definitions.WEBHOOK.stepId;
 const CRON_STEP_ID = definitions.CRON.stepId;
 const Runner = new Thread(ThreadType.AUTOMATION);
@@ -33,7 +32,7 @@ exports.processEvent = (job) => __awaiter(void 0, void 0, void 0, function* () {
     }
 });
 exports.updateTestHistory = (appId, automation, history) => __awaiter(void 0, void 0, void 0, function* () {
-    return updateEntityMetadata(MetadataTypes.AUTOMATION_TEST_HISTORY, automation._id, metadata => {
+    return updateEntityMetadata(appId, MetadataTypes.AUTOMATION_TEST_HISTORY, automation._id, metadata => {
         if (metadata && Array.isArray(metadata.history)) {
             metadata.history.push(history);
         }
@@ -88,9 +87,6 @@ exports.enableCronTrigger = (appId, automation) => __awaiter(void 0, void 0, voi
         }, { repeat: { cron: trigger.inputs.cron }, jobId });
         // Assign cron job ID from bull so we can remove it later if the cron trigger is removed
         trigger.cronJobId = job.id;
-        // can't use getAppDB here as this is likely to be called from dev app,
-        // but this call could be for dev app or prod app, need to just use what
-        // was passed in
         const db = new CouchDB(appId);
         const response = yield db.put(automation);
         automation._id = response.id;
@@ -106,8 +102,7 @@ exports.enableCronTrigger = (appId, automation) => __awaiter(void 0, void 0, voi
  * @returns {Promise<object|undefined>} After this is complete the new automation object may have been updated and should be
  * written to DB (this does not write to DB as it would be wasteful to repeat).
  */
-exports.checkForWebhooks = ({ oldAuto, newAuto }) => __awaiter(void 0, void 0, void 0, function* () {
-    const appId = getAppId();
+exports.checkForWebhooks = ({ appId, oldAuto, newAuto }) => __awaiter(void 0, void 0, void 0, function* () {
     const oldTrigger = oldAuto ? oldAuto.definition.trigger : null;
     const newTrigger = newAuto ? newAuto.definition.trigger : null;
     const triggerChanged = oldTrigger && newTrigger && oldTrigger.id !== newTrigger.id;
@@ -121,7 +116,7 @@ exports.checkForWebhooks = ({ oldAuto, newAuto }) => __awaiter(void 0, void 0, v
         (!isWebhookTrigger(newAuto) || triggerChanged) &&
         oldTrigger.webhookId) {
         try {
-            let db = getAppDB();
+            let db = new CouchDB(appId);
             // need to get the webhook to get the rev
             const webhook = yield db.get(oldTrigger.webhookId);
             const ctx = {
@@ -154,7 +149,7 @@ exports.checkForWebhooks = ({ oldAuto, newAuto }) => __awaiter(void 0, void 0, v
         // the app ID has to be development for this endpoint
         // it can only be used when building the app
         // but the trigger endpoint will always be used in production
-        const prodAppId = getProdAppID(appId);
+        const prodAppId = getDeployedAppID(appId);
         newTrigger.inputs = {
             schemaUrl: `api/webhooks/schema/${appId}/${id}`,
             triggerUrl: `api/webhooks/trigger/${prodAppId}/${id}`,

package/dist/constants/index.js

@@ -52,10 +52,6 @@ exports.RelationshipTypes = {
     MANY_TO_ONE: "many-to-one",
     MANY_TO_MANY: "many-to-many",
 };
-exports.FormulaTypes = {
-    STATIC: "static",
-    DYNAMIC: "dynamic",
-};
 exports.AuthTypes = {
     APP: "app",
     BUILDER: "builder",
@@ -71,9 +67,6 @@ exports.DataSourceOperation = {
     UPDATE_TABLE: "UPDATE_TABLE",
     DELETE_TABLE: "DELETE_TABLE",
 };
-exports.DatasourceAuthTypes = {
-    GOOGLE: "google",
-};
 exports.SortDirection = {
     ASCENDING: "ASCENDING",
     DESCENDING: "DESCENDING",

package/dist/db/linkedRows/LinkController.js

@@ -8,11 +8,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+const CouchDB = require("../index");
 const { IncludeDocs, getLinkDocuments } = require("./linkUtils");
 const { generateLinkID, InternalTables, getUserMetadataParams, } = require("../utils");
 const Sentry = require("@sentry/node");
 const { FieldTypes, RelationshipTypes } = require("../../constants");
-const { getAppDB } = require("@budibase/backend-core/context");
 /**
  * Creates a new link document structure which can be put to the database. It is important to
  * note that while this talks about linker/linked the link is bi-directional and for all intent
@@ -42,8 +42,9 @@ function LinkDocument(tableId1, fieldName1, rowId1, tableId2, fieldName2, rowId2
     };
 }
 class LinkController {
-    constructor({ tableId, row, table, oldTable }) {
-        this._db = getAppDB();
+    constructor({ appId, tableId, row, table, oldTable }) {
+        this._appId = appId;
+        this._db = new CouchDB(appId);
         this._tableId = tableId;
         this._row = row;
         this._table = table;
@@ -89,6 +90,7 @@ class LinkController {
      */
     getRowLinkDocs(rowId) {
         return getLinkDocuments({
+            appId: this._appId,
             tableId: this._tableId,
             rowId,
             includeDocs: IncludeDocs.INCLUDE,
@@ -99,6 +101,7 @@ class LinkController {
      */
     getTableLinkDocs() {
         return getLinkDocuments({
+            appId: this._appId,
             tableId: this._tableId,
             includeDocs: IncludeDocs.INCLUDE,
         });
@@ -200,6 +203,7 @@ class LinkController {
                     for (let linkId of rowField) {
                         if (linkedSchema.relationshipType === RelationshipTypes.ONE_TO_MANY) {
                             let links = (yield getLinkDocuments({
+                                appId: this._appId,
                                 tableId: field.tableId,
                                 rowId: linkId,
                                 includeDocs: IncludeDocs.EXCLUDE,