@budibase/server 2.1.22-alpha.6 → 2.1.22-alpha.7

package/dist/api/controllers/application.js

@@ -18,23 +18,17 @@ const package_json_1 = __importDefault(require("../../../package.json"));
 const staticViews_1 = require("../../db/views/staticViews");
 const fileSystem_1 = require("../../utilities/fileSystem");
 const utils_1 = require("../../db/utils");
-const { BUILTIN_ROLE_IDS, AccessController, } = require("@budibase/backend-core/roles");
-const { CacheKeys, bustCache } = require("@budibase/backend-core/cache");
-const { getAllApps, isDevAppID, getProdAppID, Replication, } = require("@budibase/backend-core/db");
+const backend_core_1 = require("@budibase/backend-core");
 const constants_1 = require("../../constants");
 const workerRequests_1 = require("../../utilities/workerRequests");
 const utilities_1 = require("../../utilities");
 const redis_1 = require("../../utilities/redis");
 const clientLibrary_1 = require("../../utilities/fileSystem/clientLibrary");
-const { getTenantId, isMultiTenant } = require("@budibase/backend-core/tenancy");
 const user_1 = require("./user");
-const { app: appCache } = require("@budibase/backend-core/cache");
 const utils_2 = require("../../automations/utils");
-const backend_core_1 = require("@budibase/backend-core");
 const logging_1 = require("../../automations/logging");
 const rows_1 = require("../../utilities/usageQuota/rows");
 const pro_1 = require("@budibase/pro");
-const backend_core_2 = require("@budibase/backend-core");
 const types_1 = require("@budibase/types");
 const layouts_1 = require("../../constants/layouts");
 const plugins_1 = require("../../utilities/plugins");
