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

package/coverage/lcov-report/utilities/index.js.html

@@ -586,7 +586,7 @@ exports.isQsTrue = param => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Thu Sep 15 2022 09:33:26 GMT+0000 (Coordinated Universal Time)
+                at Thu Sep 15 2022 12:45:23 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/queue/inMemoryQueue.js.html

@@ -436,7 +436,7 @@ module.exports = InMemoryQueue
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Thu Sep 15 2022 09:33:26 GMT+0000 (Coordinated Universal Time)
+                at Thu Sep 15 2022 12:45:23 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/queue/index.html

@@ -101,7 +101,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Thu Sep 15 2022 09:33:26 GMT+0000 (Coordinated Universal Time)
+                at Thu Sep 15 2022 12:45:23 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/routing/index.html

@@ -101,7 +101,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Thu Sep 15 2022 09:33:26 GMT+0000 (Coordinated Universal Time)
+                at Thu Sep 15 2022 12:45:23 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/routing/index.js.html

@@ -145,7 +145,7 @@ exports.createRoutingView = createRoutingView
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Thu Sep 15 2022 09:33:26 GMT+0000 (Coordinated Universal Time)
+                at Thu Sep 15 2022 12:45:23 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/rowProcessor/index.html

@@ -116,7 +116,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Thu Sep 15 2022 09:33:26 GMT+0000 (Coordinated Universal Time)
+                at Thu Sep 15 2022 12:45:23 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/rowProcessor/index.js.html

@@ -1096,7 +1096,7 @@ exports.cleanupAttachments = async (table, { row, rows, oldRow, oldTable }) =&gt
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Thu Sep 15 2022 09:33:26 GMT+0000 (Coordinated Universal Time)
+                at Thu Sep 15 2022 12:45:23 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/rowProcessor/utils.js.html

