@budibase/server 1.0.123-alpha.0 → 1.0.123

package/dist/api/controllers/application.js

@@ -8,50 +8,42 @@ 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.sync = exports.destroy = exports.revertClient = exports.updateClient = exports.update = exports.create = exports.fetchAppPackage = exports.fetchAppDefinition = exports.fetch = exports.getAppUrl = void 0;
-const environment_1 = __importDefault(require("../../environment"));
-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 env = require("../../environment");
+const packageJson = require("../../../package.json");
+const { createLinkView, createRoutingView, createAllSearchIndex, } = require("../../db/views/staticViews");
+const { getTemplateStream, createApp, deleteApp, } = require("../../utilities/fileSystem");
+const { generateAppID, getLayoutParams, getScreenParams, generateDevAppID, DocumentTypes, AppStatus, } = require("../../db/utils");
 const { BUILTIN_ROLE_IDS, AccessController, } = require("@budibase/backend-core/roles");
-const layouts_1 = require("../../constants/layouts");
-const fp_1 = require("lodash/fp");
+const { BASE_LAYOUTS } = require("../../constants/layouts");
+const { cloneDeep } = require("lodash/fp");
 const { processObject } = require("@budibase/string-templates");
 const { getAllApps, isDevAppID, getProdAppID, Replication, } = require("@budibase/backend-core/db");
-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 { USERS_TABLE_SCHEMA } = require("../../constants");
+const { removeAppFromUserRoles } = require("../../utilities/workerRequests");
+const { clientLibraryPath, stringToReadStream } = require("../../utilities");
+const { getAllLocks } = require("../../utilities/redis");
+const { updateClientLibrary, backupClientLibrary, revertClientLibrary, } = require("../../utilities/fileSystem/clientLibrary");
 const { getTenantId, isMultiTenant } = require("@budibase/backend-core/tenancy");
-const user_1 = require("./user");
+const { syncGlobalUsers } = require("./user");
 const { app: appCache } = require("@budibase/backend-core/cache");
-const utils_2 = require("../../automations/utils");
+const { cleanupAutomations } = require("../../automations/utils");
 const { getAppDB, getProdAppDB, updateAppId, } = require("@budibase/backend-core/context");
