@budibase/server 1.0.49-alpha.1 → 1.0.49-alpha.2

package/dist/api/controllers/application.js

@@ -49,24 +49,22 @@ function getUserRoleId(ctx) {
         ? BUILTIN_ROLE_IDS.PUBLIC
         : ctx.user.role._id;
 }
-function getAppUrl(ctx) {
-    return __awaiter(this, void 0, void 0, function* () {
-        // 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;
-    });
-}
+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);
@@ -183,7 +181,7 @@ exports.create = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const apps = yield getAllApps(CouchDB, { dev: true });
     const name = ctx.request.body.name;
     checkAppName(ctx, apps, name);
-    const url = yield getAppUrl(ctx);
+    const url = exports.getAppUrl(ctx);
     checkAppUrl(ctx, apps, url);
     const { useTemplate, templateKey, templateString } = ctx.request.body;
     const instanceConfig = {
@@ -245,7 +243,7 @@ exports.update = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     if (name) {
         checkAppName(ctx, apps, name, ctx.params.appId);
     }
-    const url = yield getAppUrl(ctx);
+    const url = yield exports.getAppUrl(ctx);
     if (url) {
         checkAppUrl(ctx, apps, url, ctx.params.appId);
         ctx.request.body.url = url;

package/dist/api/controllers/migrations.js

@@ -0,0 +1,21 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+const { migrate, MIGRATIONS } = require("../../migrations");
+exports.migrate = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
+    const options = ctx.request.body;
+    // don't await as can take a while, just return
+    migrate(options);
+    ctx.status = 200;
+});
+exports.fetchDefinitions = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
+    ctx.body = MIGRATIONS;
+    ctx.status = 200;
+});

package/dist/api/routes/index.js

@@ -25,6 +25,7 @@ const backupRoutes = require("./backup");
 const metadataRoutes = require("./metadata");
 const devRoutes = require("./dev");
 const cloudRoutes = require("./cloud");