@@ -346,7 +346,7 @@ exports.processDates = <span class="fstat-no" title="function not covered" >(t</
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Thu Sep 15 2022 09:33:26 GMT+0000 (Coordinated Universal Time)
+                at Thu Sep 15 2022 12:45:23 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/scriptRunner.js.html

@@ -142,7 +142,7 @@ module.exports = ScriptRunner
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Thu Sep 15 2022 09:33:26 GMT+0000 (Coordinated Universal Time)
+                at Thu Sep 15 2022 12:45:23 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/security.js.html

@@ -283,7 +283,7 @@ exports.CURRENTLY_SUPPORTED_LEVELS = CURRENTLY_SUPPORTED_LEVELS
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Thu Sep 15 2022 09:33:26 GMT+0000 (Coordinated Universal Time)
+                at Thu Sep 15 2022 12:45:23 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/statusCodes.js.html

@@ -91,7 +91,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Thu Sep 15 2022 09:33:26 GMT+0000 (Coordinated Universal Time)
+                at Thu Sep 15 2022 12:45:23 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/usageQuota/index.html

@@ -116,7 +116,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Thu Sep 15 2022 09:33:26 GMT+0000 (Coordinated Universal Time)
+                at Thu Sep 15 2022 12:45:23 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/usageQuota/rows.js.html

@@ -310,7 +310,7 @@ exports.getUniqueRows = async appIds => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Thu Sep 15 2022 09:33:26 GMT+0000 (Coordinated Universal Time)
+                at Thu Sep 15 2022 12:45:23 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/usageQuota/usageQuoteReset.js.html

@@ -124,7 +124,7 @@ function <span class="fstat-no" title="function not covered" >resetQuotasIfRequi
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Thu Sep 15 2022 09:33:26 GMT+0000 (Coordinated Universal Time)
+                at Thu Sep 15 2022 12:45:23 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/users.js.html

@@ -205,7 +205,7 @@ exports.publicApiUserFix = ctx => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Thu Sep 15 2022 09:33:26 GMT+0000 (Coordinated Universal Time)
+                at Thu Sep 15 2022 12:45:23 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/workerRequests.js.html

@@ -535,7 +535,7 @@ exports.getChecklist = <span class="fstat-no" title="function not covered" >as</
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Thu Sep 15 2022 09:33:26 GMT+0000 (Coordinated Universal Time)
+                at Thu Sep 15 2022 12:45:23 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov.info

@@ -102,50 +102,58 @@ BRH:2
 end_of_record
 TN:
 SF:src/api/controllers/auth.js
-FN:7,(anonymous_0)
-FNF:1
-FNH:1
+FN:10,(anonymous_0)
+FN:16,(anonymous_1)
+FNF:2
+FNH:2
 FNDA:1,(anonymous_0)
+FNDA:1,(anonymous_1)
 DA:1,28
 DA:2,28
 DA:3,28
 DA:4,28
 DA:5,28
-DA:7,28
-DA:8,1
-DA:15,1
+DA:10,28
+DA:11,1
+DA:12,1
+DA:16,28
 DA:17,1
-DA:19,1
-DA:21,1
-DA:22,1
 DA:24,1
-DA:25,1
 DA:26,1
-DA:27,1
-DA:29,0
-DA:31,0
-DA:38,1
-DA:39,0
-DA:42,1
-DA:43,1
+DA:28,1
+DA:30,1
+DA:31,1
+DA:33,1
+DA:34,1
+DA:35,1
+DA:36,1
+DA:38,0
+DA:40,0
 DA:47,1
-DA:48,1
-DA:49,1
-DA:51,0
-DA:53,1
-DA:56,0
-LF:28
-LH:23
-BRDA:8,0,0,1
-BRDA:8,0,1,0
-BRDA:21,1,0,1
-BRDA:21,1,1,0
-BRDA:38,2,0,0
-BRDA:38,2,1,1
-BRDA:42,3,0,1
-BRDA:42,3,1,0
-BRF:8
-BRH:4
+DA:48,0
+DA:51,1
+DA:52,1
+DA:56,1
+DA:57,1
+DA:58,1
+DA:60,0
+DA:62,1
+DA:65,0
+DA:68,1
+LF:32
+LH:27
+BRDA:11,0,0,1
+BRDA:11,0,1,0
+BRDA:17,1,0,1
+BRDA:17,1,1,0
+BRDA:30,2,0,1
+BRDA:30,2,1,0
+BRDA:47,3,0,0
+BRDA:47,3,1,1
+BRDA:51,4,0,1
+BRDA:51,4,1,0
+BRF:10
+BRH:5
 end_of_record
 TN:
 SF:src/api/controllers/automation.js
@@ -6558,15 +6566,15 @@ FN:23,(anonymous_1)
 FN:38,(anonymous_2)
 FNF:3
 FNH:2
-FNDA:6,(anonymous_0)
+FNDA:7,(anonymous_0)
 FNDA:5,(anonymous_1)
 FNDA:0,(anonymous_2)
 DA:1,44
 DA:2,44
 DA:3,44
 DA:7,44
-DA:17,6
-DA:18,6
+DA:17,7
+DA:18,7
 DA:25,5
 DA:26,1
 DA:28,4
@@ -6853,11 +6861,12 @@ DA:112,239
 DA:113,239
 DA:114,239
 DA:115,239
-DA:124,239
-DA:130,10
-DA:133,239
-LF:65
-LH:50
+DA:116,239
+DA:126,239
+DA:132,10
+DA:135,239
+LF:66
+LH:51
 BRDA:28,0,0,1
 BRDA:28,0,1,241
 BRDA:28,1,0,242
@@ -6907,14 +6916,16 @@ BRDA:112,19,0,239
 BRDA:112,19,1,0
 BRDA:114,20,0,234
 BRDA:114,20,1,5
-BRDA:124,21,0,10
-BRDA:124,21,1,229
-BRDA:125,22,0,239
-BRDA:125,22,1,239
-BRDA:125,22,2,234
-BRDA:125,22,3,10
-BRF:55
-BRH:44
+BRDA:115,21,0,234
+BRDA:115,21,1,5
+BRDA:126,22,0,10
+BRDA:126,22,1,229
+BRDA:127,23,0,239
+BRDA:127,23,1,239
+BRDA:127,23,2,234
+BRDA:127,23,3,10
+BRF:57
+BRH:46
 end_of_record
 TN:
 SF:src/middleware/joi-validator.js

package/dist/api/controllers/application.js

@@ -415,7 +415,6 @@ const destroyApp = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const app = yield db.get(utils_1.DocumentType.APP_METADATA);
     const result = yield db.destroy();
     if (isUnpublish) {
-        yield pro_1.quotas.removePublishedApp();
         yield backend_core_2.events.app.unpublished(app);
     }
     else {

package/dist/api/controllers/auth.js

@@ -13,6 +13,14 @@ const { InternalTables } = require("../../db/utils");
 const { getFullUser } = require("../../utilities/users");
 const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles");
 const { getAppDB, getAppId } = require("@budibase/backend-core/context");
+/**
+ * Add the attributes that are session based to the current user.
+ */
+const addSessionAttributesToUser = ctx => {
+    if (ctx.user) {
+        ctx.body.license = ctx.user.license;
+    }
+};
 exports.fetchSelf = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     let userId = ctx.user.userId || ctx.user._id;
     /* istanbul ignore next */
@@ -59,4 +67,5 @@ exports.fetchSelf = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     else {
         ctx.body = user;
     }
+    addSessionAttributesToUser(ctx);
 });

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

