@budibase/server 2.1.40-alpha.4 → 2.1.41

package/dist/api/controllers/apikeys.js

@@ -8,13 +8,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.update = exports.fetch = void 0;
-const backend_core_1 = require("@budibase/backend-core");
-const KEYS_DOC = backend_core_1.db.StaticDatabases.GLOBAL.docs.apiKeys;
+const { StaticDatabases } = require("@budibase/backend-core/db");
+const { getGlobalDB } = require("@budibase/backend-core/tenancy");
+const KEYS_DOC = StaticDatabases.GLOBAL.docs.apiKeys;
 function getBuilderMainDoc() {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = backend_core_1.tenancy.getGlobalDB();
+        const db = getGlobalDB();
         try {
             return yield db.get(KEYS_DOC);
         }
@@ -30,11 +29,11 @@ function setBuilderMainDoc(doc) {
     return __awaiter(this, void 0, void 0, function* () {
         // make sure to override the ID
         doc._id = KEYS_DOC;
-        const db = backend_core_1.tenancy.getGlobalDB();
+        const db = getGlobalDB();
         return db.put(doc);
     });
 }
-function fetch(ctx) {
+exports.fetch = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
             const mainDoc = yield getBuilderMainDoc();
@@ -45,9 +44,8 @@ function fetch(ctx) {
             ctx.throw(400, err);
         }
     });
-}
-exports.fetch = fetch;
-function update(ctx) {
+};
+exports.update = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const key = ctx.params.key;
         const value = ctx.request.body.value;
@@ -68,5 +66,4 @@ function update(ctx) {
             ctx.throw(400, err);
         }
     });
-}
-exports.update = update;
+};

package/dist/api/controllers/application.js

@@ -18,18 +18,23 @@ 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 backend_core_1 = require("@budibase/backend-core");
+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 constants_1 = require("../../constants");
-const datasource_bb_default_1 = require("../../db/defaultData/datasource_bb_default");
 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");
@@ -54,7 +59,7 @@ function getScreens() {
 }
 function getUserRoleId(ctx) {
     return !ctx.user.role || !ctx.user.role._id
-        ? backend_core_1.roles.BUILTIN_ROLE_IDS.PUBLIC
+        ? BUILTIN_ROLE_IDS.PUBLIC
         : ctx.user.role._id;
 }
 const getAppUrl = (ctx) => {
@@ -94,9 +99,9 @@ const checkAppName = (ctx, apps, name, currentAppId) => {
         ctx.throw(400, "App name is already in use.");
     }
 };
