@budibase/server 1.0.49 → 1.0.50-alpha.3

package/dist/api/controllers/application.js

@@ -8,7 +8,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const CouchDB = require("../../db");
 const env = require("../../environment");
 const packageJson = require("../../../package.json");
 const { createLinkView, createRoutingView, createAllSearchIndex, } = require("../../db/views/staticViews");
@@ -18,9 +17,9 @@ const { BUILTIN_ROLE_IDS, AccessController, } = require("@budibase/backend-core/
 const { BASE_LAYOUTS } = require("../../constants/layouts");
 const { cloneDeep } = require("lodash/fp");
 const { processObject } = require("@budibase/string-templates");
-const { getAllApps, isDevAppID, getDeployedAppID, Replication, } = require("@budibase/backend-core/db");
+const { getAllApps, isDevAppID, getProdAppID, Replication, } = require("@budibase/backend-core/db");
 const { USERS_TABLE_SCHEMA } = require("../../constants");
-const { getDeployedApps, removeAppFromUserRoles, } = require("../../utilities/workerRequests");
+const { removeAppFromUserRoles } = require("../../utilities/workerRequests");
 const { clientLibraryPath, stringToReadStream } = require("../../utilities");
 const { getAllLocks } = require("../../utilities/redis");
 const { updateClientLibrary, backupClientLibrary, revertClientLibrary, } = require("../../utilities/fileSystem/clientLibrary");
@@ -28,17 +27,20 @@ const { getTenantId, isMultiTenant } = require("@budibase/backend-core/tenancy")
 const { syncGlobalUsers } = require("./user");
 const { app: appCache } = require("@budibase/backend-core/cache");
 const { cleanupAutomations } = require("../../automations/utils");
+const { getAppDB, getProdAppDB, updateAppId, } = require("@budibase/backend-core/context");
 const URL_REGEX_SLASH = /\/|\\/g;
 // utility function, need to do away with this
-function getLayouts(db) {
+function getLayouts() {
     return __awaiter(this, void 0, void 0, function* () {
+        const db = getAppDB();
         return (yield db.allDocs(getLayoutParams(null, {
             include_docs: true,
         }))).rows.map(row => row.doc);
     });
 }
-function getScreens(db) {
+function getScreens() {
     return __awaiter(this, void 0, void 0, function* () {
+        const db = getAppDB();
         return (yield db.allDocs(getScreenParams(null, {
             include_docs: true,
         }))).rows.map(row => row.doc);
@@ -49,37 +51,49 @@ function getUserRoleId(ctx) {
         ? BUILTIN_ROLE_IDS.PUBLIC
         : ctx.user.role._id;
 }
-function getAppUrlIfNotInUse(ctx) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let url;
-        if (ctx.request.body.url) {
-            url = encodeURI(ctx.request.body.url);
-        }
-        else if (ctx.request.body.name) {
-            url = encodeURI(`${ctx.request.body.name}`);
-        }
-        if (url) {
-            url = `/${url.replace(URL_REGEX_SLASH, "")}`.toLowerCase();
-        }
-        if (!env.SELF_HOSTED) {
-            return url;
-        }
-        const deployedApps = yield getDeployedApps();
-        if (url &&
-            deployedApps[url] != null &&
-            ctx.params != null &&
-            deployedApps[url].appId !== ctx.params.appId) {
-            ctx.throw(400, "App name/URL is already in use.");
-        }
-        return url;
-    });
-}
+exports.getAppUrl = ctx => {
+    // construct the url
+    let url;
+    if (ctx.request.body.url) {
+        // if the url is provided, use that
+        url = encodeURI(ctx.request.body.url);
+    }
+    else if (ctx.request.body.name) {
+        // otherwise use the name
+        url = encodeURI(`${ctx.request.body.name}`);
+    }
+    if (url) {
+        url = `/${url.replace(URL_REGEX_SLASH, "")}`.toLowerCase();
+    }
+    return url;
+};
+const checkAppUrl = (ctx, apps, url, currentAppId) => {
+    if (currentAppId) {
+        apps = apps.filter(app => app.appId !== currentAppId);
+    }
+    if (apps.some(app => app.url === url)) {
+        ctx.throw(400, "App URL is already in use.");
+    }
+};
+const checkAppName = (ctx, apps, name, currentAppId) => {
+    // TODO: Replace with Joi
+    if (!name) {
+        ctx.throw(400, "Name is required");
+    }
+    if (currentAppId) {
+        apps = apps.filter(app => app.appId !== currentAppId);
+    }
+    if (apps.some(app => app.name === name)) {
+        ctx.throw(400, "App name is already in use.");
+    }
+};
 function createInstance(template) {
     return __awaiter(this, void 0, void 0, function* () {
         const tenantId = isMultiTenant() ? getTenantId() : null;
         const baseAppId = generateAppID(tenantId);
         const appId = generateDevAppID(baseAppId);
-        const db = new CouchDB(appId);
+        updateAppId(appId);
+        const db = getAppDB();
         yield db.put({
             _id: "_design/database",
             // view collation information, read before writing any complex views:
@@ -88,9 +102,9 @@ function createInstance(template) {
         });
         // NOTE: indexes need to be created before any tables/templates
         // add view for linked rows
-        yield createLinkView(appId);
-        yield createRoutingView(appId);
-        yield createAllSearchIndex(appId);
+        yield createLinkView();
+        yield createRoutingView();
+        yield createAllSearchIndex();
         // replicate the template data to the instance DB
         // this is currently very hard to test, downloading and importing template files
         if (template && template.templateString) {
@@ -116,7 +130,7 @@ function createInstance(template) {
 exports.fetch = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const dev = ctx.query && ctx.query.status === AppStatus.DEV;
     const all = ctx.query && ctx.query.status === AppStatus.ALL;
-    const apps = yield getAllApps(CouchDB, { dev, all });
+    const apps = yield getAllApps({ dev, all });
     // get the locks for all the dev apps
     if (dev || all) {
         const locks = yield getAllLocks();
@@ -137,11 +151,10 @@ exports.fetch = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     ctx.body = apps;
 });
 exports.fetchAppDefinition = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = new CouchDB(ctx.params.appId);
-    const layouts = yield getLayouts(db);
+    const layouts = yield getLayouts();
     const userRoleId = getUserRoleId(ctx);
-    const accessController = new AccessController(ctx.params.appId);
-    const screens = yield accessController.checkScreensAccess(yield getScreens(db), userRoleId);
+    const accessController = new AccessController();
+    const screens = yield accessController.checkScreensAccess(yield getScreens(), userRoleId);
     ctx.body = {
         layouts,
         screens,
@@ -149,14 +162,14 @@ exports.fetchAppDefinition = (ctx) => __awaiter(void 0, void 0, void 0, function
     };
 });
 exports.fetchAppPackage = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = new CouchDB(ctx.params.appId);
+    const db = getAppDB();
     const application = yield db.get(DocumentTypes.APP_METADATA);
-    const layouts = yield getLayouts(db);
-    let screens = yield getScreens(db);
+    const layouts = yield getLayouts();
+    let screens = yield getScreens();
     // Only filter screens if the user is not a builder
     if (!(ctx.user.builder && ctx.user.builder.global)) {
         const userRoleId = getUserRoleId(ctx);
-        const accessController = new AccessController(ctx.params.appId);
+        const accessController = new AccessController();
         screens = yield accessController.checkScreensAccess(screens, userRoleId);
     }
     ctx.body = {
@@ -167,6 +180,11 @@ exports.fetchAppPackage = (ctx) => __awaiter(void 0, void 0, void 0, function* (
     };
 });
 exports.create = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
+    const apps = yield getAllApps({ dev: true });
+    const name = ctx.request.body.name;
+    checkAppName(ctx, apps, name);
+    const url = exports.getAppUrl(ctx);
+    checkAppUrl(ctx, apps, url);
     const { useTemplate, templateKey, templateString } = ctx.request.body;
     const instanceConfig = {
         useTemplate,
@@ -178,8 +196,7 @@ exports.create = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     }
     const instance = yield createInstance(instanceConfig);
     const appId = instance._id;
-    const url = yield getAppUrlIfNotInUse(ctx);
-    const db = new CouchDB(appId);
+    const db = getAppDB();
     let _rev;
     try {
         // if template there will be an existing doc
@@ -196,7 +213,7 @@ exports.create = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
         type: "app",
         version: packageJson.version,
         componentLibraries: ["@budibase/standard-components"],
-        name: ctx.request.body.name,
+        name: name,
         url: url,
         template: ctx.request.body.template,
         instance: instance,
@@ -219,14 +236,27 @@ exports.create = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     ctx.status = 200;
     ctx.body = newApplication;
 });
+// This endpoint currently operates as a PATCH rather than a PUT
+// Thus name and url fields are handled only if present
 exports.update = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const data = yield updateAppPackage(ctx, ctx.request.body, ctx.params.appId);
+    const apps = yield getAllApps({ dev: true });
+    // validation
+    const name = ctx.request.body.name;
+    if (name) {
+        checkAppName(ctx, apps, name, ctx.params.appId);
+    }
+    const url = yield exports.getAppUrl(ctx);
+    if (url) {
+        checkAppUrl(ctx, apps, url, ctx.params.appId);
+        ctx.request.body.url = url;
+    }
+    const data = yield updateAppPackage(ctx.request.body, ctx.params.appId);
     ctx.status = 200;
     ctx.body = data;
 });
 exports.updateClient = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     // Get current app version
-    const db = new CouchDB(ctx.params.appId);
+    const db = getAppDB();
     const application = yield db.get(DocumentTypes.APP_METADATA);
     const currentVersion = application.version;
     // Update client library and manifest
@@ -239,13 +269,13 @@ exports.updateClient = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
         version: packageJson.version,
         revertableVersion: currentVersion,
     };
-    const data = yield updateAppPackage(ctx, appPackageUpdates, ctx.params.appId);
+    const data = yield updateAppPackage(appPackageUpdates, ctx.params.appId);
     ctx.status = 200;
     ctx.body = data;
 });
 exports.revertClient = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     // Check app can be reverted
-    const db = new CouchDB(ctx.params.appId);
+    const db = getAppDB();
     const application = yield db.get(DocumentTypes.APP_METADATA);
     if (!application.revertableVersion) {
         ctx.throw(400, "There is no version to revert to");
@@ -259,12 +289,12 @@ exports.revertClient = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
         version: application.revertableVersion,
         revertableVersion: null,
     };
-    const data = yield updateAppPackage(ctx, appPackageUpdates, ctx.params.appId);
+    const data = yield updateAppPackage(appPackageUpdates, ctx.params.appId);
     ctx.status = 200;
     ctx.body = data;
 });
 exports.delete = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = new CouchDB(ctx.params.appId);