+const migrationRoutes = require("./migrations");
 exports.mainRoutes = [
     authRoutes,
     deployRoutes,
@@ -53,5 +54,6 @@ exports.mainRoutes = [
     // this could be breaking as koa may recognise other routes as this
     tableRoutes,
     rowRoutes,
+    migrationRoutes,
 ];
 exports.staticRoutes = staticRoutes;

package/dist/api/routes/migrations.js

@@ -0,0 +1,9 @@
+"use strict";
+const Router = require("@koa/router");
+const migrationsController = require("../controllers/migrations");
+const router = Router();
+const { internalApi } = require("@budibase/backend-core/auth");
+router
+    .post("/api/migrations/run", internalApi, migrationsController.migrate)
+    .get("/api/migrations/definitions", internalApi, migrationsController.fetchDefinitions);
+module.exports = router;

package/dist/app.js

@@ -1,4 +1,23 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -9,7 +28,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const env = require("./environment");
+const env = __importStar(require("./environment"));
 const CouchDB = require("./db");
 require("@budibase/backend-core").init(CouchDB);
 const Koa = require("koa");
@@ -24,6 +43,7 @@ const Sentry = require("@sentry/node");
 const fileSystem = require("./utilities/fileSystem");
 const bullboard = require("./automations/bullboard");
 const redis = require("./utilities/redis");
+const migrations = __importStar(require("./migrations"));
 const app = new Koa();
 // set up top level koa middleware
 app.use(koaBody({
@@ -76,12 +96,22 @@ module.exports = server.listen(env.PORT || 0, () => __awaiter(void 0, void 0, vo
     yield redis.init();
     yield automations.init();
 }));
-process.on("uncaughtException", err => {
-    console.error(err);
+const shutdown = () => {
     server.close();
     server.destroy();
+};
+process.on("uncaughtException", err => {
+    console.error(err);
+    shutdown();
 });
 process.on("SIGTERM", () => {
-    server.close();
-    server.destroy();
+    shutdown();
 });
+// run migrations on startup if not done via http
+// not recommended in a clustered environment
+if (!env.HTTP_MIGRATIONS) {
+    migrations.migrate().catch(err => {
+        console.error("Error performing migrations. Exiting.\n", err);
+        shutdown();
+    });
+}

package/dist/environment.js

@@ -35,6 +35,7 @@ module.exports = {
     REDIS_PASSWORD: process.env.REDIS_PASSWORD,
     INTERNAL_API_KEY: process.env.INTERNAL_API_KEY,
     MULTI_TENANCY: process.env.MULTI_TENANCY,
+    HTTP_MIGRATIONS: process.env.HTTP_MIGRATIONS,
     // environment
     NODE_ENV: process.env.NODE_ENV,
     JEST_WORKER_ID: process.env.JEST_WORKER_ID,

package/dist/middleware/usageQuota.js

@@ -12,7 +12,6 @@ const CouchDB = require("../db");
 const usageQuota = require("../utilities/usageQuota");
 const { getUniqueRows } = require("../utilities/usageQuota/rows");
 const { isExternalTable, isRowId: isExternalRowId, } = require("../integrations/utils");
-const migration = require("../migrations/usageQuotas");
 // currently only counting new writes and deletes
 const METHOD_MAP = {
     POST: 1,
@@ -74,7 +73,6 @@ module.exports = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
         usage = files.map(file => file.size).reduce((total, size) => total + size);
     }
     try {
-        yield migration.run();
         yield performRequest(ctx, next, property, usage);
     }
     catch (err) {

package/dist/migrations/functions/appUrls.js

@@ -0,0 +1,37 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.run = void 0;
+const { DocumentTypes } = require("@budibase/backend-core/db");
+const application_1 = require("../../api/controllers/application");
+/**
+ * Date:
+ * January 2022
+ *
+ * Description:
+ * Add the url to the app metadata if it doesn't exist
+ */
+const run = (appDb) => __awaiter(void 0, void 0, void 0, function* () {
+    const metadata = yield appDb.get(DocumentTypes.APP_METADATA);
+    if (!metadata.url) {
+        const context = {
+            request: {
+                body: {
+                    name: metadata.name,
+                },
+            },
+        };
+        metadata.url = application_1.getAppUrl(context);
+        console.log(`Adding url to app: ${metadata.url}`);
+    }
+    yield appDb.put(metadata);
+});
+exports.run = run;

package/dist/migrations/functions/quotas1.js

@@ -0,0 +1,50 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.run = void 0;
+const usageQuotas_1 = require("./usageQuotas");
+const syncApps = __importStar(require("./usageQuotas/syncApps"));
+const syncRows = __importStar(require("./usageQuotas/syncRows"));
+/**
+ * Date:
+ * January 2022
+ *
+ * Description:
+ * Synchronise the app and row quotas to the state of the db after it was
+ * discovered that the quota resets were still in place and the row quotas
+ * weren't being decremented correctly.
+ */
+const run = () => __awaiter(void 0, void 0, void 0, function* () {
+    yield usageQuotas_1.runQuotaMigration(() => __awaiter(void 0, void 0, void 0, function* () {
+        yield syncApps.run();
+        yield syncRows.run();
+    }));
+});
+exports.run = run;

package/dist/migrations/{usageQuotas → functions/usageQuotas}/index.js

@@ -8,17 +8,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const { MIGRATIONS, MIGRATION_DBS, migrateIfRequired, } = require("@budibase/backend-core/migrations");
-const { useQuotas } = require("../../utilities/usageQuota");
-const syncApps = require("./syncApps");
-const syncRows = require("./syncRows");
-exports.run = () => __awaiter(void 0, void 0, void 0, function* () {
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runQuotaMigration = void 0;
+const { useQuotas } = require("../../../utilities/usageQuota");
+const runQuotaMigration = (migration) => __awaiter(void 0, void 0, void 0, function* () {
     if (!useQuotas()) {
         return;
     }
-    // Jan 2022
-    yield migrateIfRequired(MIGRATION_DBS.GLOBAL_DB, MIGRATIONS.QUOTAS_1, () => __awaiter(void 0, void 0, void 0, function* () {
-        yield syncApps.run();
-        yield syncRows.run();
-    }));
+    yield migration();
 });
+exports.runQuotaMigration = runQuotaMigration;

package/dist/migrations/{usageQuotas → functions/usageQuotas}/syncApps.js

@@ -8,19 +8,25 @@ 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.run = void 0;
 const { getGlobalDB, getTenantId } = require("@budibase/backend-core/tenancy");
 const { getAllApps } = require("@budibase/backend-core/db");
-const CouchDB = require("../../db");
-const { getUsageQuotaDoc } = require("../../utilities/usageQuota");
-exports.run = () => __awaiter(void 0, void 0, void 0, function* () {
+const db_1 = __importDefault(require("../../../db"));
+const usageQuota_1 = require("../../../utilities/usageQuota");
+const run = () => __awaiter(void 0, void 0, void 0, function* () {
     const db = getGlobalDB();
     // get app count
-    const devApps = yield getAllApps(CouchDB, { dev: true });
+    const devApps = yield getAllApps(db_1.default, { dev: true });
     const appCount = devApps ? devApps.length : 0;
     // sync app count
     const tenantId = getTenantId();
     console.log(`[Tenant: ${tenantId}] Syncing app count: ${appCount}`);
-    const usageDoc = yield getUsageQuotaDoc(db);
+    const usageDoc = yield usageQuota_1.getUsageQuotaDoc(db);
     usageDoc.usageQuota.apps = appCount;
     yield db.put(usageDoc);
 });
+exports.run = run;

package/dist/migrations/{usageQuotas → functions/usageQuotas}/syncRows.js

@@ -8,22 +8,28 @@ 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.run = void 0;
 const { getGlobalDB, getTenantId } = require("@budibase/backend-core/tenancy");
 const { getAllApps } = require("@budibase/backend-core/db");
-const CouchDB = require("../../db");
-const { getUsageQuotaDoc } = require("../../utilities/usageQuota");
-const { getUniqueRows } = require("../../utilities/usageQuota/rows");
-exports.run = () => __awaiter(void 0, void 0, void 0, function* () {
+const db_1 = __importDefault(require("../../../db"));
+const usageQuota_1 = require("../../../utilities/usageQuota");
+const rows_1 = require("../../../utilities/usageQuota/rows");
+const run = () => __awaiter(void 0, void 0, void 0, function* () {
     const db = getGlobalDB();
     // get all rows in all apps
-    const allApps = yield getAllApps(CouchDB, { all: true });
-    const appIds = allApps ? allApps.map(app => app.appId) : [];
-    const rows = yield getUniqueRows(appIds);
+    const allApps = yield getAllApps(db_1.default, { all: true });
+    const appIds = allApps ? allApps.map((app) => app.appId) : [];
+    const rows = yield rows_1.getUniqueRows(appIds);
     const rowCount = rows ? rows.length : 0;
     // sync row count
     const tenantId = getTenantId();
     console.log(`[Tenant: ${tenantId}] Syncing row count: ${rowCount}`);
-    const usageDoc = yield getUsageQuotaDoc(db);
+    const usageDoc = yield usageQuota_1.getUsageQuotaDoc(db);
     usageDoc.usageQuota.rows = rowCount;
     yield db.put(usageDoc);
 });
+exports.run = run;

package/dist/migrations/functions/userEmailViewCasing.js

@@ -0,0 +1,24 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.run = void 0;
+const { createUserEmailView } = require("@budibase/backend-core/db");
+/**
+ * Date:
+ * October 2021
+ *
+ * Description:
+ * Recreate the user email view to include latest changes i.e. lower casing the email address
+ */
+const run = (db) => __awaiter(void 0, void 0, void 0, function* () {
+    yield createUserEmailView(db);
+});
+exports.run = run;

package/dist/migrations/index.js

@@ -0,0 +1,62 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        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.migrate = exports.MIGRATIONS = void 0;
+const db_1 = __importDefault(require("../db"));
+const { MIGRATION_TYPES, runMigrations, } = require("@budibase/backend-core/migrations");
+// migration functions
+const userEmailViewCasing = __importStar(require("./functions/userEmailViewCasing"));
+const quota1 = __importStar(require("./functions/quotas1"));
+const appUrls = __importStar(require("./functions/appUrls"));
+exports.MIGRATIONS = [
+    {
+        type: MIGRATION_TYPES.GLOBAL,
+        name: "user_email_view_casing",
+        fn: userEmailViewCasing.run,
+    },
+    {
+        type: MIGRATION_TYPES.GLOBAL,
+        name: "quotas_1",
+        fn: quota1.run,
+    },
+    {
+        type: MIGRATION_TYPES.APP,
+        name: "app_urls",
+        opts: { all: true },
+        fn: appUrls.run,
+    },
+];
+const migrate = (options) => __awaiter(void 0, void 0, void 0, function* () {
+    yield runMigrations(db_1.default, exports.MIGRATIONS, options);
+});
+exports.migrate = migrate;

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.0.49-alpha.0",
+    "version": "1.0.49-alpha.1",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -70,9 +70,9 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "^10.0.3",
-        "@budibase/backend-core": "^1.0.49-alpha.0",
-        "@budibase/client": "^1.0.49-alpha.0",
-        "@budibase/string-templates": "^1.0.49-alpha.0",
+        "@budibase/backend-core": "^1.0.49-alpha.1",
+        "@budibase/client": "^1.0.49-alpha.1",
+        "@budibase/string-templates": "^1.0.49-alpha.1",
         "@bull-board/api": "^3.7.0",
         "@bull-board/koa": "^3.7.0",
         "@elastic/elasticsearch": "7.10.0",

package/dist/tests/utilities/TestConfiguration.js

@@ -44,6 +44,9 @@ class TestConfiguration {
     getAppId() {
         return this.appId;
     }
+    getCouch() {
+        return CouchDB;
+    }
     _req(config, params, controlFunc) {
         return __awaiter(this, void 0, void 0, function* () {
             const request = {};