-function createInstance(template, includeSampleData) {
+function createInstance(template) {
     return __awaiter(this, void 0, void 0, function* () {
-        const tenantId = backend_core_1.tenancy.isMultiTenant() ? backend_core_1.tenancy.getTenantId() : null;
+        const tenantId = isMultiTenant() ? getTenantId() : null;
         const baseAppId = (0, utils_1.generateAppID)(tenantId);
         const appId = (0, utils_1.generateDevAppID)(baseAppId);
         yield backend_core_1.context.updateAppId(appId);
@@ -126,23 +131,14 @@ function createInstance(template, includeSampleData) {
         else {
             // create the users table
             yield db.put(constants_1.USERS_TABLE_SCHEMA);
-            if (includeSampleData) {
-                // create ootb stock db
-                yield addDefaultTables(db);
-            }
         }
         return { _id: appId };
     });
 }
-const addDefaultTables = (db) => __awaiter(void 0, void 0, void 0, function* () {
-    const defaultDbDocs = (0, datasource_bb_default_1.buildDefaultDocs)();
-    // add in the default db data docs - tables, datasource, rows and links
-    yield db.bulkDocs([...defaultDbDocs]);
-});
 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 backend_core_1.db.getAllApps({ dev, all }));
+    const apps = yield getAllApps({ dev, all });
     const appIds = apps
         .filter((app) => app.status === "development")
         .map((app) => app.appId);
@@ -166,7 +162,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 backend_core_1.roles.AccessController();
+    const accessController = new AccessController();
     const screens = yield accessController.checkScreensAccess(yield getScreens(), userRoleId);
     ctx.body = {
         layouts,
@@ -185,7 +181,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 backend_core_1.roles.AccessController();
+        const accessController = new AccessController();
         screens = yield accessController.checkScreensAccess(screens, userRoleId);
     }
     ctx.body = {
@@ -197,7 +193,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 backend_core_1.db.getAllApps({ dev: true });
+    const apps = yield getAllApps({ dev: true });
     const name = ctx.request.body.name;
     checkAppName(ctx, apps, name);
     const url = (0, exports.getAppUrl)(ctx);
@@ -211,8 +207,7 @@ const performAppCreate = (ctx) => __awaiter(void 0, void 0, void 0, function* ()
     if (ctx.request.files && ctx.request.files.templateFile) {
         instanceConfig.file = ctx.request.files.templateFile;
     }
-    const includeSampleData = (0, utilities_1.isQsTrue)(ctx.request.body.sampleData);
-    const instance = yield createInstance(instanceConfig, includeSampleData);
+    const instance = yield createInstance(instanceConfig);
     const appId = instance._id;
     const db = backend_core_1.context.getAppDB();
     let newApplication = {
@@ -226,7 +221,7 @@ const performAppCreate = (ctx) => __awaiter(void 0, void 0, void 0, function* ()
         url: url,
         template: templateKey,
         instance,
-        tenantId: backend_core_1.tenancy.getTenantId(),
+        tenantId: getTenantId(),
         updatedAt: new Date().toISOString(),
         createdAt: new Date().toISOString(),
         status: utils_1.AppStatus.DEV,
@@ -281,7 +276,7 @@ const performAppCreate = (ctx) => __awaiter(void 0, void 0, void 0, function* ()
     if (!environment_1.default.isTest()) {
         yield (0, fileSystem_1.createApp)(appId);
     }
-    yield backend_core_1.cache.app.invalidateAppMetadata(appId, newApplication);
+    yield appCache.invalidateAppMetadata(appId, newApplication);
     return newApplication;
 });
 const creationEvents = (request, app) => __awaiter(void 0, void 0, void 0, function* () {
@@ -291,25 +286,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 = backend_core_1.tenancy.getTenantId();
-    yield backend_core_1.migrations.backPopulateMigrations({
+    const tenantId = getTenantId();
+    yield backend_core_2.migrations.backPopulateMigrations({
         type: types_1.MigrationType.APP,
         tenantId,
         appId: app.appId,
@@ -321,12 +316,10 @@ const appPostCreate = (ctx, app) => __awaiter(void 0, void 0, void 0, function*
         const rowCount = rows ? rows.length : 0;
         if (rowCount) {
             try {
-                yield backend_core_1.context.doInAppContext(app.appId, () => {
-                    return pro_1.quotas.addRows(rowCount);
-                });
+                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
@@ -341,7 +334,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 backend_core_1.cache.bustCache(backend_core_1.cache.CacheKey.CHECKLIST);
+    yield bustCache(CacheKeys.CHECKLIST);
     ctx.body = newApplication;
     ctx.status = 200;
 });
@@ -349,7 +342,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 backend_core_1.db.getAllApps({ dev: true });
+    const apps = yield getAllApps({ dev: true });
     // validation
     const name = ctx.request.body.name;
     if (name) {
@@ -361,7 +354,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_1.events.app.updated(app);
+    yield backend_core_2.events.app.updated(app);
     ctx.status = 200;
     ctx.body = app;
 });
@@ -383,7 +376,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_1.events.app.versionUpdated(app, currentVersion, updatedToVersion);
+    yield backend_core_2.events.app.versionUpdated(app, currentVersion, updatedToVersion);
     ctx.status = 200;
     ctx.body = app;
 });
@@ -407,7 +400,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_1.events.app.versionReverted(app, currentVersion, revertedToVersion);
+    yield backend_core_2.events.app.versionReverted(app, currentVersion, revertedToVersion);
     ctx.status = 200;
     ctx.body = app;
 });
@@ -416,17 +409,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 = backend_core_1.db.getProdAppID(appId);
+        appId = 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_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) {
@@ -440,7 +433,7 @@ const destroyApp = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     else {
         yield (0, workerRequests_1.removeAppFromUserRoles)(ctx, appId);
     }
-    yield backend_core_1.cache.app.invalidateAppMetadata(appId);
+    yield appCache.invalidateAppMetadata(appId);
     return result;
 });
 const preDestroyApp = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
@@ -471,15 +464,19 @@ const sync = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
         return next();
     }
     const appId = ctx.params.appId;
-    if (!backend_core_1.db.isDevAppID(appId)) {
+    if (!isDevAppID(appId)) {
         ctx.throw(400, "This action cannot be performed for production apps");
     }
     // replicate prod to dev
-    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) {
+    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) {
         // the database doesn't exist. Don't replicate
         ctx.status = 200;
         ctx.body = {
@@ -487,7 +484,7 @@ const sync = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
         };
         return next();
     }
-    const replication = new backend_core_1.db.Replication({
+    const replication = new Replication({
         source: prodAppId,
         target: appId,
     });
@@ -526,7 +523,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 backend_core_1.cache.app.invalidateAppMetadata(appId);
+        yield appCache.invalidateAppMetadata(appId);
         return newAppPackage;
     }));
 });