@budibase/server 1.3.19-alpha.0 → 1.3.19-alpha.2

package/dist/api/routes/utils/validators.js

@@ -191,12 +191,29 @@ exports.automationValidator = (existing = false) => {
         }).required().unknown(true),
     }).unknown(true));
 };
-exports.applicationValidator = () => {
+exports.applicationValidator = (opts = { isCreate: true }) => {
     // prettier-ignore
+    const base = {
+        _id: OPTIONAL_STRING,
+        _rev: OPTIONAL_STRING,
+        url: OPTIONAL_STRING,
+        template: Joi.object({
+            templateString: OPTIONAL_STRING,
+        })
+    };
+    const appNameValidator = Joi.string()
+        .pattern(new RegExp(APP_NAME_REGEX))
+        .error(new Error("App name must be letters, numbers and spaces only"));
+    if (opts.isCreate) {
+        base.name = appNameValidator.required();
+    }
+    else {
+        base.name = appNameValidator.optional();
+    }
     return joiValidator.body(Joi.object({
         _id: OPTIONAL_STRING,
         _rev: OPTIONAL_STRING,
-        name: Joi.string().pattern(new RegExp(APP_NAME_REGEX)).required().error(new Error('App name must be letters, numbers and spaces only')),
+        name: appNameValidator,
         url: OPTIONAL_STRING,
         template: Joi.object({
             templateString: OPTIONAL_STRING,

package/dist/middleware/currentapp.js

@@ -105,10 +105,12 @@ module.exports = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
         ctx.appId = appId;
         if (roleId) {
             ctx.roleId = roleId;
+            const globalId = ctx.user ? ctx.user._id : undefined;
             const userId = ctx.user ? generateUserMetadataID(ctx.user._id) : null;
             ctx.user = Object.assign(Object.assign({}, ctx.user), { 
                 // override userID with metadata one
                 _id: userId, userId,
+                globalId,
                 roleId, role: yield getRole(roleId) });
         }
         if ((requestAppId !== appId ||

package/dist/migrations/functions/backfill/global.js

@@ -57,11 +57,9 @@ const formatUsage = (usage) => {
     let maxAutomations = 0;
     let maxQueries = 0;
     let rows = 0;
-    let developers = 0;
     if (usage) {
         if (usage.usageQuota) {
             rows = usage.usageQuota.rows;
-            developers = usage.usageQuota.developers;
         }
         if (usage.monthly) {
             for (const value of Object.values(usage.monthly)) {
@@ -78,7 +76,6 @@ const formatUsage = (usage) => {
         maxAutomations,
         maxQueries,
         rows,
-        developers,
     };
 };
 const EVENTS = [

package/dist/migrations/index.js

@@ -43,8 +43,6 @@ const environment_1 = __importDefault(require("../environment"));
 const userEmailViewCasing = __importStar(require("./functions/userEmailViewCasing"));
 const quota1 = __importStar(require("./functions/quotas1"));
 const appUrls = __importStar(require("./functions/appUrls"));
-const developerQuota = __importStar(require("./functions/developerQuota"));
-const publishedAppsQuota = __importStar(require("./functions/publishedAppsQuota"));
 const backfill = __importStar(require("./functions/backfill"));
 /**
  * Populate the migration function and additional configuration from
@@ -67,14 +65,6 @@ const buildMigrations = () => {
                 serverMigrations.push(Object.assign(Object.assign({}, definition), { appOpts: { all: true }, fn: appUrls.run }));
                 break;
             }
-            case types_1.MigrationName.DEVELOPER_QUOTA: {
-                serverMigrations.push(Object.assign(Object.assign({}, definition), { fn: developerQuota.run }));
-                break;
-            }
-            case types_1.MigrationName.PUBLISHED_APP_QUOTA: {
-                serverMigrations.push(Object.assign(Object.assign({}, definition), { fn: publishedAppsQuota.run }));
-                break;
-            }
             case types_1.MigrationName.EVENT_APP_BACKFILL: {
                 serverMigrations.push(Object.assign(Object.assign({}, definition), { appOpts: { all: true }, fn: backfill.app.run, silent: !!environment_1.default.SELF_HOSTED, preventRetry: !!environment_1.default.SELF_HOSTED }));
                 break;

package/dist/package.json

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