-const rows_1 = require("../../utilities/usageQuota/rows");
-const pro_1 = require("@budibase/pro");
-const backend_core_1 = require("@budibase/backend-core");
 const URL_REGEX_SLASH = /\/|\\/g;
 // utility function, need to do away with this
 function getLayouts() {
     return __awaiter(this, void 0, void 0, function* () {
         const db = getAppDB();
-        return (yield db.allDocs((0, utils_1.getLayoutParams)(null, {
+        return (yield db.allDocs(getLayoutParams(null, {
             include_docs: true,
-        }))).rows.map((row) => row.doc);
+        }))).rows.map(row => row.doc);
     });
 }
 function getScreens() {
     return __awaiter(this, void 0, void 0, function* () {
         const db = getAppDB();
-        return (yield db.allDocs((0, utils_1.getScreenParams)(null, {
+        return (yield db.allDocs(getScreenParams(null, {
             include_docs: true,
-        }))).rows.map((row) => row.doc);
+        }))).rows.map(row => row.doc);
     });
 }
 function getUserRoleId(ctx) {
@@ -59,7 +51,7 @@ function getUserRoleId(ctx) {
         ? BUILTIN_ROLE_IDS.PUBLIC
         : ctx.user.role._id;
 }
-const getAppUrl = (ctx) => {
+exports.getAppUrl = ctx => {
     // construct the url
     let url;
     if (ctx.request.body.url) {
@@ -75,12 +67,11 @@ const getAppUrl = (ctx) => {
     }
     return url;
 };
-exports.getAppUrl = getAppUrl;
 const checkAppUrl = (ctx, apps, url, currentAppId) => {
     if (currentAppId) {
-        apps = apps.filter((app) => app.appId !== currentAppId);
+        apps = apps.filter(app => app.appId !== currentAppId);
     }
-    if (apps.some((app) => app.url === url)) {
+    if (apps.some(app => app.url === url)) {
         ctx.throw(400, "App URL is already in use.");
     }
 };
@@ -90,17 +81,17 @@ const checkAppName = (ctx, apps, name, currentAppId) => {
         ctx.throw(400, "Name is required");
     }
     if (currentAppId) {
-        apps = apps.filter((app) => app.appId !== currentAppId);
+        apps = apps.filter(app => app.appId !== currentAppId);
     }
-    if (apps.some((app) => app.name === name)) {
+    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 = (0, utils_1.generateAppID)(tenantId);
-        const appId = (0, utils_1.generateDevAppID)(baseAppId);
+        const baseAppId = generateAppID(tenantId);
+        const appId = generateDevAppID(baseAppId);
         yield updateAppId(appId);
         const db = getAppDB();
         yield db.put({
@@ -111,43 +102,43 @@ function createInstance(template) {
         });
         // NOTE: indexes need to be created before any tables/templates
         // add view for linked rows
-        yield (0, staticViews_1.createLinkView)();
-        yield (0, staticViews_1.createRoutingView)();
-        yield (0, staticViews_1.createAllSearchIndex)();
+        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) {
-            const { ok } = yield db.load((0, utilities_1.stringToReadStream)(template.templateString));
+            const { ok } = yield db.load(stringToReadStream(template.templateString));
             if (!ok) {
                 throw "Error loading database dump from memory.";
             }
         }
         else if (template && template.useTemplate === "true") {
             /* istanbul ignore next */
-            const { ok } = yield db.load(yield (0, fileSystem_1.getTemplateStream)(template));
+            const { ok } = yield db.load(yield getTemplateStream(template));
             if (!ok) {
                 throw "Error loading database dump from template.";
             }
         }
         else {
             // create the users table
-            yield db.put(constants_1.USERS_TABLE_SCHEMA);
+            yield db.put(USERS_TABLE_SCHEMA);
         }
         return { _id: appId };
     });
 }
-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;
+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({ dev, all });
     // get the locks for all the dev apps
     if (dev || all) {
-        const locks = yield (0, redis_1.getAllLocks)();
+        const locks = yield getAllLocks();
         for (let app of apps) {
             if (app.status !== "development") {
                 continue;
             }
-            const lock = locks.find((lock) => lock.appId === app.appId);
+            const lock = locks.find(lock => lock.appId === app.appId);
             if (lock) {
                 app.lockedBy = lock.user;
             }
@@ -159,8 +150,7 @@ const fetch = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     }
     ctx.body = apps;
 });
-exports.fetch = fetch;
-const fetchAppDefinition = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
+exports.fetchAppDefinition = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const layouts = yield getLayouts();
     const userRoleId = getUserRoleId(ctx);
     const accessController = new AccessController();
@@ -171,10 +161,9 @@ const fetchAppDefinition = (ctx) => __awaiter(void 0, void 0, void 0, function*
         libraries: ["@budibase/standard-components"],
     };
 });
-exports.fetchAppDefinition = fetchAppDefinition;
-const fetchAppPackage = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
+exports.fetchAppPackage = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const db = getAppDB();
-    const application = yield db.get(utils_1.DocumentTypes.APP_METADATA);
+    const application = yield db.get(DocumentTypes.APP_METADATA);
     const layouts = yield getLayouts();
     let screens = yield getScreens();
     // Only filter screens if the user is not a builder
@@ -187,11 +176,10 @@ const fetchAppPackage = (ctx) => __awaiter(void 0, void 0, void 0, function* ()
         application,
         screens,
         layouts,
-        clientLibPath: (0, utilities_1.clientLibraryPath)(ctx.params.appId, application.version),
+        clientLibPath: clientLibraryPath(ctx.params.appId, application.version),
     };
 });
