@budibase/server 1.0.49-alpha.6 → 1.0.49

package/dist/api/controllers/deploy/index.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 Deployment = require("./Deployment");
-const { Replication, getProdAppID, getDevelopmentAppID, } = require("@budibase/backend-core/db");
+const { Replication, getDeployedAppID } = require("@budibase/backend-core/db");
 const { DocumentTypes, getAutomationParams } = require("../../../db/utils");
 const { disableAllCrons, enableCronTrigger, } = require("../../../automations/utils");
 const { app: appCache } = require("@budibase/backend-core/cache");
-const { getAppId, getAppDB, getProdAppDB, } = require("@budibase/backend-core/context");
 // the max time we can wait for an invalidation to complete before considering it failed
 const MAX_PENDING_TIME_MS = 30 * 60000;
 const DeploymentStatus = {
@@ -39,8 +39,9 @@ function checkAllDeployments(deployments) {
 }
 function storeDeploymentHistory(deployment) {
     return __awaiter(this, void 0, void 0, function* () {
+        const appId = deployment.getAppId();
         const deploymentJSON = deployment.getJSON();
-        const db = getAppDB();
+        const db = new CouchDB(appId);
         let deploymentDoc;
         try {
             // theres only one deployment doc per app database
@@ -61,7 +62,7 @@ function storeDeploymentHistory(deployment) {
 }
 function initDeployedApp(prodAppId) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = getProdAppDB();
+        const db = new CouchDB(prodAppId);
         console.log("Reading automation docs");
         const automations = (yield db.allDocs(getAutomationParams(null, {
             include_docs: true,
@@ -82,17 +83,15 @@ function initDeployedApp(prodAppId) {
 function deployApp(deployment) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
-            const appId = getAppId();
-            const devAppId = getDevelopmentAppID(appId);
-            const productionAppId = getProdAppID(appId);
+            const productionAppId = getDeployedAppID(deployment.appId);
             const replication = new Replication({
-                source: devAppId,
+                source: deployment.appId,
                 target: productionAppId,
             });
             console.log("Replication object created");
             yield replication.replicate();
             console.log("replication complete.. replacing app meta doc");
-            const db = getProdAppDB();
+            const db = new CouchDB(productionAppId);
             const appDoc = yield db.get(DocumentTypes.APP_METADATA);
             appDoc.appId = productionAppId;
             appDoc.instance._id = productionAppId;
@@ -114,7 +113,8 @@ function deployApp(deployment) {
 exports.fetchDeployments = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
-            const db = getAppDB();
+            const appId = ctx.appId;
+            const db = new CouchDB(appId);
             const deploymentDoc = yield db.get(DocumentTypes.DEPLOYMENTS);
             const { updated, deployments } = yield checkAllDeployments(deploymentDoc, ctx.user);
             if (updated) {
@@ -130,7 +130,8 @@ exports.fetchDeployments = function (ctx) {
 exports.deploymentProgress = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
-            const db = getAppDB();
+            const appId = ctx.appId;
+            const db = new CouchDB(appId);
             const deploymentDoc = yield db.get(DocumentTypes.DEPLOYMENTS);
             ctx.body = deploymentDoc[ctx.params.deploymentId];
         }
@@ -141,7 +142,7 @@ exports.deploymentProgress = function (ctx) {
 };
 exports.deployApp = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        let deployment = new Deployment();
+        let deployment = new Deployment(ctx.appId);
         console.log("Deployment object created");
         deployment.setStatus(DeploymentStatus.PENDING);
         console.log("Deployment object set to pending");

package/dist/api/controllers/dev.js

@@ -9,14 +9,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 const fetch = require("node-fetch");
+const CouchDB = require("../../db");
 const env = require("../../environment");
 const { checkSlashesInUrl } = require("../../utilities");
 const { request } = require("../../utilities/workerRequests");
 const { clearLock } = require("../../utilities/redis");
-const { Replication, getProdAppID } = require("@budibase/backend-core/db");
+const { Replication } = require("@budibase/backend-core/db");
 const { DocumentTypes } = require("../../db/utils");
 const { app: appCache } = require("@budibase/backend-core/cache");
-const { getProdAppDB, getAppDB } = require("@budibase/backend-core/context");
 function redirect(ctx, method, path = "global") {
     return __awaiter(this, void 0, void 0, function* () {
         const { devPath } = ctx.params;
@@ -76,10 +76,10 @@ exports.clearLock = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
 });
 exports.revert = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const { appId } = ctx.params;
-    const productionAppId = getProdAppID(appId);
+    const productionAppId = appId.replace("_dev", "");
     // App must have been deployed first
     try {
-        const db = getProdAppDB({ skip_setup: true });
+        const db = new CouchDB(productionAppId, { skip_setup: true });
         const info = yield db.info();
         if (info.error)
             throw info.error;
@@ -99,7 +99,7 @@ exports.revert = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
         });
         yield replication.rollback();
         // update appID in reverted app to be dev version again
-        const db = getAppDB();
+        const db = new CouchDB(appId);
         const appDoc = yield db.get(DocumentTypes.APP_METADATA);
         appDoc.appId = appId;
         appDoc.instance._id = appId;

package/dist/api/controllers/hosting.js

@@ -0,0 +1,30 @@
+"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());
+    });
+};
+const CouchDB = require("../../db");
+const { getDeployedApps } = require("../../utilities/workerRequests");
+const { getScopedConfig } = require("@budibase/backend-core/db");
+const { Configs } = require("@budibase/backend-core/constants");
+const { checkSlashesInUrl } = require("../../utilities");
+exports.fetchUrls = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
+    const appId = ctx.appId;
+    const db = new CouchDB(appId);
+    const settings = yield getScopedConfig(db, { type: Configs.SETTINGS });
+    let appUrl = "http://localhost:10000/app";
+    if (settings && settings["platformUrl"]) {
+        appUrl = checkSlashesInUrl(`${settings["platformUrl"]}/app`);
+    }
+    ctx.body = {
+        app: appUrl,
+    };
+});
+exports.getDeployedApps = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
+    ctx.body = yield getDeployedApps();
+});

package/dist/api/controllers/layout.js

@@ -9,11 +9,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 const { EMPTY_LAYOUT, BASE_LAYOUT_PROP_IDS, } = require("../../constants/layouts");
+const CouchDB = require("../../db");
 const { generateLayoutID, getScreenParams } = require("../../db/utils");
-const { getAppDB } = require("@budibase/backend-core/context");
 exports.save = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = getAppDB();
+        const db = new CouchDB(ctx.appId);
         let layout = ctx.request.body;
         if (!layout.props) {
             layout = Object.assign(Object.assign({}, EMPTY_LAYOUT), layout);
@@ -28,7 +28,7 @@ exports.save = function (ctx) {
 };
 exports.destroy = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = getAppDB();
+        const db = new CouchDB(ctx.appId);
         const layoutId = ctx.params.layoutId, layoutRev = ctx.params.layoutRev;
         if (Object.values(BASE_LAYOUT_PROP_IDS).includes(layoutId)) {
             ctx.throw(400, "Cannot delete a built-in layout");

package/dist/api/controllers/metadata.js

@@ -9,9 +9,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 const { MetadataTypes } = require("../../constants");
+const CouchDB = require("../../db");
 const { generateMetadataID } = require("../../db/utils");
 const { saveEntityMetadata, deleteEntityMetadata } = require("../../utilities");
-const { getAppDB } = require("@budibase/backend-core/context");
 exports.getTypes = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     ctx.body = {
         types: MetadataTypes,
@@ -22,18 +22,18 @@ exports.saveMetadata = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     if (type === MetadataTypes.AUTOMATION_TEST_HISTORY) {
         ctx.throw(400, "Cannot save automation history type");
     }
-    ctx.body = yield saveEntityMetadata(type, entityId, ctx.request.body);
+    ctx.body = yield saveEntityMetadata(ctx.appId, type, entityId, ctx.request.body);
 });
 exports.deleteMetadata = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const { type, entityId } = ctx.params;
-    yield deleteEntityMetadata(type, entityId);
+    yield deleteEntityMetadata(ctx.appId, type, entityId);
     ctx.body = {
         message: "Metadata deleted successfully",
     };
 });
 exports.getMetadata = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const { type, entityId } = ctx.params;
-    const db = getAppDB();
+    const db = new CouchDB(ctx.appId);
     const id = generateMetadataID(type, entityId);
     try {
         ctx.body = yield db.get(id);

package/dist/api/controllers/permission.js

@@ -11,9 +11,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 const { getBuiltinPermissions } = require("@budibase/backend-core/permissions");
 const { isBuiltin, getDBRoleID, getExternalRoleID, getBuiltinRoles, } = require("@budibase/backend-core/roles");
 const { getRoleParams } = require("../../db/utils");
+const CouchDB = require("../../db");
 const { CURRENTLY_SUPPORTED_LEVELS, getBasePermissions, } = require("../../utilities/security");
 const { removeFromArray } = require("../../utilities");
-const { getAppDB } = require("@budibase/backend-core/context");
 const PermissionUpdateType = {
     REMOVE: "remove",
     ADD: "add",
@@ -30,7 +30,7 @@ function getAllDBRoles(db) {
 }
 function updatePermissionOnRole(appId, { roleId, resourceId, level }, updateType) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = getAppDB();
+        const db = new CouchDB(appId);
         const remove = updateType === PermissionUpdateType.REMOVE;
         const isABuiltin = isBuiltin(roleId);
         const dbRoleId = getDBRoleID(roleId);
@@ -93,7 +93,7 @@ exports.fetchLevels = function (ctx) {
 };
 exports.fetch = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = getAppDB();
+        const db = new CouchDB(ctx.appId);
         const roles = yield getAllDBRoles(db);
         let permissions = {};
         // create an object with structure role ID -> resource ID -> level
@@ -121,7 +121,7 @@ exports.fetch = function (ctx) {
 exports.getResourcePerms = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const resourceId = ctx.params.resourceId;
-        const db = getAppDB();
+        const db = new CouchDB(ctx.appId);
         const body = yield db.allDocs(getRoleParams(null, {
             include_docs: true,
         }));

package/dist/api/controllers/query/import/index.js

@@ -8,14 +8,16 @@ 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.RestImporter = void 0;
+const db_1 = __importDefault(require("../../../../db"));
 const validation_1 = require("../validation");
 const utils_1 = require("../../../../db/utils");
 const openapi2_1 = require("./sources/openapi2");
 const curl_1 = require("./sources/curl");
-// @ts-ignore
-const context_1 = require("@budibase/backend-core/context");
 class RestImporter {
     constructor(data) {
         this.init = () => __awaiter(this, void 0, void 0, function* () {
@@ -29,7 +31,7 @@ class RestImporter {
         this.getInfo = () => __awaiter(this, void 0, void 0, function* () {
             return this.source.getInfo();
         });
-        this.importQueries = (datasourceId) => __awaiter(this, void 0, void 0, function* () {
+        this.importQueries = (appId, datasourceId) => __awaiter(this, void 0, void 0, function* () {
             // constuct the queries
             let queries = yield this.source.getQueries(datasourceId);
             // validate queries
@@ -49,7 +51,7 @@ class RestImporter {
                 return query;
             });
             // persist queries
-            const db = context_1.getAppDB();
+            const db = new db_1.default(appId);
             const response = yield db.bulkDocs(queries);
             // create index to seperate queries and errors
             const queryIndex = queries.reduce((acc, query) => {

package/dist/api/controllers/query/index.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 { generateQueryID, getQueryParams, isProdAppID, } = require("../../../db/utils");
 const { BaseQueryVerbs } = require("../../../constants");
 const { Thread, ThreadType } = require("../../../threads");
@@ -15,7 +16,6 @@ const { save: saveDatasource } = require("../datasource");
 const { RestImporter } = require("./import");
 const { invalidateDynamicVariables } = require("../../../threads/utils");
 const environment = require("../../../environment");
-const { getAppDB } = require("@budibase/backend-core/context");
 const Runner = new Thread(ThreadType.QUERY, {
     timeoutMs: environment.QUERY_THREAD_TIMEOUT || 10000,
 });
@@ -32,7 +32,7 @@ function enrichQueries(input) {
 }
 exports.fetch = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = getAppDB();
+        const db = new CouchDB(ctx.appId);
         const body = yield db.allDocs(getQueryParams(null, {
             include_docs: true,
         }));
@@ -67,13 +67,13 @@ exports.import = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
         // use existing datasource
         datasourceId = body.datasourceId;
     }
-    const importResult = yield importer.importQueries(datasourceId);
+    const importResult = yield importer.importQueries(ctx.appId, datasourceId);
     ctx.body = Object.assign(Object.assign({}, importResult), { datasourceId });
     ctx.status = 200;
 });
 exports.save = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = getAppDB();
+        const db = new CouchDB(ctx.appId);
         const query = ctx.request.body;
         if (!query._id) {
             query._id = generateQueryID(query.datasourceId);
@@ -86,7 +86,7 @@ exports.save = function (ctx) {
 };
 exports.find = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = getAppDB();
+        const db = new CouchDB(ctx.appId);
         const query = enrichQueries(yield db.get(ctx.params.queryId));
         // remove properties that could be dangerous in real app
         if (isProdAppID(ctx.appId)) {
@@ -98,7 +98,7 @@ exports.find = function (ctx) {
 };
 exports.preview = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = getAppDB();
+        const db = new CouchDB(ctx.appId);
         const datasource = yield db.get(ctx.request.body.datasourceId);
         // preview may not have a queryId as it hasn't been saved, but if it does
         // this stops dynamic variables from calling the same query
@@ -127,7 +127,7 @@ exports.preview = function (ctx) {
 };
 function execute(ctx, opts = { rowsOnly: false }) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = getAppDB();
+        const db = new CouchDB(ctx.appId);
         const query = yield db.get(ctx.params.queryId);
         const datasource = yield db.get(query.datasourceId);
         const enrichedParameters = ctx.request.body.parameters || {};
@@ -173,8 +173,7 @@ exports.executeV2 = function (ctx) {
         return execute(ctx, { rowsOnly: false });
     });
 };
-const removeDynamicVariables = (queryId) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = getAppDB();
+const removeDynamicVariables = (db, queryId) => __awaiter(void 0, void 0, void 0, function* () {
     const query = yield db.get(queryId);
     const datasource = yield db.get(query.datasourceId);
     const dynamicVariables = datasource.config.dynamicVariables;
@@ -189,8 +188,8 @@ const removeDynamicVariables = (queryId) => __awaiter(void 0, void 0, void 0, fu
 });
 exports.destroy = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = getAppDB();
-        yield removeDynamicVariables(ctx.params.queryId);
+        const db = new CouchDB(ctx.appId);
+        yield removeDynamicVariables(db, ctx.params.queryId);
         yield db.remove(ctx.params.queryId, ctx.params.revId);
         ctx.message = `Query deleted.`;
         ctx.status = 200;

package/dist/api/controllers/role.js

@@ -8,9 +8,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+const CouchDB = require("../../db");
 const { Role, getRole, isBuiltin, getAllRoles, } = require("@budibase/backend-core/roles");
 const { generateRoleID, getUserMetadataParams, InternalTables, } = require("../../db/utils");
-const { getAppDB } = require("@budibase/backend-core/context");
 const UpdateRolesOptions = {
     CREATED: "created",
     REMOVED: "removed",
@@ -42,17 +42,17 @@ function updateRolesOnUserTable(db, roleId, updateOption) {
 }
 exports.fetch = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        ctx.body = yield getAllRoles();
+        ctx.body = yield getAllRoles(ctx.appId);
     });
 };
 exports.find = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        ctx.body = yield getRole(ctx.params.roleId);
+        ctx.body = yield getRole(ctx.appId, ctx.params.roleId);
     });
 };
 exports.save = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = getAppDB();
+        const db = new CouchDB(ctx.appId);
         let { _id, name, inherits, permissionId } = ctx.request.body;
         if (!_id) {
             _id = generateRoleID();
@@ -75,7 +75,7 @@ exports.save = function (ctx) {
 };
 exports.destroy = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = getAppDB();
+        const db = new CouchDB(ctx.appId);
         const roleId = ctx.params.roleId;
         if (isBuiltin(roleId)) {
             ctx.throw(400, "Cannot delete builtin role.");

package/dist/api/controllers/routing.js

@@ -40,12 +40,13 @@ Routing.prototype.addScreenId = function (fullpath, roleId, screenId) {
 };
 /**
  * Gets the full routing structure by querying the routing view and processing the result into the tree.
+ * @param {string} appId The application to produce the routing structure for.
  * @returns {Promise<object>} The routing structure, this is the full structure designed for use in the builder,
  * if the client routing is required then the updateRoutingStructureForUserRole should be used.
  */
-function getRoutingStructure() {
+function getRoutingStructure(appId) {
     return __awaiter(this, void 0, void 0, function* () {
-        const screenRoutes = yield getRoutingInfo();
+        const screenRoutes = yield getRoutingInfo(appId);
         const routing = new Routing();
         for (let screenRoute of screenRoutes) {
             let fullpath = screenRoute.routing.route;
@@ -56,12 +57,12 @@ function getRoutingStructure() {
     });
 }
 exports.fetch = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    ctx.body = yield getRoutingStructure();
+    ctx.body = yield getRoutingStructure(ctx.appId);
 });
 exports.clientFetch = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const routing = yield getRoutingStructure();
+    const routing = yield getRoutingStructure(ctx.appId);
     let roleId = ctx.user.role._id;
-    const roleIds = yield getUserRoleHierarchy(roleId);
+    const roleIds = yield getUserRoleHierarchy(ctx.appId, roleId);
     for (let topLevel of Object.values(routing.routes)) {
         for (let subpathKey of Object.keys(topLevel.subpaths)) {
             let found = false;