@budibase/server 1.0.79 → 1.0.80-alpha.2

package/dist/integrations/microsoftSqlServer.js

@@ -15,6 +15,7 @@ var MSSQLModule;
 (function (MSSQLModule) {
     const sqlServer = require("mssql");
     const Sql = require("./base/sql");
+    const DEFAULT_SCHEMA = "dbo";
     const SCHEMA = {
         docs: "https://github.com/tediousjs/node-mssql",
         plus: true,
@@ -43,6 +44,10 @@ var MSSQLModule;
                 type: datasource_1.DatasourceFieldTypes.STRING,
                 default: "root",
             },
+            schema: {
+                type: datasource_1.DatasourceFieldTypes.STRING,
+                default: DEFAULT_SCHEMA,
+            },
             encrypt: {
                 type: datasource_1.DatasourceFieldTypes.BOOLEAN,
                 default: true,
@@ -63,32 +68,10 @@ var MSSQLModule;
             },
         },
     };
-    function internalQuery(client, query, operation = undefined) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const request = client.request();
-            try {
-                if (Array.isArray(query.bindings)) {
-                    let count = 0;
-                    for (let binding of query.bindings) {
-                        request.input(`p${count++}`, binding);
-                    }
-                }
-                // this is a hack to get the inserted ID back,
-                //  no way to do this with Knex nicely
-                const sql = operation === datasource_1.Operation.CREATE
-                    ? `${query.sql}; SELECT SCOPE_IDENTITY() AS id;`
-                    : query.sql;
-                return yield request.query(sql);
-            }
-            catch (err) {
-                // @ts-ignore
-                throw new Error(err);
-            }
-        });
-    }
     class SqlServerIntegration extends Sql {
         constructor(config) {
             super(utils_1.SqlClients.MS_SQL);
+            this.index = 0;
             this.tables = {};
             this.schemaErrors = {};
             this.MASTER_TABLES = [
@@ -109,6 +92,45 @@ var MSSQLModule;
                 this.pool = new sqlServer.ConnectionPool(clientCfg);
             }
         }
+        getBindingIdentifier() {
+            return `(@p${this.index++})`;
+        }
+        connect() {
+            return __awaiter(this, void 0, void 0, function* () {
+                try {
+                    this.client = yield this.pool.connect();
+                }
+                catch (err) {
+                    // @ts-ignore
+                    throw new Error(err);
+                }
+            });
+        }
+        internalQuery(query, operation = undefined) {
+            return __awaiter(this, void 0, void 0, function* () {
+                const client = this.client;
+                const request = client.request();
+                this.index = 0;
+                try {
+                    if (Array.isArray(query.bindings)) {
+                        let count = 0;
+                        for (let binding of query.bindings) {
+                            request.input(`p${count++}`, binding);
+                        }
+                    }
+                    // this is a hack to get the inserted ID back,
+                    //  no way to do this with Knex nicely
+                    const sql = operation === datasource_1.Operation.CREATE
+                        ? `${query.sql}; SELECT SCOPE_IDENTITY() AS id;`
+                        : query.sql;
+                    return yield request.query(sql);
+                }
+                catch (err) {
+                    // @ts-ignore
+                    throw new Error(err);
+                }
+            });
+        }
         getDefinitionSQL(tableName) {
             return `select *
               from INFORMATION_SCHEMA.COLUMNS
@@ -134,20 +156,9 @@ var MSSQLModule;
               FROM INFORMATION_SCHEMA.COLUMNS
               WHERE TABLE_NAME='${tableName}'`;
         }
-        connect() {
-            return __awaiter(this, void 0, void 0, function* () {
-                try {
-                    this.client = yield this.pool.connect();
-                }
-                catch (err) {
-                    // @ts-ignore
-                    throw new Error(err);
-                }
-            });
-        }
         runSQL(sql) {
             return __awaiter(this, void 0, void 0, function* () {
-                return (yield internalQuery(this.client, utils_1.getSqlQuery(sql))).recordset;
+                return (yield this.internalQuery(utils_1.getSqlQuery(sql))).recordset;
             });
         }
         /**
@@ -158,11 +169,13 @@ var MSSQLModule;
         buildSchema(datasourceId, entities) {
             return __awaiter(this, void 0, void 0, function* () {
                 yield this.connect();
-                let tableNames = yield this.runSQL(this.TABLES_SQL);
-                if (tableNames == null || !Array.isArray(tableNames)) {
+                let tableInfo = yield this.runSQL(this.TABLES_SQL);
+                if (tableInfo == null || !Array.isArray(tableInfo)) {
                     throw "Unable to get list of tables in database";
                 }
-                tableNames = tableNames
+                const schema = this.config.schema || DEFAULT_SCHEMA;
+                const tableNames = tableInfo
+                    .filter((record) => record.TABLE_SCHEMA === schema)
                     .map((record) => record.TABLE_NAME)
                     .filter((name) => this.MASTER_TABLES.indexOf(name) === -1);
                 const tables = {};
@@ -207,36 +220,40 @@ var MSSQLModule;
         read(query) {
             return __awaiter(this, void 0, void 0, function* () {
                 yield this.connect();
-                const response = yield internalQuery(this.client, utils_1.getSqlQuery(query));
+                const response = yield this.internalQuery(utils_1.getSqlQuery(query));
                 return response.recordset;
             });
         }
         create(query) {
             return __awaiter(this, void 0, void 0, function* () {
                 yield this.connect();
-                const response = yield internalQuery(this.client, utils_1.getSqlQuery(query));
+                const response = yield this.internalQuery(utils_1.getSqlQuery(query));
                 return response.recordset || [{ created: true }];
             });
         }
         update(query) {
             return __awaiter(this, void 0, void 0, function* () {
                 yield this.connect();
-                const response = yield internalQuery(this.client, utils_1.getSqlQuery(query));
+                const response = yield this.internalQuery(utils_1.getSqlQuery(query));
                 return response.recordset || [{ updated: true }];
             });
         }
         delete(query) {
             return __awaiter(this, void 0, void 0, function* () {
                 yield this.connect();
-                const response = yield internalQuery(this.client, utils_1.getSqlQuery(query));
+                const response = yield this.internalQuery(utils_1.getSqlQuery(query));
                 return response.recordset || [{ deleted: true }];
             });
         }
         query(json) {
             return __awaiter(this, void 0, void 0, function* () {
+                const schema = this.config.schema;
                 yield this.connect();
+                if (schema && schema !== DEFAULT_SCHEMA && (json === null || json === void 0 ? void 0 : json.endpoint)) {
+                    json.endpoint.schema = schema;
+                }
                 const operation = this._operation(json);
-                const queryFn = (query, op) => internalQuery(this.client, query, op);
+                const queryFn = (query, op) => this.internalQuery(query, op);
                 const processFn = (result) => result.recordset ? result.recordset : [{ [operation]: true }];
                 return this.queryWithReturning(json, queryFn, processFn);
             });

package/dist/integrations/mysql.js

@@ -76,6 +76,9 @@ var MySQLModule;
             }
             this.config = config;
         }
+        getBindingIdentifier() {
+            return "?";
+        }
         connect() {
             return __awaiter(this, void 0, void 0, function* () {
                 this.client = yield mysql.createConnection(this.config);

package/dist/integrations/oracle.js

@@ -74,6 +74,7 @@ var OracleModule;
     class OracleIntegration extends sql_1.default {
         constructor(config) {
             super(utils_1.SqlClients.ORACLE);
+            this.index = 1;
             this.tables = {};
             this.schemaErrors = {};
             this.COLUMNS_SQL = `
@@ -116,6 +117,9 @@ var OracleModule;
             });
             this.config = config;
         }
+        getBindingIdentifier() {
+            return `:${this.index++}`;
+        }
         /**
          * Map the flat tabular columns and constraints data into a nested object
          */
@@ -167,24 +171,18 @@ var OracleModule;
             }
             return oracleTables;
         }