-exports.fetchAppPackage = fetchAppPackage;
-const performAppCreate = (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);
@@ -212,18 +200,18 @@ const performAppCreate = (ctx) => __awaiter(void 0, void 0, void 0, function* ()
     let _rev;
     try {
         // if template there will be an existing doc
-        const existing = yield db.get(utils_1.DocumentTypes.APP_METADATA);
+        const existing = yield db.get(DocumentTypes.APP_METADATA);
         _rev = existing._rev;
     }
     catch (err) {
         // nothing to do
     }
     const newApplication = {
-        _id: utils_1.DocumentTypes.APP_METADATA,
+        _id: DocumentTypes.APP_METADATA,
         _rev,
         appId: instance._id,
         type: "app",
-        version: package_json_1.default.version,
+        version: packageJson.version,
         componentLibraries: ["@budibase/standard-components"],
         name: name,
         url: url,
@@ -232,7 +220,7 @@ const performAppCreate = (ctx) => __awaiter(void 0, void 0, void 0, function* ()
         tenantId: getTenantId(),
         updatedAt: new Date().toISOString(),
         createdAt: new Date().toISOString(),
-        status: utils_1.AppStatus.DEV,
+        status: AppStatus.DEV,
     };
     const response = yield db.put(newApplication, { force: true });
     newApplication._rev = response.rev;
@@ -242,44 +230,16 @@ const performAppCreate = (ctx) => __awaiter(void 0, void 0, void 0, function* ()
         yield createEmptyAppPackage(ctx, newApplication);
     }
     /* istanbul ignore next */
-    if (!environment_1.default.isTest()) {
-        yield (0, fileSystem_1.createApp)(appId);
+    if (!env.isTest()) {
+        yield createApp(appId);
     }
     yield appCache.invalidateAppMetadata(appId, newApplication);
-    return newApplication;
-});
-const appPostCreate = (ctx, appId) => __awaiter(void 0, void 0, void 0, function* () {
-    // app import & template creation
-    if (ctx.request.body.useTemplate === "true") {
-        const rows = yield (0, rows_1.getUniqueRows)([appId]);
-        const rowCount = rows ? rows.length : 0;
-        if (rowCount) {
-            try {
-                yield pro_1.quotas.addRows(rowCount);
-            }
-            catch (err) {
-                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
-                    ctx.params.appId = appId;
-                    yield destroyApp(ctx);
-                }
-                throw err;
-            }
-        }
-    }
-});
-const create = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const newApplication = yield pro_1.quotas.addApp(() => performAppCreate(ctx));
-    yield appPostCreate(ctx, newApplication.appId);
-    ctx.body = newApplication;
     ctx.status = 200;
+    ctx.body = newApplication;
 });
-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* () {
+exports.update = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const apps = yield getAllApps({ dev: true });
     // validation
     const name = ctx.request.body.name;
@@ -295,37 +255,35 @@ const update = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     ctx.status = 200;
     ctx.body = data;
 });
-exports.update = update;
-const updateClient = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
+exports.updateClient = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     // Get current app version
     const db = getAppDB();
-    const application = yield db.get(utils_1.DocumentTypes.APP_METADATA);
+    const application = yield db.get(DocumentTypes.APP_METADATA);
     const currentVersion = application.version;
     // Update client library and manifest
-    if (!environment_1.default.isTest()) {
-        yield (0, clientLibrary_1.backupClientLibrary)(ctx.params.appId);
-        yield (0, clientLibrary_1.updateClientLibrary)(ctx.params.appId);
+    if (!env.isTest()) {
+        yield backupClientLibrary(ctx.params.appId);
+        yield updateClientLibrary(ctx.params.appId);
     }
     // Update versions in app package
     const appPackageUpdates = {
-        version: package_json_1.default.version,
+        version: packageJson.version,
         revertableVersion: currentVersion,
     };
     const data = yield updateAppPackage(appPackageUpdates, ctx.params.appId);
     ctx.status = 200;
     ctx.body = data;
 });
