@budibase/server 1.3.19-alpha.2 → 1.3.19

package/dist/integrations/s3.js

@@ -10,71 +10,74 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const types_1 = require("@budibase/types");
-const AWS = require("aws-sdk");
-const SCHEMA = {
-    docs: "https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/S3.html",
-    description: "Amazon Simple Storage Service (Amazon S3) is an object storage service that offers industry-leading scalability, data availability, security, and performance.",
-    friendlyName: "Amazon S3",
-    type: "Object store",
-    datasource: {
-        region: {
-            type: "string",
-            required: false,
-            default: "us-east-1",
-        },
-        accessKeyId: {
-            type: "password",
-            required: true,
-        },
-        secretAccessKey: {
-            type: "password",
-            required: true,
-        },
-        endpoint: {
-            type: "string",
-            required: false,
-        },
-        signatureVersion: {
-            type: "string",
-            required: false,
-            default: "v4",
+var S3Module;
+(function (S3Module) {
+    const AWS = require("aws-sdk");
+    const SCHEMA = {
+        docs: "https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/S3.html",
+        description: "Amazon Simple Storage Service (Amazon S3) is an object storage service that offers industry-leading scalability, data availability, security, and performance.",
+        friendlyName: "Amazon S3",
+        type: "Object store",
+        datasource: {
+            region: {
+                type: "string",
+                required: false,
+                default: "us-east-1",
+            },
+            accessKeyId: {
+                type: "password",
+                required: true,
+            },
+            secretAccessKey: {
+                type: "password",
+                required: true,
+            },
+            endpoint: {
+                type: "string",
+                required: false,
+            },
+            signatureVersion: {
+                type: "string",
+                required: false,
+                default: "v4",
+            },
         },
-    },
-    query: {
-        read: {
-            type: types_1.QueryType.FIELDS,
-            fields: {
-                bucket: {
-                    type: "string",
-                    required: true,
+        query: {
+            read: {
+                type: types_1.QueryType.FIELDS,
+                fields: {
+                    bucket: {
+                        type: "string",
+                        required: true,
+                    },
                 },
             },
         },
-    },
-};
-class S3Integration {
-    constructor(config) {
-        this.config = config;
-        if (this.config.endpoint) {
-            this.config.s3ForcePathStyle = true;
+    };
+    class S3Integration {
+        constructor(config) {
+            this.config = config;
+            if (this.config.endpoint) {
+                this.config.s3ForcePathStyle = true;
+            }
+            else {
+                delete this.config.endpoint;
+            }
+            this.client = new AWS.S3(this.config);
         }
-        else {
-            delete this.config.endpoint;
+        read(query) {
+            return __awaiter(this, void 0, void 0, function* () {
+                const response = yield this.client
+                    .listObjects({
+                    Bucket: query.bucket,
+                })
+                    .promise();
+                return response.Contents;
+            });
         }
-        this.client = new AWS.S3(this.config);
-    }
-    read(query) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const response = yield this.client
-                .listObjects({
-                Bucket: query.bucket,
-            })
-                .promise();
-            return response.Contents;
-        });
     }
-}
-exports.default = {
-    schema: SCHEMA,
-    integration: S3Integration,
-};
+    module.exports = {
+        schema: SCHEMA,
+        integration: S3Integration,
+    };
+})(S3Module || (S3Module = {}));

package/dist/integrations/snowflake.js

@@ -11,89 +11,92 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const types_1 = require("@budibase/types");
 const snowflake_promise_1 = require("snowflake-promise");
-const SCHEMA = {
-    docs: "https://developers.snowflake.com/",
-    description: "Snowflake is a solution for data warehousing, data lakes, data engineering, data science, data application development, and securely sharing and consuming shared data.",
-    friendlyName: "Snowflake",
-    type: "Relational",
-    datasource: {
-        account: {
-            type: "string",
-            required: true,
+var SnowflakeModule;
+(function (SnowflakeModule) {
+    const SCHEMA = {
+        docs: "https://developers.snowflake.com/",
+        description: "Snowflake is a solution for data warehousing, data lakes, data engineering, data science, data application development, and securely sharing and consuming shared data.",
+        friendlyName: "Snowflake",
+        type: "Relational",
+        datasource: {
+            account: {
+                type: "string",
+                required: true,
+            },
+            username: {
+                type: "string",
+                required: true,
+            },
+            password: {
+                type: "password",
+                required: true,
+            },
+            warehouse: {
+                type: "string",
+                required: true,
+            },
+            database: {
+                type: "string",
+                required: true,
+            },
+            schema: {
+                type: "string",
+                required: true,
+            },
         },
-        username: {
-            type: "string",
-            required: true,
+        query: {
+            create: {
+                type: types_1.QueryType.SQL,
+            },
+            read: {
+                type: types_1.QueryType.SQL,
+            },
+            update: {
+                type: types_1.QueryType.SQL,
+            },
+            delete: {
+                type: types_1.QueryType.SQL,
+            },
         },
-        password: {
-            type: "password",
-            required: true,
-        },
-        warehouse: {
-            type: "string",
-            required: true,
-        },
-        database: {
-            type: "string",
-            required: true,
-        },
-        schema: {
-            type: "string",
-            required: true,
-        },
-    },
-    query: {
-        create: {
-            type: types_1.QueryType.SQL,
-        },
-        read: {
-            type: types_1.QueryType.SQL,
-        },
-        update: {
-            type: types_1.QueryType.SQL,
-        },
-        delete: {
-            type: types_1.QueryType.SQL,
-        },
-    },
-};
-class SnowflakeIntegration {
-    constructor(config) {
-        this.client = new snowflake_promise_1.Snowflake(config);
-    }
-    internalQuery(query) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.client.connect();
-            try {
-                return yield this.client.execute(query.sql);
-            }
-            catch (err) {
-                throw (err === null || err === void 0 ? void 0 : err.message.split(":")[1]) || (err === null || err === void 0 ? void 0 : err.message);
-            }
-        });
-    }
-    create(query) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.internalQuery(query);
-        });
-    }
-    read(query) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.internalQuery(query);
-        });
+    };
+    class SnowflakeIntegration {
+        constructor(config) {
+            this.client = new snowflake_promise_1.Snowflake(config);
+        }
+        internalQuery(query) {
+            return __awaiter(this, void 0, void 0, function* () {
+                yield this.client.connect();
+                try {
+                    return yield this.client.execute(query.sql);
+                }
+                catch (err) {
+                    throw (err === null || err === void 0 ? void 0 : err.message.split(":")[1]) || (err === null || err === void 0 ? void 0 : err.message);
+                }
+            });
+        }
+        create(query) {
+            return __awaiter(this, void 0, void 0, function* () {
+                return this.internalQuery(query);
+            });
+        }
+        read(query) {
+            return __awaiter(this, void 0, void 0, function* () {
+                return this.internalQuery(query);
+            });
+        }
+        update(query) {
+            return __awaiter(this, void 0, void 0, function* () {
+                return this.internalQuery(query);
+            });
+        }
+        delete(query) {
+            return __awaiter(this, void 0, void 0, function* () {
+                return this.internalQuery(query);
+            });
+        }
     }
-    update(query) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.internalQuery(query);
-        });
-    }
-    delete(query) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.internalQuery(query);
-        });
-    }
-}
-exports.default = {
-    schema: SCHEMA,
-    integration: SnowflakeIntegration,
-};
+    module.exports = {
+        schema: SCHEMA,
+        integration: SnowflakeIntegration,
+    };
+})(SnowflakeModule || (SnowflakeModule = {}));