-        isSupportedColumn(column) {
-            if (UNSUPPORTED_TYPES.includes(column.type)) {
-                return false;
-            }
-            return true;
+        static isSupportedColumn(column) {
+            return !UNSUPPORTED_TYPES.includes(column.type);
         }
-        isAutoColumn(column) {
-            if (column.default && column.default.toLowerCase().includes("nextval")) {
-                return true;
-            }
-            return false;
+        static isAutoColumn(column) {
+            return !!(column.default && column.default.toLowerCase().includes("nextval"));
         }
         /**
          * No native boolean in oracle. Best we can do is to check if a manual 1 or 0 number constraint has been set up
          * This matches the default behaviour for generating DDL used in knex.
          */
         isBooleanType(column) {
-            if (column.type.toLowerCase() === "number" &&
+            return (column.type.toLowerCase() === "number" &&
                 Object.values(column.constraints).filter(c => {
                     if (c.type === OracleContraintTypes.NOT_NULL_OR_CHECK &&
                         c.searchCondition) {
@@ -197,10 +195,7 @@ var OracleModule;
                         }
                     }
                     return false;
-                }).length > 0) {
-                return true;
-            }
-            return false;
+                }).length > 0);
         }
         internalConvertType(column) {
             if (this.isBooleanType(column)) {
@@ -235,7 +230,7 @@ var OracleModule;
                     // iterate each column on the table
                     Object.values(oracleTable.columns)
                         // remove columns that we can't read / save
-                        .filter(oracleColumn => this.isSupportedColumn(oracleColumn))
+                        .filter(oracleColumn => OracleIntegration.isSupportedColumn(oracleColumn))
                         // match the order of the columns in the db
                         .sort((c1, c2) => c1.id - c2.id)
                         .forEach(oracleColumn => {
@@ -243,7 +238,7 @@ var OracleModule;
                         let fieldSchema = table.schema[columnName];
                         if (!fieldSchema) {
                             fieldSchema = {
-                                autocolumn: this.isAutoColumn(oracleColumn),
+                                autocolumn: OracleIntegration.isAutoColumn(oracleColumn),
                                 name: columnName,
                                 type: this.internalConvertType(oracleColumn),
                             };
@@ -266,11 +261,11 @@ var OracleModule;
             return __awaiter(this, void 0, void 0, function* () {
                 let connection;
                 try {
+                    this.index = 1;
                     connection = yield this.getConnection();
                     const options = { autoCommit: true };
                     const bindings = query.bindings || [];
-                    const result = yield connection.execute(query.sql, bindings, options);
-                    return result;
+                    return yield connection.execute(query.sql, bindings, options);
                 }
                 finally {
                     if (connection) {

package/dist/integrations/postgres.js

@@ -84,31 +84,10 @@ var PostgresModule;
             },
         },
     };
-    function internalQuery(client, query) {
-        return __awaiter(this, void 0, void 0, function* () {
-            // need to handle a specific issue with json data types in postgres,
-            // new lines inside the JSON data will break it
-            if (query && query.sql) {
-                const matches = query.sql.match(JSON_REGEX);
-                if (matches && matches.length > 0) {
-                    for (let match of matches) {
-                        const escaped = escapeDangerousCharacters(match);
-                        query.sql = query.sql.replace(match, escaped);
-                    }
-                }
-            }
-            try {
-                return yield client.query(query.sql, query.bindings || []);
-            }
-            catch (err) {
-                // @ts-ignore
-                throw new Error(err);
-            }
-        });
-    }
     class PostgresIntegration extends Sql {
         constructor(config) {
             super(utils_1.SqlClients.POSTGRES);
+            this.index = 1;
             this.tables = {};
             this.schemaErrors = {};
             this.PRIMARY_KEYS_SQL = `
@@ -133,6 +112,33 @@ var PostgresModule;
             this.client = this.pool;
             this.setSchema();
         }
+        getBindingIdentifier() {
+            return `$${this.index++}`;
+        }
+        internalQuery(query) {
+            return __awaiter(this, void 0, void 0, function* () {
+                const client = this.client;
+                this.index = 1;
+                // need to handle a specific issue with json data types in postgres,
+                // new lines inside the JSON data will break it
+                if (query && query.sql) {
+                    const matches = query.sql.match(JSON_REGEX);
+                    if (matches && matches.length > 0) {
+                        for (let match of matches) {
+                            const escaped = escapeDangerousCharacters(match);
+                            query.sql = query.sql.replace(match, escaped);
+                        }
+                    }
+                }
+                try {
+                    return yield client.query(query.sql, query.bindings || []);
+                }
+                catch (err) {
+                    // @ts-ignore
+                    throw new Error(err);
+                }
+            });
+        }
         setSchema() {
             if (!this.config.schema) {
                 this.config.schema = "public";
@@ -202,25 +208,25 @@ var PostgresModule;
         }
         create(query) {
             return __awaiter(this, void 0, void 0, function* () {
-                const response = yield internalQuery(this.client, utils_1.getSqlQuery(query));
+                const response = yield this.internalQuery(utils_1.getSqlQuery(query));
                 return response.rows.length ? response.rows : [{ created: true }];
             });
         }
         read(query) {
             return __awaiter(this, void 0, void 0, function* () {
-                const response = yield internalQuery(this.client, utils_1.getSqlQuery(query));
+                const response = yield this.internalQuery(utils_1.getSqlQuery(query));
                 return response.rows;
             });
         }
         update(query) {
             return __awaiter(this, void 0, void 0, function* () {
-                const response = yield internalQuery(this.client, utils_1.getSqlQuery(query));
+                const response = yield this.internalQuery(utils_1.getSqlQuery(query));
                 return response.rows.length ? response.rows : [{ updated: true }];
             });
         }
         delete(query) {
             return __awaiter(this, void 0, void 0, function* () {
-                const response = yield internalQuery(this.client, utils_1.getSqlQuery(query));
+                const response = yield this.internalQuery(utils_1.getSqlQuery(query));
                 return response.rows.length ? response.rows : [{ deleted: true }];
             });
         }
@@ -231,12 +237,12 @@ var PostgresModule;
                 if (Array.isArray(input)) {
                     const responses = [];
                     for (let query of input) {
-                        responses.push(yield internalQuery(this.client, query));
+                        responses.push(yield this.internalQuery(query));
                     }
                     return responses;
                 }
                 else {
-                    const response = yield internalQuery(this.client, input);
+                    const response = yield this.internalQuery(input);
                     return response.rows.length ? response.rows : [{ [operation]: true }];
                 }
             });

package/dist/integrations/utils.js

@@ -6,36 +6,53 @@ const utils_1 = require("../db/utils");
 const constants_1 = require("../constants");
 const DOUBLE_SEPARATOR = `${utils_1.SEPARATOR}${utils_1.SEPARATOR}`;
 const ROW_ID_REGEX = /^\[.*]$/g;
-const SQL_TYPE_MAP = {
-    text: constants_1.FieldTypes.LONGFORM,
-    varchar: constants_1.FieldTypes.STRING,
+const SQL_NUMBER_TYPE_MAP = {
     integer: constants_1.FieldTypes.NUMBER,
+    int: constants_1.FieldTypes.NUMBER,
     bigint: constants_1.FieldTypes.NUMBER,
     decimal: constants_1.FieldTypes.NUMBER,
     smallint: constants_1.FieldTypes.NUMBER,
     real: constants_1.FieldTypes.NUMBER,
-    "double precision": constants_1.FieldTypes.NUMBER,
-    timestamp: constants_1.FieldTypes.DATETIME,
-    time: constants_1.FieldTypes.DATETIME,
-    boolean: constants_1.FieldTypes.BOOLEAN,
-    json: constants_1.FieldTypes.JSON,
-    date: constants_1.FieldTypes.DATETIME,
-    blob: constants_1.FieldTypes.LONGFORM,
-    enum: constants_1.FieldTypes.STRING,
     float: constants_1.FieldTypes.NUMBER,
-    int: constants_1.FieldTypes.NUMBER,
     numeric: constants_1.FieldTypes.NUMBER,
     mediumint: constants_1.FieldTypes.NUMBER,
     dec: constants_1.FieldTypes.NUMBER,
     double: constants_1.FieldTypes.NUMBER,
     fixed: constants_1.FieldTypes.NUMBER,
-    datetime: constants_1.FieldTypes.DATETIME,
-    tinyint: constants_1.FieldTypes.BOOLEAN,
-    long: constants_1.FieldTypes.LONGFORM,
+    "double precision": constants_1.FieldTypes.NUMBER,
     number: constants_1.FieldTypes.NUMBER,
     binary_float: constants_1.FieldTypes.NUMBER,
     binary_double: constants_1.FieldTypes.NUMBER,
+    money: constants_1.FieldTypes.NUMBER,
+    smallmoney: constants_1.FieldTypes.NUMBER,
+};
+const SQL_DATE_TYPE_MAP = {
+    timestamp: constants_1.FieldTypes.DATETIME,
+    time: constants_1.FieldTypes.DATETIME,
+    datetime: constants_1.FieldTypes.DATETIME,
+    smalldatetime: constants_1.FieldTypes.DATETIME,
+    date: constants_1.FieldTypes.DATETIME,
+};
+const SQL_STRING_TYPE_MAP = {
+    varchar: constants_1.FieldTypes.STRING,
+    char: constants_1.FieldTypes.STRING,
+    nchar: constants_1.FieldTypes.STRING,
+    nvarchar: constants_1.FieldTypes.STRING,
+    ntext: constants_1.FieldTypes.STRING,
+    enum: constants_1.FieldTypes.STRING,
+    blob: constants_1.FieldTypes.LONGFORM,
+    long: constants_1.FieldTypes.LONGFORM,
+    text: constants_1.FieldTypes.LONGFORM,
+};
+const SQL_BOOLEAN_TYPE_MAP = {
+    boolean: constants_1.FieldTypes.BOOLEAN,
+    bit: constants_1.FieldTypes.BOOLEAN,
+    tinyint: constants_1.FieldTypes.BOOLEAN,
+};
+const SQL_MISC_TYPE_MAP = {
+    json: constants_1.FieldTypes.JSON,
 };
+const SQL_TYPE_MAP = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, SQL_NUMBER_TYPE_MAP), SQL_DATE_TYPE_MAP), SQL_STRING_TYPE_MAP), SQL_BOOLEAN_TYPE_MAP), SQL_MISC_TYPE_MAP);
 var SqlClients;
 (function (SqlClients) {
     SqlClients["MS_SQL"] = "mssql";

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.0.78",
+    "version": "1.0.80-alpha.1",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -21,10 +21,8 @@
         "dev:stack:down": "node scripts/dev/manage.js down",
         "dev:stack:nuke": "node scripts/dev/manage.js nuke",
         "dev:builder": "yarn run dev:stack:up && nodemon",
-        "generate:proxy:compose": "node scripts/proxy/generateProxyConfig compose",
-        "generate:proxy:preprod": "node scripts/proxy/generateProxyConfig preprod",
-        "generate:proxy:prod": "node scripts/proxy/generateProxyConfig prod",
         "format": "prettier --config ../../.prettierrc.json 'src/**/*.ts' --write",
+        "specs": "node specs/generate.js && openapi-typescript specs/openapi.yaml --output src/definitions/openapi.ts",
         "lint": "eslint --fix src/",
         "lint:fix": "yarn run format && yarn run lint",
         "initialise": "node scripts/initialise.js",
@@ -73,9 +71,9 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "^10.0.3",
-        "@budibase/backend-core": "^1.0.78",
-        "@budibase/client": "^1.0.78",
-        "@budibase/string-templates": "^1.0.78",
+        "@budibase/backend-core": "^1.0.80-alpha.1",
+        "@budibase/client": "^1.0.80-alpha.1",
+        "@budibase/string-templates": "^1.0.80-alpha.1",
         "@bull-board/api": "^3.7.0",
         "@bull-board/koa": "^3.7.0",
         "@elastic/elasticsearch": "7.10.0",
@@ -110,6 +108,7 @@
         "koa-send": "5.0.0",
         "koa-session": "5.12.0",
         "koa-static": "5.0.0",
+        "koa2-ratelimit": "^1.1.0",
         "lodash": "4.17.21",
         "memorystream": "^0.3.1",
         "mongodb": "3.6.3",
@@ -125,6 +124,7 @@
         "pouchdb-all-dbs": "1.0.2",
         "pouchdb-find": "^7.2.2",
         "pouchdb-replication-stream": "1.2.9",
+        "redis": "4",
         "server-destroy": "1.0.1",
         "svelte": "^3.38.2",
         "swagger-parser": "^10.0.3",
@@ -150,6 +150,7 @@
         "@types/koa-router": "^7.4.2",
         "@types/node": "^15.12.4",
         "@types/oracledb": "^5.2.1",
+        "@types/redis": "^4.0.11",
         "@typescript-eslint/parser": "4.28.0",
         "apidoc": "^0.50.2",
         "babel-jest": "^27.0.2",
@@ -157,12 +158,15 @@
         "docker-compose": "^0.23.6",
         "eslint": "^6.8.0",
         "jest": "^27.0.5",
+        "jest-openapi": "^0.14.2",
         "nodemon": "^2.0.4",
         "openapi-types": "^9.3.1",
+        "openapi-typescript": "^5.2.0",
         "path-to-regexp": "^6.2.0",
         "prettier": "^2.3.1",
         "rimraf": "^3.0.2",
         "supertest": "^4.0.2",
+        "swagger-jsdoc": "^6.1.0",
         "ts-jest": "^27.0.3",
         "ts-node": "^10.0.0",
         "typescript": "^4.3.5",

package/dist/tests/utilities/TestConfiguration.js

@@ -24,6 +24,8 @@ const { createASession } = require("@budibase/backend-core/sessions");
 const { user: userCache } = require("@budibase/backend-core/cache");
 const newid = require("../../db/newid");
 const context = require("@budibase/backend-core/context");
+const { generateDevInfoID, SEPARATOR } = require("@budibase/backend-core/db");
+const { encrypt } = require("@budibase/backend-core/encryption");
 const GLOBAL_USER_ID = "us_uuid1";
 const EMAIL = "babs@babs.com";
 const CSRF_TOKEN = "e3727778-7af0-4226-b5eb-f43cbe60a306";
@@ -42,6 +44,9 @@ class TestConfiguration {
     getRequest() {
         return this.request;
     }
+    getApp() {
+        return this.app;
+    }
     getAppId() {
         return this.appId;
     }
@@ -80,6 +85,22 @@ class TestConfiguration {
             }
         });
     }
+    generateApiKey(userId = GLOBAL_USER_ID) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const db = getGlobalDB(TENANT_ID);
+            const id = generateDevInfoID(userId);
+            let devInfo;
+            try {
+                devInfo = yield db.get(id);
+            }
+            catch (err) {
+                devInfo = { _id: id, userId };
+            }
+            devInfo.apiKey = encrypt(`${TENANT_ID}${SEPARATOR}${newid()}`);
+            yield db.put(devInfo);
+            return devInfo.apiKey;
+        });
+    }
     globalUser({ id = GLOBAL_USER_ID, builder = true, email = EMAIL, roles, } = {}) {
         return __awaiter(this, void 0, void 0, function* () {
             const db = getGlobalDB(TENANT_ID);
@@ -122,7 +143,7 @@ class TestConfiguration {
         }
         cleanup(this.allApps.map(app => app.appId));
     }
-    defaultHeaders() {
+    defaultHeaders(extras = {}) {
         const auth = {
             userId: GLOBAL_USER_ID,
             sessionId: "sessionid",
@@ -134,14 +155,10 @@ class TestConfiguration {
         };
         const authToken = jwt.sign(auth, env.JWT_SECRET);
         const appToken = jwt.sign(app, env.JWT_SECRET);
-        const headers = {
-            Accept: "application/json",
-            Cookie: [
+        const headers = Object.assign({ Accept: "application/json", Cookie: [
                 `${Cookies.Auth}=${authToken}`,
                 `${Cookies.CurrentApp}=${appToken}`,
-            ],
-            [Headers.CSRF_TOKEN]: CSRF_TOKEN,
-        };
+            ], [Headers.CSRF_TOKEN]: CSRF_TOKEN }, extras);
         if (this.appId) {
             headers[Headers.APP_ID] = this.appId;
         }
@@ -204,7 +221,7 @@ class TestConfiguration {
     getTable(tableId = null) {
         return __awaiter(this, void 0, void 0, function* () {
             tableId = tableId || this.table._id;
-            return this._req(null, { id: tableId }, controllers.table.find);
+            return this._req(null, { tableId }, controllers.table.find);
         });
     }
     createLinkedTable(relationshipType = null, links = ["link"]) {