-exports.updateClient = updateClient;
-const revertClient = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
+exports.revertClient = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     // Check app can be reverted
     const db = getAppDB();
-    const application = yield db.get(utils_1.DocumentTypes.APP_METADATA);
+    const application = yield db.get(DocumentTypes.APP_METADATA);
     if (!application.revertableVersion) {
         ctx.throw(400, "There is no version to revert to");
     }
     // Update client library and manifest
-    if (!environment_1.default.isTest()) {
-        yield (0, clientLibrary_1.revertClientLibrary)(ctx.params.appId);
+    if (!env.isTest()) {
+        yield revertClientLibrary(ctx.params.appId);
     }
     // Update versions in app package
     const appPackageUpdates = {
@@ -336,52 +294,23 @@ const revertClient = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     ctx.status = 200;
     ctx.body = data;
 });
-exports.revertClient = revertClient;
-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);
-    }
-    const db = isUnpublish ? getProdAppDB() : getAppDB();
+exports.delete = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
+    const db = getAppDB();
     const result = yield db.destroy();
-    if (isUnpublish) {
-        yield pro_1.quotas.removePublishedApp();
-    }
-    else {
-        yield pro_1.quotas.removeApp();
-    }
     /* istanbul ignore next */
-    if (!environment_1.default.isTest() && !isUnpublish) {
-        yield (0, fileSystem_1.deleteApp)(appId);
+    if (!env.isTest() && !ctx.query.unpublish) {
+        yield deleteApp(ctx.params.appId);
     }
-    if (isUnpublish) {
-        yield (0, utils_2.cleanupAutomations)(appId);
+    if (ctx.query && ctx.query.unpublish) {
+        yield cleanupAutomations(ctx.params.appId);
     }
     // make sure the app/role doesn't stick around after the app has been deleted
-    yield (0, workerRequests_1.removeAppFromUserRoles)(ctx, appId);
-    yield appCache.invalidateAppMetadata(appId);
-    return result;
-});
-const preDestroyApp = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const rows = yield (0, rows_1.getUniqueRows)([ctx.params.appId]);
-    ctx.rowCount = rows.length;
-});
-const postDestroyApp = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const rowCount = ctx.rowCount;
-    if (rowCount) {
-        yield pro_1.quotas.removeRows(rowCount);
-    }
-});
-const destroy = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    yield preDestroyApp(ctx);
-    const result = yield destroyApp(ctx);
-    yield postDestroyApp(ctx);
+    yield removeAppFromUserRoles(ctx, ctx.params.appId);
+    yield appCache.invalidateAppMetadata(ctx.params.appId);
     ctx.status = 200;
     ctx.body = result;
 });
-exports.destroy = destroy;
-const sync = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
+exports.sync = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
     const appId = ctx.params.appId;
     if (!isDevAppID(appId)) {
         ctx.throw(400, "This action cannot be performed for production apps");
@@ -411,7 +340,7 @@ const sync = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         yield replication.replicate({
             filter: function (doc) {
-                return doc._id !== utils_1.DocumentTypes.APP_METADATA;
+                return doc._id !== DocumentTypes.APP_METADATA;
             },
         });
     }
@@ -422,7 +351,7 @@ const sync = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
         yield replication.close();
     }
     // sync the users
-    yield (0, user_1.syncGlobalUsers)();
+    yield syncGlobalUsers();
     if (error) {
         ctx.throw(400, error);
     }
@@ -432,10 +361,9 @@ const sync = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
         };
     }
 });