package/dist/middleware/currentapp.js

@@ -105,12 +105,10 @@ 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,9 +57,11 @@ 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)) {
@@ -76,6 +78,7 @@ const formatUsage = (usage) => {
         maxAutomations,
         maxQueries,
         rows,
+        developers,
     };
 };
 const EVENTS = [

package/dist/migrations/functions/developerQuota.js

@@ -0,0 +1,49 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (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 { createUserBuildersView } = require("@budibase/backend-core/db");
+const syncDevelopers = __importStar(require("./usageQuotas/syncDevelopers"));
+/**
+ * Date:
+ * March 2022
+ *
+ * Description:
+ * Create the builder users view and sync the developer count
+ */
+const run = (db) => __awaiter(void 0, void 0, void 0, function* () {
+    yield createUserBuildersView(db);
+    yield syncDevelopers.run();
+});
+exports.run = run;

package/dist/{api/routes/plugin.js → migrations/functions/publishedAppsQuota.js}

@@ -22,18 +22,26 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+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 });
-const router_1 = __importDefault(require("@koa/router"));
-const controller = __importStar(require("../controllers/plugin"));
-const authorized_1 = __importDefault(require("../../middleware/authorized"));
-const permissions_1 = require("@budibase/backend-core/permissions");
-const router = new router_1.default();
-router
-    .post("/api/plugin/upload", (0, authorized_1.default)(permissions_1.BUILDER), controller.upload)
-    .post("/api/plugin", (0, authorized_1.default)(permissions_1.BUILDER), controller.create)
-    .get("/api/plugin", (0, authorized_1.default)(permissions_1.BUILDER), controller.fetch)
-    .delete("/api/plugin/:pluginId", (0, authorized_1.default)(permissions_1.BUILDER), controller.destroy);
-exports.default = router;
+exports.run = void 0;
+const syncPublishedApps = __importStar(require("./usageQuotas/syncPublishedApps"));
+/**
+ * Date:
+ * March 2022
+ *
+ * Description:
+ * Sync the published apps count
+ */
+const run = (db) => __awaiter(void 0, void 0, void 0, function* () {
+    yield syncPublishedApps.run();
+});
+exports.run = run;

package/dist/{api/controllers/plugin/url.js → migrations/functions/usageQuotas/syncDevelopers.js}