@@ -59,7 +53,7 @@ function getScreens() {
 }
 function getUserRoleId(ctx) {
     return !ctx.user.role || !ctx.user.role._id
-        ? BUILTIN_ROLE_IDS.PUBLIC
+        ? backend_core_1.roles.BUILTIN_ROLE_IDS.PUBLIC
         : ctx.user.role._id;
 }
 const getAppUrl = (ctx) => {
@@ -101,7 +95,7 @@ const checkAppName = (ctx, apps, name, currentAppId) => {
 };
 function createInstance(template) {
     return __awaiter(this, void 0, void 0, function* () {
-        const tenantId = isMultiTenant() ? getTenantId() : null;
+        const tenantId = backend_core_1.tenancy.isMultiTenant() ? backend_core_1.tenancy.getTenantId() : null;
         const baseAppId = (0, utils_1.generateAppID)(tenantId);
         const appId = (0, utils_1.generateDevAppID)(baseAppId);
         yield backend_core_1.context.updateAppId(appId);
@@ -138,7 +132,7 @@ function createInstance(template) {
 const fetch = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const dev = ctx.query && ctx.query.status === utils_1.AppStatus.DEV;
     const all = ctx.query && ctx.query.status === utils_1.AppStatus.ALL;
-    const apps = yield getAllApps({ dev, all });
+    const apps = (yield backend_core_1.db.getAllApps({ dev, all }));
     const appIds = apps
         .filter((app) => app.status === "development")
         .map((app) => app.appId);
@@ -162,7 +156,7 @@ exports.fetch = fetch;
 const fetchAppDefinition = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const layouts = yield getLayouts();
     const userRoleId = getUserRoleId(ctx);
-    const accessController = new AccessController();
+    const accessController = new backend_core_1.roles.AccessController();
     const screens = yield accessController.checkScreensAccess(yield getScreens(), userRoleId);
     ctx.body = {
         layouts,
@@ -181,7 +175,7 @@ const fetchAppPackage = (ctx) => __awaiter(void 0, void 0, void 0, function* ()
     // 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();
+        const accessController = new backend_core_1.roles.AccessController();
         screens = yield accessController.checkScreensAccess(screens, userRoleId);
     }
     ctx.body = {
@@ -193,7 +187,7 @@ const fetchAppPackage = (ctx) => __awaiter(void 0, void 0, void 0, function* ()
 });
 exports.fetchAppPackage = fetchAppPackage;
 const performAppCreate = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const apps = yield getAllApps({ dev: true });
+    const apps = yield backend_core_1.db.getAllApps({ dev: true });
     const name = ctx.request.body.name;
     checkAppName(ctx, apps, name);
     const url = (0, exports.getAppUrl)(ctx);
@@ -221,7 +215,7 @@ const performAppCreate = (ctx) => __awaiter(void 0, void 0, void 0, function* ()
         url: url,
         template: templateKey,
         instance,
-        tenantId: getTenantId(),
+        tenantId: backend_core_1.tenancy.getTenantId(),
         updatedAt: new Date().toISOString(),
         createdAt: new Date().toISOString(),
         status: utils_1.AppStatus.DEV,
@@ -276,7 +270,7 @@ const performAppCreate = (ctx) => __awaiter(void 0, void 0, void 0, function* ()
     if (!environment_1.default.isTest()) {
         yield (0, fileSystem_1.createApp)(appId);
     }
-    yield appCache.invalidateAppMetadata(appId, newApplication);
+    yield backend_core_1.cache.app.invalidateAppMetadata(appId, newApplication);
     return newApplication;
 });
 const creationEvents = (request, app) => __awaiter(void 0, void 0, void 0, function* () {
@@ -286,25 +280,25 @@ const creationEvents = (request, app) => __awaiter(void 0, void 0, void 0, funct
     if (body.useTemplate === "true") {
         // from template
         if (body.templateKey && body.templateKey !== "undefined") {
-            creationFns.push(a => backend_core_2.events.app.templateImported(a, body.templateKey));
+            creationFns.push(a => backend_core_1.events.app.templateImported(a, body.templateKey));
         }
         // from file
         else if ((_a = request.files) === null || _a === void 0 ? void 0 : _a.templateFile) {
-            creationFns.push(a => backend_core_2.events.app.fileImported(a));
+            creationFns.push(a => backend_core_1.events.app.fileImported(a));
         }
         // unknown
         else {
             console.error("Could not determine template creation event");
         }
     }
-    creationFns.push(a => backend_core_2.events.app.created(a));
+    creationFns.push(a => backend_core_1.events.app.created(a));
     for (let fn of creationFns) {
         yield fn(app);
     }
 });
 const appPostCreate = (ctx, app) => __awaiter(void 0, void 0, void 0, function* () {
-    const tenantId = getTenantId();
-    yield backend_core_2.migrations.backPopulateMigrations({
+    const tenantId = backend_core_1.tenancy.getTenantId();
+    yield backend_core_1.migrations.backPopulateMigrations({
         type: types_1.MigrationType.APP,
         tenantId,
         appId: app.appId,
@@ -316,10 +310,12 @@ const appPostCreate = (ctx, app) => __awaiter(void 0, void 0, void 0, function*
         const rowCount = rows ? rows.length : 0;
         if (rowCount) {
             try {
-                yield pro_1.quotas.addRows(rowCount);
+                yield backend_core_1.context.doInAppContext(app.appId, () => {
+                    return pro_1.quotas.addRows(rowCount);
+                });
             }
             catch (err) {
-                if (err.code && err.code === backend_core_2.errors.codes.USAGE_LIMIT_EXCEEDED) {
+                if (err.code && err.code === backend_core_1.errors.codes.USAGE_LIMIT_EXCEEDED) {
                     // this import resulted in row usage exceeding the quota
                     // delete the app
                     // skip pre and post steps as no rows have been added to quotas yet
@@ -334,7 +330,7 @@ const appPostCreate = (ctx, app) => __awaiter(void 0, void 0, void 0, function*
 const create = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const newApplication = yield pro_1.quotas.addApp(() => performAppCreate(ctx));
     yield appPostCreate(ctx, newApplication);
-    yield bustCache(CacheKeys.CHECKLIST);
+    yield backend_core_1.cache.bustCache(backend_core_1.cache.CacheKeys.CHECKLIST);
     ctx.body = newApplication;
     ctx.status = 200;
 });
@@ -342,7 +338,7 @@ exports.create = create;
 // This endpoint currently operates as a PATCH rather than a PUT
 // Thus name and url fields are handled only if present
 const update = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const apps = yield getAllApps({ dev: true });
+    const apps = yield backend_core_1.db.getAllApps({ dev: true });
     // validation
     const name = ctx.request.body.name;
     if (name) {
@@ -354,7 +350,7 @@ const update = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
         ctx.request.body.url = url;
     }
     const app = yield (0, exports.updateAppPackage)(ctx.request.body, ctx.params.appId);
-    yield backend_core_2.events.app.updated(app);
+    yield backend_core_1.events.app.updated(app);
     ctx.status = 200;
     ctx.body = app;
 });
@@ -376,7 +372,7 @@ const updateClient = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
         revertableVersion: currentVersion,
     };
     const app = yield (0, exports.updateAppPackage)(appPackageUpdates, ctx.params.appId);
-    yield backend_core_2.events.app.versionUpdated(app, currentVersion, updatedToVersion);
+    yield backend_core_1.events.app.versionUpdated(app, currentVersion, updatedToVersion);
     ctx.status = 200;
     ctx.body = app;
 });
@@ -400,7 +396,7 @@ const revertClient = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
         revertableVersion: null,
     };
     const app = yield (0, exports.updateAppPackage)(appPackageUpdates, ctx.params.appId);
-    yield backend_core_2.events.app.versionReverted(app, currentVersion, revertedToVersion);
+    yield backend_core_1.events.app.versionReverted(app, currentVersion, revertedToVersion);
     ctx.status = 200;
     ctx.body = app;
 });
@@ -409,17 +405,17 @@ const destroyApp = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     let appId = ctx.params.appId;
     let isUnpublish = ctx.query && ctx.query.unpublish;
     if (isUnpublish) {
-        appId = getProdAppID(appId);
+        appId = backend_core_1.db.getProdAppID(appId);
     }
     const db = isUnpublish ? backend_core_1.context.getProdAppDB() : backend_core_1.context.getAppDB();
     const app = yield db.get(utils_1.DocumentType.APP_METADATA);
     const result = yield db.destroy();
     if (isUnpublish) {
-        yield backend_core_2.events.app.unpublished(app);
+        yield backend_core_1.events.app.unpublished(app);
     }
     else {
         yield pro_1.quotas.removeApp();
-        yield backend_core_2.events.app.deleted(app);
+        yield backend_core_1.events.app.deleted(app);
     }
     /* istanbul ignore next */
     if (!environment_1.default.isTest() && !isUnpublish) {
@@ -433,7 +429,7 @@ const destroyApp = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     else {
         yield (0, workerRequests_1.removeAppFromUserRoles)(ctx, appId);
     }
-    yield appCache.invalidateAppMetadata(appId);
+    yield backend_core_1.cache.app.invalidateAppMetadata(appId);
     return result;
 });
 const preDestroyApp = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
@@ -464,19 +460,15 @@ const sync = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
         return next();
     }
     const appId = ctx.params.appId;
-    if (!isDevAppID(appId)) {
+    if (!backend_core_1.db.isDevAppID(appId)) {
         ctx.throw(400, "This action cannot be performed for production apps");
     }
     // replicate prod to dev
-    const prodAppId = getProdAppID(appId);
-    try {
-        // specific case, want to make sure setup is skipped
-        const prodDb = backend_core_1.context.getProdAppDB({ skip_setup: true });
-        const info = yield prodDb.info();
-        if (info.error)
-            throw info.error;
-    }
-    catch (err) {
+    const prodAppId = backend_core_1.db.getProdAppID(appId);
+    // specific case, want to make sure setup is skipped
+    const prodDb = backend_core_1.context.getProdAppDB({ skip_setup: true });
+    const exists = yield prodDb.exists();
+    if (!exists) {
         // the database doesn't exist. Don't replicate
         ctx.status = 200;
         ctx.body = {
@@ -484,7 +476,7 @@ const sync = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
         };
         return next();
     }
-    const replication = new Replication({
+    const replication = new backend_core_1.db.Replication({
         source: prodAppId,
         target: appId,
     });
@@ -523,7 +515,7 @@ const updateAppPackage = (appPackage, appId) => __awaiter(void 0, void 0, void 0
         delete newAppPackage.lockedBy;
         yield db.put(newAppPackage);
         // remove any cached metadata, so that it will be updated
-        yield appCache.invalidateAppMetadata(appId);
+        yield backend_core_1.cache.app.invalidateAppMetadata(appId);
         return newAppPackage;
     }));
 });

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

@@ -14,12 +14,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deployApp = exports.deploymentProgress = exports.fetchDeployments = void 0;
 const Deployment_1 = __importDefault(require("./Deployment"));
-const db_1 = require("@budibase/backend-core/db");
+const backend_core_1 = require("@budibase/backend-core");
 const utils_1 = require("../../../db/utils");
 const utils_2 = require("../../../automations/utils");
-const cache_1 = require("@budibase/backend-core/cache");
-const context_1 = require("@budibase/backend-core/context");
-const backend_core_1 = require("@budibase/backend-core");
 const pro_1 = require("@budibase/pro");
 const types_1 = require("@budibase/types");
 // the max time we can wait for an invalidation to complete before considering it failed
@@ -49,7 +46,7 @@ function checkAllDeployments(deployments) {
 function storeDeploymentHistory(deployment) {
     return __awaiter(this, void 0, void 0, function* () {
         const deploymentJSON = deployment.getJSON();
-        const db = (0, context_1.getAppDB)();
+        const db = backend_core_1.context.getAppDB();
         let deploymentDoc;
         try {
             // theres only one deployment doc per app database
@@ -70,7 +67,7 @@ function storeDeploymentHistory(deployment) {
 }
 function initDeployedApp(prodAppId) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = (0, context_1.getProdAppDB)();
+        const db = backend_core_1.context.getProdAppDB();
         console.log("Reading automation docs");
         const automations = (yield db.allDocs((0, utils_1.getAutomationParams)(null, {
             include_docs: true,
@@ -93,9 +90,9 @@ function deployApp(deployment, userId) {
     return __awaiter(this, void 0, void 0, function* () {
         let replication;
         try {
-            const appId = (0, context_1.getAppId)();
-            const devAppId = (0, db_1.getDevelopmentAppID)(appId);
-            const productionAppId = (0, db_1.getProdAppID)(appId);
+            const appId = backend_core_1.context.getAppId();
+            const devAppId = backend_core_1.db.getDevelopmentAppID(appId);
+            const productionAppId = backend_core_1.db.getProdAppID(appId);
             // don't try this if feature isn't allowed, will error
             if (yield pro_1.backups.isEnabled()) {
                 // trigger backup initially
@@ -107,8 +104,8 @@ function deployApp(deployment, userId) {
                 source: devAppId,
                 target: productionAppId,
             };
-            replication = new db_1.Replication(config);
-            const devDb = (0, context_1.getDevAppDB)();
+            replication = new backend_core_1.db.Replication(config);
+            const devDb = backend_core_1.context.getDevAppDB();
             console.log("Compacting development DB");
             yield devDb.compact();
             console.log("Replication object created");
@@ -116,7 +113,7 @@ function deployApp(deployment, userId) {
             console.log("replication complete.. replacing app meta doc");
             // app metadata is excluded as it is likely to be in conflict
             // replicate the app metadata document manually
-            const db = (0, context_1.getProdAppDB)();
+            const db = backend_core_1.context.getProdAppDB();
             const appDoc = yield devDb.get(utils_1.DocumentType.APP_METADATA);
             try {
                 const prodAppDoc = yield db.get(utils_1.DocumentType.APP_METADATA);
@@ -132,7 +129,7 @@ function deployApp(deployment, userId) {
             // remove automation errors if they exist
             delete appDoc.automationErrors;
             yield db.put(appDoc);
-            yield cache_1.app.invalidateAppMetadata(productionAppId);
+            yield backend_core_1.cache.app.invalidateAppMetadata(productionAppId);
             console.log("New app doc written successfully.");
             yield initDeployedApp(productionAppId);
             console.log("Deployed app initialised, setting deployment to successful");
@@ -155,7 +152,7 @@ function deployApp(deployment, userId) {
 function fetchDeployments(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
-            const db = (0, context_1.getAppDB)();
+            const db = backend_core_1.context.getAppDB();
             const deploymentDoc = yield db.get(utils_1.DocumentType.DEPLOYMENTS);
             const { updated, deployments } = yield checkAllDeployments(deploymentDoc);
             if (updated) {
@@ -172,7 +169,7 @@ exports.fetchDeployments = fetchDeployments;
 function deploymentProgress(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
-            const db = (0, context_1.getAppDB)();
+            const db = backend_core_1.context.getAppDB();
             const deploymentDoc = yield db.get(utils_1.DocumentType.DEPLOYMENTS);
             ctx.body = deploymentDoc[ctx.params.deploymentId];
         }
@@ -184,7 +181,7 @@ function deploymentProgress(ctx) {
 exports.deploymentProgress = deploymentProgress;
 const isFirstDeploy = () => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const db = (0, context_1.getProdAppDB)();
+        const db = backend_core_1.context.getProdAppDB();
         yield db.get(utils_1.DocumentType.APP_METADATA);
     }
     catch (e) {

package/dist/api/controllers/dev.js

@@ -8,24 +8,27 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const fetch = require("node-fetch");
-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 { DocumentType } = require("../../db/utils");
-const { app: appCache } = require("@budibase/backend-core/cache");
-const { getProdAppDB, getAppDB } = require("@budibase/backend-core/context");
-const { events } = require("@budibase/backend-core");
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getBudibaseVersion = exports.revert = exports.clearLock = exports.buildRedirectDelete = exports.buildRedirectPost = exports.buildRedirectGet = void 0;
+const node_fetch_1 = __importDefault(require("node-fetch"));
+const environment_1 = __importDefault(require("../../environment"));
+const utilities_1 = require("../../utilities");
+const workerRequests_1 = require("../../utilities/workerRequests");
+const redis_1 = require("../../utilities/redis");
+const utils_1 = require("../../db/utils");
+const backend_core_1 = require("@budibase/backend-core");
+const backend_core_2 = require("@budibase/backend-core");
 function redirect(ctx, method, path = "global") {
     return __awaiter(this, void 0, void 0, function* () {
         const { devPath } = ctx.params;
         const queryString = ctx.originalUrl.split("?")[1] || "";
-        const response = yield fetch(checkSlashesInUrl(`${env.WORKER_URL}/api/${path}/${devPath}?${queryString}`), request(ctx, {
+        const response = yield (0, node_fetch_1.default)((0, utilities_1.checkSlashesInUrl)(`${environment_1.default.WORKER_URL}/api/${path}/${devPath}?${queryString}`), (0, workerRequests_1.request)(ctx, {
             method,
             body: ctx.request.body,
-        }, true));
+        }));
         if (response.status !== 200) {
             const err = yield response.text();
             ctx.throw(400, err);
@@ -48,84 +51,96 @@ function redirect(ctx, method, path = "global") {
         ctx.cookies;
     });
 }
-exports.buildRedirectGet = path => {
-    return (ctx) => __awaiter(void 0, void 0, void 0, function* () {
+function buildRedirectGet(path) {
+    return (ctx) => __awaiter(this, void 0, void 0, function* () {
         yield redirect(ctx, "GET", path);
     });
-};
-exports.buildRedirectPost = path => {
-    return (ctx) => __awaiter(void 0, void 0, void 0, function* () {
+}
+exports.buildRedirectGet = buildRedirectGet;
+function buildRedirectPost(path) {
+    return (ctx) => __awaiter(this, void 0, void 0, function* () {
         yield redirect(ctx, "POST", path);
     });
-};
-exports.buildRedirectDelete = path => {
-    return (ctx) => __awaiter(void 0, void 0, void 0, function* () {
+}
+exports.buildRedirectPost = buildRedirectPost;
+function buildRedirectDelete(path) {
+    return (ctx) => __awaiter(this, void 0, void 0, function* () {
         yield redirect(ctx, "DELETE", path);
     });
-};
-exports.clearLock = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const { appId } = ctx.params;
-    try {
-        yield clearLock(appId, ctx.user);
-    }
-    catch (err) {
-        ctx.throw(400, `Unable to remove lock. ${err}`);
-    }
-    ctx.body = {
-        message: "Lock released successfully.",
-    };
-});
-exports.revert = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const { appId } = ctx.params;
-    const productionAppId = getProdAppID(appId);
-    // App must have been deployed first
-    try {
-        const db = getProdAppDB({ skip_setup: true });
-        const info = yield db.info();
-        if (info.error) {
-            throw info.error;
+}
+exports.buildRedirectDelete = buildRedirectDelete;
+function clearLock(ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { appId } = ctx.params;
+        try {
+            yield (0, redis_1.clearLock)(appId, ctx.user);
         }
-        const deploymentDoc = yield db.get(DocumentType.DEPLOYMENTS);
-        if (!deploymentDoc.history ||
-            Object.keys(deploymentDoc.history).length === 0) {
-            throw new Error("No deployments for app");
+        catch (err) {
+            ctx.throw(400, `Unable to remove lock. ${err}`);
         }
-    }
-    catch (err) {
-        return ctx.throw(400, "App has not yet been deployed");
-    }
-    const replication = new Replication({
-        source: productionAppId,
-        target: appId,
+        ctx.body = {
+            message: "Lock released successfully.",
+        };
     });
-    try {
-        if (env.COUCH_DB_URL) {
-            // in-memory db stalls on rollback
-            yield replication.rollback();
+}
+exports.clearLock = clearLock;
+function revert(ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { appId } = ctx.params;
+        const productionAppId = backend_core_2.db.getProdAppID(appId);
+        // App must have been deployed first
+        try {
+            const db = backend_core_1.context.getProdAppDB({ skip_setup: true });
+            const exists = yield db.exists();
+            if (!exists) {
+                throw new Error("App must be deployed to be reverted.");
+            }
+            const deploymentDoc = yield db.get(utils_1.DocumentType.DEPLOYMENTS);
+            if (!deploymentDoc.history ||
+                Object.keys(deploymentDoc.history).length === 0) {
+                throw new Error("No deployments for app");
+            }
+        }
+        catch (err) {
+            return ctx.throw(400, "App has not yet been deployed");
+        }
+        const replication = new backend_core_2.db.Replication({
+            source: productionAppId,
+            target: appId,
+        });
+        try {
+            if (environment_1.default.COUCH_DB_URL) {
+                // in-memory db stalls on rollback
+                yield replication.rollback();
+            }
+            // update appID in reverted app to be dev version again
+            const db = backend_core_1.context.getAppDB();
+            const appDoc = yield db.get(utils_1.DocumentType.APP_METADATA);
+            appDoc.appId = appId;
+            appDoc.instance._id = appId;
+            yield db.put(appDoc);
+            yield backend_core_2.cache.app.invalidateAppMetadata(appId);
+            ctx.body = {
+                message: "Reverted changes successfully.",
+            };
+            yield backend_core_2.events.app.reverted(appDoc);
+        }
+        catch (err) {
+            ctx.throw(400, `Unable to revert. ${err}`);
         }
-        // update appID in reverted app to be dev version again
-        const db = getAppDB();
-        const appDoc = yield db.get(DocumentType.APP_METADATA);
-        appDoc.appId = appId;
-        appDoc.instance._id = appId;
-        yield db.put(appDoc);
-        yield appCache.invalidateAppMetadata(appId);
+        finally {
+            yield replication.close();
+        }
+    });
+}
+exports.revert = revert;
+function getBudibaseVersion(ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const version = require("../../../package.json").version;
         ctx.body = {
-            message: "Reverted changes successfully.",
+            version,
         };
-        yield events.app.reverted(appDoc);
-    }
-    catch (err) {
-        ctx.throw(400, `Unable to revert. ${err}`);
-    }
-    finally {
-        yield replication.close();
-    }
-});
-exports.getBudibaseVersion = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const version = require("../../../package.json").version;
-    ctx.body = {
-        version,
-    };
-    yield events.installation.versionChecked(version);
-});
+        yield backend_core_2.events.installation.versionChecked(version);
+    });
+}
+exports.getBudibaseVersion = getBudibaseVersion;

package/dist/api/controllers/public/applications.js

@@ -33,8 +33,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.destroy = exports.update = exports.read = exports.create = exports.search = void 0;
-const { getAllApps } = require("@budibase/backend-core/db");
-const { doInAppContext } = require("@budibase/backend-core/context");
+const backend_core_1 = require("@budibase/backend-core");
 const utils_1 = require("./utils");
 const controller = __importStar(require("../application"));
 function fixAppID(app, params) {
@@ -47,17 +46,26 @@ function fixAppID(app, params) {
     return app;
 }
 function setResponseApp(ctx) {
+    var _a;
     return __awaiter(this, void 0, void 0, function* () {
-        if (ctx.body && ctx.body.appId && (!ctx.params || !ctx.params.appId)) {
-            ctx.params = { appId: ctx.body.appId };
+        const appId = (_a = ctx.body) === null || _a === void 0 ? void 0 : _a.appId;
+        if (appId && (!ctx.params || !ctx.params.appId)) {
+            ctx.params = { appId };
+        }
+        if (appId) {
+            yield backend_core_1.context.doInContext(appId, () => {
+                return controller.fetchAppPackage(ctx);
+            });
+        }
+        else {
+            return controller.fetchAppPackage(ctx);
         }
-        yield controller.fetchAppPackage(ctx);
     });
 }
 function search(ctx, next) {
     return __awaiter(this, void 0, void 0, function* () {
         const { name } = ctx.request.body;
-        const apps = yield getAllApps({ all: true });
+        const apps = yield backend_core_1.db.getAllApps({ all: true });
         ctx.body = (0, utils_1.search)(apps, name);
         yield next();
     });
@@ -76,7 +84,7 @@ function create(ctx, next) {
 exports.create = create;
 function read(ctx, next) {
     return __awaiter(this, void 0, void 0, function* () {
-        yield doInAppContext(ctx.params.appId, () => __awaiter(this, void 0, void 0, function* () {
+        yield backend_core_1.context.doInAppContext(ctx.params.appId, () => __awaiter(this, void 0, void 0, function* () {
             yield setResponseApp(ctx);
             yield next();
         }));
@@ -86,7 +94,7 @@ exports.read = read;
 function update(ctx, next) {
     return __awaiter(this, void 0, void 0, function* () {
         ctx.request.body = yield (0, utils_1.addRev)(fixAppID(ctx.request.body, ctx.params));
-        yield doInAppContext(ctx.params.appId, () => __awaiter(this, void 0, void 0, function* () {
+        yield backend_core_1.context.doInAppContext(ctx.params.appId, () => __awaiter(this, void 0, void 0, function* () {
             yield controller.update(ctx);
             yield setResponseApp(ctx);
             yield next();
@@ -96,7 +104,7 @@ function update(ctx, next) {
 exports.update = update;
 function destroy(ctx, next) {
     return __awaiter(this, void 0, void 0, function* () {
-        yield doInAppContext(ctx.params.appId, () => __awaiter(this, void 0, void 0, function* () {
+        yield backend_core_1.context.doInAppContext(ctx.params.appId, () => __awaiter(this, void 0, void 0, function* () {
             // get the app before deleting it
             yield setResponseApp(ctx);
             const body = ctx.body;