@@ -19,7 +19,6 @@ 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 backend_core_1 = require("@budibase/backend-core");
 // the max time we can wait for an invalidation to complete before considering it failed
 const MAX_PENDING_TIME_MS = 30 * 60000;
@@ -196,13 +195,7 @@ const _deployApp = function (ctx) {
         deployment = yield storeDeploymentHistory(deployment);
         console.log("Stored deployment history");
         console.log("Deploying app...");
-        let app;
-        if (yield isFirstDeploy()) {
-            app = yield pro_1.quotas.addPublishedApp(() => deployApp(deployment));
-        }
-        else {
-            app = yield deployApp(deployment);
-        }
+        let app = yield deployApp(deployment);
         yield backend_core_1.events.app.published(app);
         ctx.body = deployment;
     });

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

@@ -23,6 +23,7 @@ const objectStore_1 = require("@budibase/backend-core/objectStore");
 const types_1 = require("@budibase/types");
 const environment_1 = __importDefault(require("../../../environment"));
 const websocket_1 = require("../../../websocket");
+const backend_core_1 = require("@budibase/backend-core");
 function getPlugins(type) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = (0, tenancy_1.getGlobalDB)();
@@ -124,6 +125,7 @@ function destroy(ctx) {
             const bucketPath = `${plugin.name}/`;
             yield (0, objectStore_1.deleteFolder)(constants_1.ObjectStoreBuckets.PLUGINS, bucketPath);
             yield db.remove(pluginId, plugin._rev);
+            yield backend_core_1.events.plugin.deleted(plugin);
         }
         catch (err) {
             const errMsg = (err === null || err === void 0 ? void 0 : err.message) ? err === null || err === void 0 ? void 0 : err.message : err;
@@ -177,6 +179,7 @@ function storePlugin(metadata, directory, source) {
             doc = Object.assign(Object.assign({}, doc), { source });
         }
         const response = yield db.put(doc);
+        yield backend_core_1.events.plugin.imported(doc);
         websocket_1.ClientAppSocket.emit("plugin-update", { name, hash });
         return Object.assign(Object.assign({}, doc), { _rev: response.rev });
     });

package/dist/api/index.js

@@ -51,8 +51,8 @@ router
     .use(buildTenancyMiddleware(null, null, {
     noTenancyRequired: true,
 }))
-    .use(currentApp)
     .use(pro.licensing())
+    .use(currentApp)
     .use(auditLog);
 // error handling middleware
 router.use((ctx, next) => __awaiter(void 0, void 0, void 0, function* () {

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.0",
     "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.0",
+        "@budibase/client": "1.3.19-alpha.0",
+        "@budibase/pro": "1.3.19-alpha.0",
+        "@budibase/string-templates": "1.3.19-alpha.0",
+        "@budibase/types": "1.3.19-alpha.0",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",