@@ -9,16 +9,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.urlUpload = void 0;
-const utils_1 = require("./utils");
-const fileSystem_1 = require("../../../utilities/fileSystem");
-function urlUpload(url, name = "", headers = {}) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (!url.includes(".tar.gz")) {
-            throw new Error("Plugin must be compressed into a gzipped tarball.");
-        }
-        const path = yield (0, utils_1.downloadUnzipTarball)(url, name, headers);
-        return yield (0, fileSystem_1.getPluginMetadata)(path);
-    });
-}
-exports.urlUpload = urlUpload;
+exports.run = void 0;
+const tenancy_1 = require("@budibase/backend-core/tenancy");
+const backend_core_1 = require("@budibase/backend-core");
+const pro_1 = require("@budibase/pro");
+const run = () => __awaiter(void 0, void 0, void 0, function* () {
+    // get developer count
+    const developerCount = yield backend_core_1.utils.getBuildersCount();
+    // sync developer count
+    const tenantId = (0, tenancy_1.getTenantId)();
+    console.log(`[Tenant: ${tenantId}] Syncing developer count: ${developerCount}`);
+    yield pro_1.quotas.setUsage(developerCount, pro_1.StaticQuotaName.DEVELOPERS, pro_1.QuotaUsageType.STATIC);
+});
+exports.run = run;

package/dist/{api/controllers/plugin/file.js → migrations/functions/usageQuotas/syncPublishedApps.js}

@@ -9,16 +9,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fileUpload = void 0;
-const fileSystem_1 = require("../../../utilities/fileSystem");
-function fileUpload(file) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (!file.name.endsWith(".tar.gz")) {
-            throw new Error("Plugin must be compressed into a gzipped tarball.");
-        }
-        const path = (0, fileSystem_1.createTempFolder)(file.name.split(".tar.gz")[0]);
-        yield (0, fileSystem_1.extractTarball)(file.path, path);
-        return yield (0, fileSystem_1.getPluginMetadata)(path);
-    });
-}
-exports.fileUpload = fileUpload;
+exports.run = void 0;
+const tenancy_1 = require("@budibase/backend-core/tenancy");
+const db_1 = require("@budibase/backend-core/db");
+const pro_1 = require("@budibase/pro");
+const run = () => __awaiter(void 0, void 0, void 0, function* () {
+    // get app count
+    const opts = { dev: false };
+    const prodApps = yield (0, db_1.getAllApps)(opts);
+    const prodAppCount = prodApps ? prodApps.length : 0;
+    // sync app count
+    const tenantId = (0, tenancy_1.getTenantId)();
+    console.log(`[Tenant: ${tenantId}] Syncing published app count: ${prodAppCount}`);
+    yield pro_1.quotas.setUsage(prodAppCount, pro_1.StaticQuotaName.PUBLISHED_APPS, pro_1.QuotaUsageType.STATIC);
+});
+exports.run = run;

package/dist/migrations/index.js

@@ -43,6 +43,8 @@ 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
@@ -65,6 +67,14 @@ 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.19-alpha.1",
+    "version": "1.3.18",
     "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.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",
+        "@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",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",
@@ -95,7 +95,6 @@
         "bcryptjs": "2.4.3",
         "bull": "4.8.5",
         "chmodr": "1.2.0",
-        "chokidar": "3.5.3",
         "csvtojson": "2.0.10",
         "curlconverter": "3.21.0",
         "dotenv": "8.2.0",
@@ -139,10 +138,8 @@
         "redis": "4",
         "server-destroy": "1.0.1",
         "snowflake-promise": "^4.5.0",
-        "socket.io": "^4.5.1",
         "svelte": "3.49.0",
         "swagger-parser": "10.0.3",
-        "tar": "6.1.11",
         "to-json-schema": "0.2.5",
         "uuid": "3.3.2",
         "validate.js": "0.13.1",

package/dist/tests/utilities/TestConfiguration.js

@@ -504,7 +504,7 @@ class TestConfiguration {
     createQuery(config = null) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.datasource && !config) {
-                throw "No datasource created for query.";
+                throw "No data source created for query.";
             }
             config = config || basicQuery(this.datasource._id);
             return this._req(config, null, controllers.query.save);

package/dist/threads/query.js

@@ -16,7 +16,7 @@ exports.execute = void 0;
 const utils_1 = __importDefault(require("./utils"));
 utils_1.default.threadSetup();
 const ScriptRunner = require("../utilities/scriptRunner");
-const { getIntegration } = require("../integrations");
+const { integrations } = require("../integrations");
 const { processStringSync } = require("@budibase/string-templates");
 const { doInAppContext, getAppDB } = require("@budibase/backend-core/context");
 const { refreshOAuthToken, updateUserOAuth, } = require("@budibase/backend-core/auth");
@@ -52,7 +52,7 @@ class QueryRunner {
             let { datasource, fields, queryVerb, transformer } = this;
             let datasourceClone = cloneDeep(datasource);
             let fieldsClone = cloneDeep(fields);
-            const Integration = yield getIntegration(datasourceClone.source);
+            const Integration = integrations[datasourceClone.source];
             if (!Integration) {
                 throw "Integration type does not exist.";
             }