@budibase/server 1.3.21 → 1.3.22-alpha.1

package/dist/integrations/s3.js

@@ -10,74 +10,71 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const types_1 = require("@budibase/types");
-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",
-            },
+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,
         },
-        query: {
-            read: {
-                type: types_1.QueryType.FIELDS,
-                fields: {
-                    bucket: {
-                        type: "string",
-                        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,
                 },
             },
         },
-    };
-    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);
+    },
+};
+class S3Integration {
+    constructor(config) {
+        this.config = config;
+        if (this.config.endpoint) {
+            this.config.s3ForcePathStyle = true;
         }
-        read(query) {
-            return __awaiter(this, void 0, void 0, function* () {
-                const response = yield this.client
-                    .listObjects({
-                    Bucket: query.bucket,
-                })
-                    .promise();
-                return response.Contents;
-            });
+        else {
+            delete this.config.endpoint;
         }
+        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;
+        });
     }
-    module.exports = {
-        schema: SCHEMA,
-        integration: S3Integration,
-    };
-})(S3Module || (S3Module = {}));
+}
+exports.default = {
+    schema: SCHEMA,
+    integration: S3Integration,
+};

package/dist/integrations/snowflake.js

@@ -11,92 +11,89 @@ 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");
-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,
-            },
+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,
         },
-        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,
-            },
+        username: {
+            type: "string",
+            required: true,
         },
-    };
-    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);
-            });
-        }
+        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);
+        });
     }
-    module.exports = {
-        schema: SCHEMA,
-        integration: SnowflakeIntegration,
-    };
-})(SnowflakeModule || (SnowflakeModule = {}));
+    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,
+};

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.20",
+    "version": "1.3.22-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.20",
-        "@budibase/client": "^1.3.20",
-        "@budibase/pro": "1.3.20",
-        "@budibase/string-templates": "^1.3.20",
-        "@budibase/types": "^1.3.20",
+        "@budibase/backend-core": "1.3.22-alpha.0",
+        "@budibase/client": "1.3.22-alpha.0",
+        "@budibase/pro": "1.3.22-alpha.0",
+        "@budibase/string-templates": "1.3.22-alpha.0",
+        "@budibase/types": "1.3.22-alpha.0",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",
@@ -95,6 +95,7 @@
         "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",
@@ -138,8 +139,10 @@
         "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 data source created for query.";
+                throw "No datasource 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 { integrations } = require("../integrations");
+const { getIntegration } = 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 = integrations[datasourceClone.source];
+            const Integration = yield getIntegration(datasourceClone.source);
             if (!Integration) {
                 throw "Integration type does not exist.";
             }