@budibase/server 1.1.7 → 1.1.10-alpha.0

package/dist/api/controllers/application.js

@@ -19,7 +19,6 @@ 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 { processObject } = require("@budibase/string-templates");
 const { CacheKeys, bustCache } = require("@budibase/backend-core/cache");
 const { getAllApps, isDevAppID, getProdAppID, Replication, } = require("@budibase/backend-core/db");
 const constants_1 = require("../../constants");
@@ -31,17 +30,17 @@ 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 { getAppDB, getProdAppDB, updateAppId, doInAppContext, } = 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 backend_core_2 = require("@budibase/backend-core");
 const types_1 = require("@budibase/types");
 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();
+        const db = backend_core_1.context.getAppDB();
         return (yield db.allDocs((0, utils_1.getLayoutParams)(null, {
             include_docs: true,
         }))).rows.map((row) => row.doc);
@@ -49,7 +48,7 @@ function getLayouts() {
 }
 function getScreens() {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = getAppDB();
+        const db = backend_core_1.context.getAppDB();
         return (yield db.allDocs((0, utils_1.getScreenParams)(null, {
             include_docs: true,
         }))).rows.map((row) => row.doc);
@@ -102,8 +101,8 @@ function createInstance(template) {
         const tenantId = isMultiTenant() ? getTenantId() : null;
         const baseAppId = (0, utils_1.generateAppID)(tenantId);
         const appId = (0, utils_1.generateDevAppID)(baseAppId);
-        yield updateAppId(appId);
-        const db = getAppDB();
+        yield backend_core_1.context.updateAppId(appId);
+        const db = backend_core_1.context.getAppDB();
         yield db.put({
             _id: "_design/database",
             // view collation information, read before writing any complex views:
@@ -174,7 +173,7 @@ const fetchAppDefinition = (ctx) => __awaiter(void 0, void 0, void 0, function*
 });
 exports.fetchAppDefinition = fetchAppDefinition;
 const fetchAppPackage = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const db = getAppDB();
+    const db = backend_core_1.context.getAppDB();
     const application = yield db.get(utils_1.DocumentTypes.APP_METADATA);
     const layouts = yield getLayouts();
     let screens = yield getScreens();
@@ -209,7 +208,7 @@ const performAppCreate = (ctx) => __awaiter(void 0, void 0, void 0, function* ()
     }
     const instance = yield createInstance(instanceConfig);
     const appId = instance._id;
-    const db = getAppDB();
+    const db = backend_core_1.context.getAppDB();
     let _rev;
     try {
         // if template there will be an existing doc
@@ -267,25 +266,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_1.events.app.templateImported(a, body.templateKey));
+            creationFns.push(a => backend_core_2.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_1.events.app.fileImported(a));
+            creationFns.push(a => backend_core_2.events.app.fileImported(a));
         }
         // unknown
         else {
             console.error("Could not determine template creation event");
         }
     }
-    creationFns.push(a => backend_core_1.events.app.created(a));
+    creationFns.push(a => backend_core_2.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_1.migrations.backPopulateMigrations({
+    yield backend_core_2.migrations.backPopulateMigrations({
         type: types_1.MigrationType.APP,
         tenantId,
         appId: app.appId,
@@ -300,7 +299,7 @@ const appPostCreate = (ctx, app) => __awaiter(void 0, void 0, void 0, function*
                 yield pro_1.quotas.addRows(rowCount);
             }
             catch (err) {
-                if (err.code && err.code === backend_core_1.errors.codes.USAGE_LIMIT_EXCEEDED) {
+                if (err.code && err.code === backend_core_2.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
@@ -335,14 +334,14 @@ const update = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
         ctx.request.body.url = url;
     }
     const app = yield updateAppPackage(ctx.request.body, ctx.params.appId);
-    yield backend_core_1.events.app.updated(app);
+    yield backend_core_2.events.app.updated(app);
     ctx.status = 200;
     ctx.body = app;
 });
 exports.update = update;
 const updateClient = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     // Get current app version
-    const db = getAppDB();
+    const db = backend_core_1.context.getAppDB();
     const application = yield db.get(utils_1.DocumentTypes.APP_METADATA);
     const currentVersion = application.version;
     // Update client library and manifest
@@ -357,14 +356,14 @@ const updateClient = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
         revertableVersion: currentVersion,
     };
     const app = yield updateAppPackage(appPackageUpdates, ctx.params.appId);
-    yield backend_core_1.events.app.versionUpdated(app, currentVersion, updatedToVersion);
+    yield backend_core_2.events.app.versionUpdated(app, currentVersion, updatedToVersion);
     ctx.status = 200;
     ctx.body = app;
 });
 exports.updateClient = updateClient;
 const revertClient = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     // Check app can be reverted
-    const db = getAppDB();
+    const db = backend_core_1.context.getAppDB();
     const application = yield db.get(utils_1.DocumentTypes.APP_METADATA);
     if (!application.revertableVersion) {
         ctx.throw(400, "There is no version to revert to");
@@ -381,7 +380,7 @@ const revertClient = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
         revertableVersion: null,
     };
     const app = yield updateAppPackage(appPackageUpdates, ctx.params.appId);
-    yield backend_core_1.events.app.versionReverted(app, currentVersion, revertedToVersion);
+    yield backend_core_2.events.app.versionReverted(app, currentVersion, revertedToVersion);
     ctx.status = 200;
     ctx.body = app;
 });
@@ -392,16 +391,16 @@ const destroyApp = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     if (isUnpublish) {
         appId = getProdAppID(appId);
     }
-    const db = isUnpublish ? getProdAppDB() : getAppDB();
+    const db = isUnpublish ? backend_core_1.context.getProdAppDB() : backend_core_1.context.getAppDB();
     const app = yield db.get(utils_1.DocumentTypes.APP_METADATA);
     const result = yield db.destroy();
     if (isUnpublish) {
         yield pro_1.quotas.removePublishedApp();
-        yield backend_core_1.events.app.unpublished(app);
+        yield backend_core_2.events.app.unpublished(app);
     }
     else {
         yield pro_1.quotas.removeApp();
-        yield backend_core_1.events.app.deleted(app);
+        yield backend_core_2.events.app.deleted(app);
     }
     /* istanbul ignore next */
     if (!environment_1.default.isTest() && !isUnpublish) {
@@ -452,7 +451,7 @@ const sync = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
     const prodAppId = getProdAppID(appId);
     try {
         // specific case, want to make sure setup is skipped
-        const prodDb = getProdAppDB({ skip_setup: true });
+        const prodDb = backend_core_1.context.getProdAppDB({ skip_setup: true });
         const info = yield prodDb.info();
         if (info.error)
             throw info.error;
@@ -496,8 +495,8 @@ 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* () {
-    return doInAppContext(appId, () => __awaiter(void 0, void 0, void 0, function* () {
-        const db = getAppDB();
+    return backend_core_1.context.doInAppContext(appId, () => __awaiter(void 0, void 0, void 0, function* () {
+        const db = backend_core_1.context.getAppDB();
         const application = yield db.get(utils_1.DocumentTypes.APP_METADATA);
         const newAppPackage = Object.assign(Object.assign({}, application), appPackage);
         if (appPackage._rev !== application._rev) {

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.1.6",
+    "version": "1.1.9",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -77,10 +77,11 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "10.0.3",
-        "@budibase/backend-core": "^1.1.6",
-        "@budibase/client": "^1.1.6",
-        "@budibase/pro": "1.1.6",
-        "@budibase/string-templates": "^1.1.6",
+        "@budibase/backend-core": "^1.1.9",
+        "@budibase/client": "^1.1.9",
+        "@budibase/pro": "1.1.9",
+        "@budibase/string-templates": "^1.1.9",
+        "@budibase/types": "^1.1.9",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",
@@ -117,7 +118,7 @@
         "koa-send": "5.0.0",
         "koa-session": "5.12.0",
         "koa-static": "5.0.0",
-        "koa2-ratelimit": "1.1.0",
+        "koa2-ratelimit": "1.1.1",
         "lodash": "4.17.21",
         "memorystream": "0.3.1",
         "mongodb": "3.6.3",
@@ -151,7 +152,6 @@
         "@babel/core": "7.17.4",
         "@babel/preset-env": "7.16.11",
         "@budibase/standard-components": "^0.9.139",
-        "@budibase/types": "^1.1.6",
         "@jest/test-sequencer": "24.9.0",
         "@types/apidoc": "0.50.0",
         "@types/bson": "4.2.0",

package/dist/tests/utilities/TestConfiguration.js

@@ -97,22 +97,31 @@ class TestConfiguration {
         cleanup(this.allApps.map(app => app.appId));
     }
     // UTILS
-    _req(config, params, controlFunc) {
+    _req(body, params, controlFunc, opts = { prodApp: false }) {
         return __awaiter(this, void 0, void 0, function* () {
+            // create a fake request ctx
             const request = {};
+            // set the app id
+            let appId;
+            if (opts.prodApp) {
+                appId = this.prodAppId;
+            }
+            else {
+                appId = this.appId;
+            }
+            request.appId = appId;
             // fake cookies, we don't need them
             request.cookies = { set: () => { }, get: () => { } };
             request.config = { jwtSecret: env.JWT_SECRET };
-            request.appId = this.appId;
-            request.user = { appId: this.appId, tenantId: TENANT_ID };
+            request.user = { appId, tenantId: TENANT_ID };
             request.query = {};
             request.request = {
-                body: config,
+                body,
             };
-            return this.doInContext(this.appId, () => __awaiter(this, void 0, void 0, function* () {
-                if (params) {
-                    request.params = params;
-                }
+            if (params) {
+                request.params = params;
+            }
+            return this.doInContext(appId, () => __awaiter(this, void 0, void 0, function* () {
                 yield controlFunc(request);
                 return request.body;
             }));
@@ -280,7 +289,6 @@ class TestConfiguration {
             yield context.updateAppId(this.appId);
             // create production app
             this.prodApp = yield this.deploy();
-            this.prodAppId = this.prodApp.appId;
             this.allApps.push(this.prodApp);
             this.allApps.push(this.app);
             return this.app;
@@ -290,8 +298,9 @@ class TestConfiguration {
         return __awaiter(this, void 0, void 0, function* () {
             yield this._req(null, null, controllers.deploy.deployApp);
             const prodAppId = this.getAppId().replace("_dev", "");
+            this.prodAppId = prodAppId;
             return context.doInAppContext(prodAppId, () => __awaiter(this, void 0, void 0, function* () {
-                const appPackage = yield this._req(null, { appId: prodAppId }, controllers.app.fetchAppPackage);
+                const appPackage = yield this._req(null, { appId: prodAppId }, controllers.app.fetchAppPackage, { prodApp: true });
                 return appPackage.application;
             }));
         });