-exports.sync = sync;
 const updateAppPackage = (appPackage, appId) => __awaiter(void 0, void 0, void 0, function* () {
     const db = getAppDB();
-    const application = yield db.get(utils_1.DocumentTypes.APP_METADATA);
+    const application = yield db.get(DocumentTypes.APP_METADATA);
     const newAppPackage = Object.assign(Object.assign({}, application), appPackage);
     if (appPackage._rev !== application._rev) {
         newAppPackage._rev = application._rev;
@@ -451,8 +379,8 @@ const updateAppPackage = (appPackage, appId) => __awaiter(void 0, void 0, void 0
 const createEmptyAppPackage = (ctx, app) => __awaiter(void 0, void 0, void 0, function* () {
     const db = getAppDB();
     let screensAndLayouts = [];
-    for (let layout of layouts_1.BASE_LAYOUTS) {
-        const cloned = (0, fp_1.cloneDeep)(layout);
+    for (let layout of BASE_LAYOUTS) {
+        const cloned = cloneDeep(layout);
         screensAndLayouts.push(yield processObject(cloned, app));
     }
     yield db.bulkDocs(screensAndLayouts);

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

@@ -8,18 +8,12 @@ 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.deployApp = exports.deploymentProgress = exports.fetchDeployments = void 0;
-const Deployment_1 = __importDefault(require("./Deployment"));
-const db_1 = require("@budibase/backend-core/db");
-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 pro_1 = require("@budibase/pro");
+const Deployment = require("./Deployment");
+const { Replication, getProdAppID, getDevelopmentAppID, } = 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 = {
@@ -31,8 +25,7 @@ const DeploymentStatus = {
 function checkAllDeployments(deployments) {
     return __awaiter(this, void 0, void 0, function* () {
         let updated = false;
-        let deployment;
-        for (deployment of Object.values(deployments.history)) {
+        for (let deployment of Object.values(deployments.history)) {
             // check that no deployments have crashed etc and are now stuck
             if (deployment.status === DeploymentStatus.PENDING &&
                 Date.now() - deployment.updatedAt > MAX_PENDING_TIME_MS) {
@@ -47,14 +40,14 @@ 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 = getAppDB();
         let deploymentDoc;
         try {
             // theres only one deployment doc per app database
-            deploymentDoc = yield db.get(utils_1.DocumentTypes.DEPLOYMENTS);
+            deploymentDoc = yield db.get(DocumentTypes.DEPLOYMENTS);
         }
         catch (err) {
-            deploymentDoc = { _id: utils_1.DocumentTypes.DEPLOYMENTS, history: {} };
+            deploymentDoc = { _id: DocumentTypes.DEPLOYMENTS, history: {} };
         }
         const deploymentId = deploymentJSON._id;
         // first time deployment
@@ -68,19 +61,19 @@ function storeDeploymentHistory(deployment) {
 }
 function initDeployedApp(prodAppId) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = (0, context_1.getProdAppDB)();
+        const db = getProdAppDB();
         console.log("Reading automation docs");
-        const automations = (yield db.allDocs((0, utils_1.getAutomationParams)(null, {
+        const automations = (yield db.allDocs(getAutomationParams(null, {
             include_docs: true,
-        }))).rows.map((row) => row.doc);
+        }))).rows.map(row => row.doc);
         console.log("You have " + automations.length + " automations");
         const promises = [];
         console.log("Disabling prod crons..");
-        yield (0, utils_2.disableAllCrons)(prodAppId);
+        yield disableAllCrons(prodAppId);
         console.log("Prod Cron triggers disabled..");
         console.log("Enabling cron triggers for deployed app..");
         for (let automation of automations) {
-            promises.push((0, utils_2.enableCronTrigger)(prodAppId, automation));
+            promises.push(enableCronTrigger(prodAppId, automation));
         }
         yield Promise.all(promises);
         console.log("Enabled cron triggers for deployed app..");
@@ -90,24 +83,22 @@ function deployApp(deployment) {
     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 config = {
+            const appId = getAppId();
+            const devAppId = getDevelopmentAppID(appId);
+            const productionAppId = getProdAppID(appId);
+            replication = new Replication({
                 source: devAppId,
                 target: productionAppId,
-            };
-            replication = new db_1.Replication(config);
+            });
             console.log("Replication object created");
             yield replication.replicate();
             console.log("replication complete.. replacing app meta doc");
-            const db = (0, context_1.getProdAppDB)();
-            const appDoc = yield db.get(utils_1.DocumentTypes.APP_METADATA);
-            deployment.appUrl = appDoc.url;
+            const db = getProdAppDB();
+            const appDoc = yield db.get(DocumentTypes.APP_METADATA);
             appDoc.appId = productionAppId;
             appDoc.instance._id = productionAppId;
             yield db.put(appDoc);
-            yield cache_1.app.invalidateAppMetadata(productionAppId);
+            yield appCache.invalidateAppMetadata(productionAppId);
             console.log("New app doc written successfully.");
             yield initDeployedApp(productionAppId);
             console.log("Deployed app initialised, setting deployment to successful");
@@ -120,18 +111,16 @@ function deployApp(deployment) {
             throw Object.assign(Object.assign({}, err), { message: `Deployment Failed: ${err.message}` });
         }
         finally {
-            if (replication) {
-                yield replication.close();
-            }
+            yield replication.close();
         }
     });
 }
-function fetchDeployments(ctx) {
+exports.fetchDeployments = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
-            const db = (0, context_1.getAppDB)();
-            const deploymentDoc = yield db.get(utils_1.DocumentTypes.DEPLOYMENTS);
-            const { updated, deployments } = yield checkAllDeployments(deploymentDoc);
+            const db = getAppDB();
+            const deploymentDoc = yield db.get(DocumentTypes.DEPLOYMENTS);
+            const { updated, deployments } = yield checkAllDeployments(deploymentDoc, ctx.user);
             if (updated) {
                 yield db.put(deployments);
             }
@@ -141,50 +130,29 @@ function fetchDeployments(ctx) {
             ctx.body = [];
         }
     });
-}
-exports.fetchDeployments = fetchDeployments;
-function deploymentProgress(ctx) {
+};
+exports.deploymentProgress = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
-            const db = (0, context_1.getAppDB)();
-            const deploymentDoc = yield db.get(utils_1.DocumentTypes.DEPLOYMENTS);
+            const db = getAppDB();
+            const deploymentDoc = yield db.get(DocumentTypes.DEPLOYMENTS);
             ctx.body = deploymentDoc[ctx.params.deploymentId];
         }
         catch (err) {
             ctx.throw(500, `Error fetching data for deployment ${ctx.params.deploymentId}`);
         }
     });
-}
-exports.deploymentProgress = deploymentProgress;
-const isFirstDeploy = () => __awaiter(void 0, void 0, void 0, function* () {
-    try {
-        const db = (0, context_1.getProdAppDB)();
-        yield db.get(utils_1.DocumentTypes.APP_METADATA);
-    }
-    catch (e) {
-        if (e.status === 404) {
-            return true;
-        }
-        throw e;
-    }
-    return false;
-});
-const _deployApp = function (ctx) {
+};
+exports.deployApp = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        let deployment = new Deployment_1.default();
+        let deployment = new Deployment();
         console.log("Deployment object created");
         deployment.setStatus(DeploymentStatus.PENDING);
         console.log("Deployment object set to pending");
         deployment = yield storeDeploymentHistory(deployment);
         console.log("Stored deployment history");
         console.log("Deploying app...");
-        if (yield isFirstDeploy()) {
-            yield pro_1.quotas.addPublishedApp(() => deployApp(deployment));
-        }
-        else {
-            yield deployApp(deployment);
-        }
+        yield deployApp(deployment);
         ctx.body = deployment;
     });
 };
-exports.deployApp = _deployApp;