+    const db = getAppDB();
     const result = yield db.destroy();
     /* istanbul ignore next */
     if (!env.isTest() && !ctx.query.unpublish) {
@@ -285,9 +315,10 @@ exports.sync = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
         ctx.throw(400, "This action cannot be performed for production apps");
     }
     // replicate prod to dev
-    const prodAppId = getDeployedAppID(appId);
+    const prodAppId = getProdAppID(appId);
     try {
-        const prodDb = new CouchDB(prodAppId, { skip_setup: true });
+        // specific case, want to make sure setup is skipped
+        const prodDb = getProdAppDB({ skip_setup: true });
         const info = yield prodDb.info();
         if (info.error)
             throw info.error;
@@ -316,7 +347,7 @@ exports.sync = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
         error = err;
     }
     // sync the users
-    yield syncGlobalUsers(appId);
+    yield syncGlobalUsers();
     if (error) {
         ctx.throw(400, error);
     }
@@ -326,11 +357,10 @@ exports.sync = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
         };
     }
 });
-const updateAppPackage = (ctx, appPackage, appId) => __awaiter(void 0, void 0, void 0, function* () {
-    const url = yield getAppUrlIfNotInUse(ctx);
-    const db = new CouchDB(appId);
+const updateAppPackage = (appPackage, appId) => __awaiter(void 0, void 0, void 0, function* () {
+    const db = getAppDB();
     const application = yield db.get(DocumentTypes.APP_METADATA);
-    const newAppPackage = Object.assign(Object.assign(Object.assign({}, application), appPackage), { url });
+    const newAppPackage = Object.assign(Object.assign({}, application), appPackage);
     if (appPackage._rev !== application._rev) {
         newAppPackage._rev = application._rev;
     }
@@ -343,7 +373,7 @@ const updateAppPackage = (ctx, appPackage, appId) => __awaiter(void 0, void 0, v
     return response;
 });
 const createEmptyAppPackage = (ctx, app) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = new CouchDB(app.appId);
+    const db = getAppDB();
     let screensAndLayouts = [];
     for (let layout of BASE_LAYOUTS) {
         const cloned = cloneDeep(layout);

package/dist/api/controllers/auth.js

@@ -8,13 +8,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const CouchDB = require("../../db");
 const { outputProcessing } = require("../../utilities/rowProcessor");
 const { InternalTables } = require("../../db/utils");
 const { getFullUser } = require("../../utilities/users");
 const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles");
+const { getAppDB, getAppId } = require("@budibase/backend-core/context");
 exports.fetchSelf = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const appId = ctx.appId;
     let userId = ctx.user.userId || ctx.user._id;
     /* istanbul ignore next */
     if (!userId) {
@@ -24,15 +23,19 @@ exports.fetchSelf = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const user = yield getFullUser(ctx, userId);
     // this shouldn't be returned by the app self
     delete user.roles;
-    if (appId) {
-        const db = new CouchDB(appId);
+    // forward the csrf token from the session
+    user.csrfToken = ctx.user.csrfToken;
+    if (getAppId()) {
+        const db = getAppDB();
         // remove the full roles structure
         delete user.roles;
         try {
             const userTable = yield db.get(InternalTables.USER_METADATA);
             const metadata = yield db.get(userId);
+            // make sure there is never a stale csrf token
+            delete metadata.csrfToken;
             // specifically needs to make sure is enriched
-            ctx.body = yield outputProcessing(ctx, userTable, Object.assign(Object.assign({}, user), metadata));
+            ctx.body = yield outputProcessing(userTable, Object.assign(Object.assign({}, user), metadata));
         }
         catch (err) {
             let response;

package/dist/api/controllers/automation.js

@@ -8,7 +8,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const CouchDB = require("../../db");
 const actions = require("../../automations/actions");
 const triggers = require("../../automations/triggers");
 const { getAutomationParams, generateAutomationID } = require("../../db/utils");
@@ -16,6 +15,7 @@ const { checkForWebhooks, updateTestHistory, removeDeprecated, } = require("../.
 const { deleteEntityMetadata } = require("../../utilities");
 const { MetadataTypes } = require("../../constants");
 const { setTestFlag, clearTestFlag } = require("../../utilities/redis");
+const { getAppDB } = require("@budibase/backend-core/context");
 const ACTION_DEFS = removeDeprecated(actions.ACTION_DEFINITIONS);
 const TRIGGER_DEFS = removeDeprecated(triggers.TRIGGER_DEFINITIONS);
 /*************************
@@ -23,10 +23,10 @@ const TRIGGER_DEFS = removeDeprecated(triggers.TRIGGER_DEFINITIONS);
  *   BUILDER FUNCTIONS   *
  *                       *
  *************************/
-function cleanupAutomationMetadata(appId, automationId) {
+function cleanupAutomationMetadata(automationId) {
     return __awaiter(this, void 0, void 0, function* () {
-        yield deleteEntityMetadata(appId, MetadataTypes.AUTOMATION_TEST_INPUT, automationId);
-        yield deleteEntityMetadata(appId, MetadataTypes.AUTOMATION_TEST_HISTORY, automationId);
+        yield deleteEntityMetadata(MetadataTypes.AUTOMATION_TEST_INPUT, automationId);
+        yield deleteEntityMetadata(MetadataTypes.AUTOMATION_TEST_HISTORY, automationId);
     });
 }
 function cleanAutomationInputs(automation) {
@@ -54,7 +54,7 @@ function cleanAutomationInputs(automation) {
 }
 exports.create = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = new CouchDB(ctx.appId);
+        const db = getAppDB();
         let automation = ctx.request.body;
         automation.appId = ctx.appId;
         // call through to update if already exists
@@ -65,7 +65,6 @@ exports.create = function (ctx) {
         automation.type = "automation";
         automation = cleanAutomationInputs(automation);
         automation = yield checkForWebhooks({
-            appId: ctx.appId,
             newAuto: automation,
         });
         const response = yield db.put(automation);
@@ -79,13 +78,12 @@ exports.create = function (ctx) {
 };
 exports.update = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = new CouchDB(ctx.appId);
+        const db = getAppDB();
         let automation = ctx.request.body;
         automation.appId = ctx.appId;
         const oldAutomation = yield db.get(automation._id);
         automation = cleanAutomationInputs(automation);
         automation = yield checkForWebhooks({
-            appId: ctx.appId,
             oldAuto: oldAutomation,
             newAuto: automation,
         });
@@ -110,7 +108,7 @@ exports.update = function (ctx) {
 };
 exports.fetch = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = new CouchDB(ctx.appId);
+        const db = getAppDB();
         const response = yield db.allDocs(getAutomationParams(null, {
             include_docs: true,
         }));
@@ -119,21 +117,20 @@ exports.fetch = function (ctx) {
 };
 exports.find = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = new CouchDB(ctx.appId);
+        const db = getAppDB();
         ctx.body = yield db.get(ctx.params.id);
     });
 };
 exports.destroy = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = new CouchDB(ctx.appId);
+        const db = getAppDB();
         const automationId = ctx.params.id;
         const oldAutomation = yield db.get(automationId);
         yield checkForWebhooks({
-            appId: ctx.appId,
             oldAuto: oldAutomation,
         });
         // delete metadata first
-        yield cleanupAutomationMetadata(ctx.appId, automationId);
+        yield cleanupAutomationMetadata(automationId);
         ctx.body = yield db.remove(automationId, ctx.params.rev);
     });
 };
@@ -162,10 +159,9 @@ module.exports.getDefinitionList = function (ctx) {
  *********************/
 exports.trigger = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const appId = ctx.appId;
-        const db = new CouchDB(appId);
+        const db = getAppDB();
         let automation = yield db.get(ctx.params.id);
-        yield triggers.externalTrigger(automation, Object.assign(Object.assign({}, ctx.request.body), { appId }));
+        yield triggers.externalTrigger(automation, Object.assign(Object.assign({}, ctx.request.body), { appId: ctx.appId }));
         ctx.body = {
             message: `Automation ${automation._id} has been triggered.`,
             automation,
@@ -184,12 +180,11 @@ function prepareTestInput(input) {
 }
 exports.test = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const appId = ctx.appId;
-        const db = new CouchDB(appId);
+        const db = getAppDB();
         let automation = yield db.get(ctx.params.id);
         yield setTestFlag(automation._id);
         const testInput = prepareTestInput(ctx.request.body);
-        const response = yield triggers.externalTrigger(automation, Object.assign(Object.assign({}, testInput), { appId }), { getResponses: true });
+        const response = yield triggers.externalTrigger(automation, Object.assign(Object.assign({}, testInput), { appId: ctx.appId }), { getResponses: true });
         // save a test history run
         yield updateTestHistory(ctx.appId, automation, Object.assign(Object.assign({}, ctx.request.body), { occurredAt: new Date().getTime() }));
         yield clearTestFlag(automation._id);

package/dist/api/controllers/cloud.js

@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 const env = require("../../environment");
 const { getAllApps } = require("@budibase/backend-core/db");
-const CouchDB = require("../../db");
 const { exportDB, sendTempFile, readFileSync, } = require("../../utilities/fileSystem");
 const { stringToReadStream } = require("../../utilities");
 const { getGlobalDBName, getGlobalDB, } = require("@budibase/backend-core/tenancy");
@@ -33,7 +32,7 @@ exports.exportApps = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     if (env.SELF_HOSTED || !env.MULTI_TENANCY) {
         ctx.throw(400, "Exporting only allowed in multi-tenant cloud environments.");
     }
-    const apps = yield getAllApps(CouchDB, { all: true });
+    const apps = yield getAllApps({ all: true });
     const globalDBString = yield exportDB(getGlobalDBName(), {
         filter: doc => !doc._id.startsWith(DocumentTypes.USER),
     });
@@ -65,7 +64,7 @@ function hasBeenImported() {
         if (!env.SELF_HOSTED || env.MULTI_TENANCY) {
             return true;
         }
-        const apps = yield getAllApps(CouchDB, { all: true });
+        const apps = yield getAllApps({ all: true });
         return apps.length !== 0;
     });
 }

package/dist/api/controllers/component.js

@@ -8,16 +8,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const CouchDB = require("../../db");
 const { DocumentTypes } = require("../../db/utils");
 const { getComponentLibraryManifest } = require("../../utilities/fileSystem");
+const { getAppDB } = require("@budibase/backend-core/context");
 exports.fetchAppComponentDefinitions = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const appId = ctx.params.appId || ctx.appId;
-        const db = new CouchDB(appId);
+        const db = getAppDB();
         const app = yield db.get(DocumentTypes.APP_METADATA);
         let componentManifests = yield Promise.all(app.componentLibraries.map((library) => __awaiter(this, void 0, void 0, function* () {
-            let manifest = yield getComponentLibraryManifest(appId, library);
+            let manifest = yield getComponentLibraryManifest(library);
             return {
                 manifest,
                 library,

package/dist/api/controllers/datasource.js

@@ -8,32 +8,37 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const CouchDB = require("../../db");
 const { generateDatasourceID, getDatasourceParams, getQueryParams, DocumentTypes, BudibaseInternalDB, getTableParams, } = require("../../db/utils");
 const { BuildSchemaErrors, InvalidColumns } = require("../../constants");
 const { integrations } = require("../../integrations");
 const { getDatasourceAndQuery } = require("./row/utils");
 const { invalidateDynamicVariables } = require("../../threads/utils");
+const { getAppDB } = require("@budibase/backend-core/context");
 exports.fetch = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const database = new CouchDB(ctx.appId);
         // Get internal tables
-        const db = new CouchDB(ctx.appId);
+        const db = getAppDB();
         const internalTables = yield db.allDocs(getTableParams(null, {
             include_docs: true,
         }));
         const internal = internalTables.rows.map(row => row.doc);
         const bbInternalDb = Object.assign(Object.assign({}, BudibaseInternalDB), { entities: internal });
         // Get external datasources
-        const datasources = (yield database.allDocs(getDatasourceParams(null, {
+        const datasources = (yield db.allDocs(getDatasourceParams(null, {
             include_docs: true,
         }))).rows.map(row => row.doc);
+        for (let datasource of datasources) {
+            if (datasource.config && datasource.config.auth) {
+                // strip secrets from response so they don't show in the network request
+                delete datasource.config.auth;
+            }
+        }
         ctx.body = [bbInternalDb, ...datasources];
     });
 };
 exports.buildSchemaFromDb = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = new CouchDB(ctx.appId);
+        const db = getAppDB();
         const datasource = yield db.get(ctx.params.datasourceId);
         const { tables, error } = yield buildSchemaHelper(datasource);
         datasource.entities = tables;
@@ -75,11 +80,16 @@ const invalidateVariables = (existingDatasource, updatedDatasource) => __awaiter
 });
 exports.update = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = new CouchDB(ctx.appId);
+        const db = getAppDB();
         const datasourceId = ctx.params.datasourceId;
         let datasource = yield db.get(datasourceId);
+        const auth = datasource.config.auth;
         yield invalidateVariables(datasource, ctx.request.body);
         datasource = Object.assign(Object.assign({}, datasource), ctx.request.body);
+        if (auth && !ctx.request.body.auth) {
+            // don't strip auth config from DB
+            datasource.config.auth = auth;
+        }
         const response = yield db.put(datasource);
         datasource._rev = response.rev;
         // Drain connection pools when configuration is changed
@@ -96,7 +106,7 @@ exports.update = function (ctx) {
 };
 exports.save = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = new CouchDB(ctx.appId);
+        const db = getAppDB();
         const plus = ctx.request.body.datasource.plus;
         const fetchSchema = ctx.request.body.fetchSchema;
         const datasource = Object.assign({ _id: generateDatasourceID({ plus }), type: plus ? DocumentTypes.DATASOURCE_PLUS : DocumentTypes.DATASOURCE }, ctx.request.body.datasource);
@@ -124,7 +134,7 @@ exports.save = function (ctx) {
 };
 exports.destroy = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = new CouchDB(ctx.appId);
+        const db = getAppDB();
         // Delete all queries for the datasource
         const queries = yield db.allDocs(getQueryParams(ctx.params.datasourceId, null));
         yield db.bulkDocs(queries.rows.map(row => ({
@@ -140,7 +150,7 @@ exports.destroy = function (ctx) {
 };
 exports.find = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const database = new CouchDB(ctx.appId);
+        const database = getAppDB();
         ctx.body = yield database.get(ctx.params.datasourceId);
     });
 };
@@ -149,7 +159,7 @@ exports.query = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const queryJson = ctx.request.body;
         try {
-            ctx.body = yield getDatasourceAndQuery(ctx.appId, queryJson);
+            ctx.body = yield getDatasourceAndQuery(queryJson);
         }
         catch (err) {
             ctx.throw(400, err);

package/dist/api/controllers/deploy/Deployment.js

@@ -1,16 +1,13 @@
 "use strict";
 const newid = require("../../../db/newid");
+const { getAppId } = require("@budibase/backend-core/context");
 /**
  * This is used to pass around information about the deployment that is occurring
  */
 class Deployment {
-    constructor(appId, id = null) {
-        this.appId = appId;
+    constructor(id = null) {
         this._id = id || newid();
     }
-    getAppId() {
-        return this.appId;
-    }
     setVerification(verification) {
         if (!verification) {
             return;
@@ -37,7 +34,7 @@ class Deployment {
     getJSON() {
         const obj = {
             _id: this._id,
-            appId: this.appId,
+            appId: getAppId(),
             status: this.status,
         };
         if (this.err) {