@budibase/server 2.6.16-alpha.3 → 2.6.16-alpha.5

package/builder/index.html

@@ -8,7 +8,7 @@
 	<link rel="preconnect" href="https://fonts.gstatic.com" />
 	<link href="https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@400;600;700&display=swap"
 		rel="stylesheet" />
-  <script type="module" crossorigin src="/builder/assets/index.40a27943.js"></script>
+  <script type="module" crossorigin src="/builder/assets/index.b9eeb2a8.js"></script>
   <link rel="stylesheet" href="/builder/assets/index.07382a47.css">
 </head>
 

package/dist/api/controllers/datasource.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.query = exports.find = exports.destroy = exports.save = exports.update = exports.buildSchemaFromDb = exports.fetch = void 0;
+exports.query = exports.find = exports.destroy = exports.save = exports.update = exports.buildSchemaFromDb = exports.verify = exports.fetch = void 0;
 const utils_1 = require("../../db/utils");
 const internal_1 = require("./table/internal");
 const constants_1 = require("../../constants");
@@ -21,6 +21,52 @@ const utils_2 = require("./row/utils");
 const utils_3 = require("../../threads/utils");
 const backend_core_1 = require("@budibase/backend-core");
 const sdk_1 = __importDefault(require("../../sdk"));
+function getErrorTables(errors, errorType) {
+    return Object.entries(errors)
+        .filter(entry => entry[1] === errorType)
+        .map(([name]) => name);
+}
+function updateError(error, newError, tables) {
+    if (!error) {
+        error = "";
+    }
+    if (error.length > 0) {
+        error += "\n";
+    }
+    error += `${newError} ${tables.join(", ")}`;
+    return error;
+}
+function getConnector(datasource) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const Connector = yield (0, integrations_1.getIntegration)(datasource.source);
+        // can't enrich if it doesn't have an ID yet
+        if (datasource._id) {
+            datasource = yield sdk_1.default.datasources.enrich(datasource);
+        }
+        // Connect to the DB and build the schema
+        return new Connector(datasource.config);
+    });
+}
+function buildSchemaHelper(datasource) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const connector = (yield getConnector(datasource));
+        yield connector.buildSchema(datasource._id, datasource.entities);
+        const errors = connector.schemaErrors;
+        let error = null;
+        if (errors && Object.keys(errors).length > 0) {
+            const noKey = getErrorTables(errors, constants_1.BuildSchemaErrors.NO_KEY);
+            const invalidCol = getErrorTables(errors, constants_1.BuildSchemaErrors.INVALID_COLUMN);
+            if (noKey.length) {
+                error = updateError(error, "No primary key constraint found for the following:", noKey);
+            }
+            if (invalidCol.length) {
+                const invalidCols = Object.values(constants_1.InvalidColumns).join(", ");
+                error = updateError(error, `Cannot use columns ${invalidCols} found in following:`, invalidCol);
+            }
+        }
+        return { tables: connector.tables, error };
+    });
+}
 function fetch(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         // Get internal tables
@@ -52,6 +98,29 @@ function fetch(ctx) {
     });
 }
 exports.fetch = fetch;
+function verify(ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { datasource } = ctx.request.body;
+        let existingDatasource;
+        if (datasource._id) {
+            existingDatasource = yield sdk_1.default.datasources.get(datasource._id);
+        }
+        let enrichedDatasource = datasource;
+        if (existingDatasource) {
+            enrichedDatasource = sdk_1.default.datasources.mergeConfigs(datasource, existingDatasource);
+        }
+        const connector = yield getConnector(enrichedDatasource);
+        if (!connector.testConnection) {
+            ctx.throw(400, "Connection information verification not supported");
+        }
+        const response = yield connector.testConnection();
+        ctx.body = {
+            connected: response.connected,
+            error: response.error,
+        };
+    });
+}
+exports.verify = verify;
 function buildSchemaFromDb(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = backend_core_1.context.getAppDB();
@@ -266,41 +335,3 @@ function query(ctx) {
     });
 }
 exports.query = query;
-function getErrorTables(errors, errorType) {
-    return Object.entries(errors)
-        .filter(entry => entry[1] === errorType)
-        .map(([name]) => name);
-}
-function updateError(error, newError, tables) {
-    if (!error) {
-        error = "";
-    }
-    if (error.length > 0) {
-        error += "\n";
-    }
-    error += `${newError} ${tables.join(", ")}`;
-    return error;
-}
-function buildSchemaHelper(datasource) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const Connector = yield (0, integrations_1.getIntegration)(datasource.source);
-        datasource = yield sdk_1.default.datasources.enrich(datasource);
-        // Connect to the DB and build the schema
-        const connector = new Connector(datasource.config);
-        yield connector.buildSchema(datasource._id, datasource.entities);
-        const errors = connector.schemaErrors;
-        let error = null;
-        if (errors && Object.keys(errors).length > 0) {
-            const noKey = getErrorTables(errors, constants_1.BuildSchemaErrors.NO_KEY);
-            const invalidCol = getErrorTables(errors, constants_1.BuildSchemaErrors.INVALID_COLUMN);
-            if (noKey.length) {
-                error = updateError(error, "No primary key constraint found for the following:", noKey);
-            }
-            if (invalidCol.length) {
-                const invalidCols = Object.values(constants_1.InvalidColumns).join(", ");
-                error = updateError(error, `Cannot use columns ${invalidCols} found in following:`, invalidCol);
-            }
-        }
-        return { tables: connector.tables, error };
-    });
-}

package/dist/api/controllers/integration.js

@@ -20,9 +20,9 @@ function fetch(ctx) {
 exports.fetch = fetch;
 function find(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const defs = yield (0, integrations_1.getDefinitions)();
+        const def = yield (0, integrations_1.getDefinition)(ctx.params.type);
+        ctx.body = def;
         ctx.status = 200;
-        ctx.body = defs[ctx.params.type];
     });
 }
 exports.find = find;

package/dist/api/routes/datasource.js

@@ -34,6 +34,7 @@ const validators_1 = require("./utils/validators");
 const router = new router_1.default();
 router
     .get("/api/datasources", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), datasourceController.fetch)
+    .post("/api/datasources/verify", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), datasourceController.verify)
     .get("/api/datasources/:datasourceId", (0, authorized_1.default)(backend_core_1.permissions.PermissionType.TABLE, backend_core_1.permissions.PermissionLevel.READ), datasourceController.find)
     .put("/api/datasources/:datasourceId", (0, authorized_1.default)(backend_core_1.permissions.PermissionType.TABLE, backend_core_1.permissions.PermissionLevel.READ), datasourceController.update)
     .post("/api/datasources/query", (0, authorized_1.default)(backend_core_1.permissions.PermissionType.TABLE, backend_core_1.permissions.PermissionLevel.READ), (0, validators_1.datasourceQueryValidator)(), datasourceController.query)

package/dist/db/dynamoClient.js

@@ -117,7 +117,7 @@ function init(endpoint) {
     docClient = new AWS.DynamoDB.DocumentClient(docClientParams);
 }
 exports.init = init;
-if (!environment_1.default.isProd()) {
+if (!environment_1.default.isProd() && !environment_1.default.isJest()) {
     environment_1.default._set("AWS_ACCESS_KEY_ID", "KEY_ID");
     environment_1.default._set("AWS_SECRET_ACCESS_KEY", "SECRET_KEY");
     init("http://localhost:8333");

package/dist/integrations/airtable.js

@@ -8,14 +8,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const types_1 = require("@budibase/types");
-const Airtable = require("airtable");
+const airtable_1 = __importDefault(require("airtable"));
 const SCHEMA = {
     docs: "https://airtable.com/api",
     description: "Airtable is a spreadsheet-database hybrid, with the features of a database but applied to a spreadsheet.",
     friendlyName: "Airtable",
     type: "Spreadsheet",
+    features: [types_1.DatasourceFeature.CONNECTION_CHECKING],
     datasource: {
         apiKey: {
             type: types_1.DatasourceFieldType.PASSWORD,
@@ -79,7 +83,29 @@ const SCHEMA = {
 class AirtableIntegration {
     constructor(config) {
         this.config = config;
-        this.client = new Airtable(config).base(config.base);
+        this.client = new airtable_1.default(config).base(config.base);
+    }
+    testConnection() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const mockTable = Date.now().toString();
+            try {
+                yield this.client.makeRequest({
+                    path: `/${mockTable}`,
+                });
+                return { connected: true };
+            }
+            catch (e) {
+                if (e.message ===
+                    `Could not find table ${mockTable} in application ${this.config.base}`) {
+                    // The request managed to check the application, so the credentials are valid
+                    return { connected: true };
+                }
+                return {
+                    connected: false,
+                    error: e.message,
+                };
+            }
+        });
     }
     create(query) {
         return __awaiter(this, void 0, void 0, function* () {

package/dist/integrations/arangodb.js

@@ -10,12 +10,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const types_1 = require("@budibase/types");
-const { Database, aql } = require("arangojs");
+const arangojs_1 = require("arangojs");
 const SCHEMA = {
     docs: "https://github.com/arangodb/arangojs",
     friendlyName: "ArangoDB",
     type: "Non-relational",
     description: "ArangoDB is a scalable open-source multi-model database natively supporting graph, document and search. All supported data models & access patterns can be combined in queries allowing for maximal flexibility. ",
+    features: [types_1.DatasourceFeature.CONNECTION_CHECKING],
     datasource: {
         url: {
             type: types_1.DatasourceFieldType.STRING,
@@ -61,7 +62,22 @@ class ArangoDBIntegration {
             },
         };
         this.config = config;
-        this.client = new Database(newConfig);
+        this.client = new arangojs_1.Database(newConfig);
+    }
+    testConnection() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const response = {
+                connected: false,
+            };
+            try {
+                yield this.client.get();
+                response.connected = true;
+            }
+            catch (e) {
+                response.error = e.message;
+            }
+            return response;
+        });
     }
     read(query) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -83,7 +99,7 @@ class ArangoDBIntegration {
         return __awaiter(this, void 0, void 0, function* () {
             const clc = this.client.collection(this.config.collection);
             try {
-                const result = yield this.client.query(aql `INSERT ${query.json} INTO ${clc} RETURN NEW`);
+                const result = yield this.client.query((0, arangojs_1.aql) `INSERT ${query.json} INTO ${clc} RETURN NEW`);
                 return result.all();
             }
             catch (err) {

package/dist/integrations/couchdb.js

@@ -16,6 +16,7 @@ const SCHEMA = {
     friendlyName: "CouchDB",
     type: "Non-relational",
     description: "Apache CouchDB is an open-source document-oriented NoSQL database, implemented in Erlang.",
+    features: [types_1.DatasourceFeature.CONNECTION_CHECKING],
     datasource: {
         url: {
             type: types_1.DatasourceFieldType.STRING,
@@ -59,9 +60,23 @@ const SCHEMA = {
 };
 class CouchDBIntegration {
     constructor(config) {
-        this.config = config;
         this.client = backend_core_1.db.DatabaseWithConnection(config.database, config.url);
     }
+    testConnection() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const response = {
+                connected: false,
+            };
+            try {
+                const result = yield this.query("exists", "validation error", {});
+                response.connected = result === true;
+            }
+            catch (e) {
+                response.error = e.message;
+            }
+            return response;
+        });
+    }
     query(command, errorMsg, query) {
         return __awaiter(this, void 0, void 0, function* () {
             try {

package/dist/integrations/dynamodb.js

@@ -20,6 +20,7 @@ const SCHEMA = {
     description: "Amazon DynamoDB is a key-value and document database that delivers single-digit millisecond performance at any scale.",
     friendlyName: "DynamoDB",
     type: "Non-relational",
+    features: [types_1.DatasourceFeature.CONNECTION_CHECKING],
     datasource: {
         region: {
             type: types_1.DatasourceFieldType.STRING,
@@ -135,6 +136,21 @@ class DynamoDBIntegration {
         this.config = Object.assign(Object.assign({}, this.config), { currentClockSkew: true, region: config.region || dynamoClient_1.AWS_REGION, endpoint: config.endpoint || undefined });
         this.client = new aws_sdk_1.default.DynamoDB.DocumentClient(this.config);
     }
+    testConnection() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const response = {
+                connected: false,
+            };
+            try {
+                const scanRes = yield new aws_sdk_1.default.DynamoDB(this.config).listTables().promise();
+                response.connected = !!scanRes.$response;
+            }
+            catch (e) {
+                response.error = e.message;
+            }
+            return response;
+        });
+    }
     create(query) {
         return __awaiter(this, void 0, void 0, function* () {
             const params = Object.assign({ TableName: query.table }, query.json);

package/dist/integrations/elasticsearch.js

@@ -16,6 +16,7 @@ const SCHEMA = {
     description: "Elasticsearch is a search engine based on the Lucene library. It provides a distributed, multitenant-capable full-text search engine with an HTTP web interface and schema-free JSON documents.",
     friendlyName: "ElasticSearch",
     type: "Non-relational",
+    features: [types_1.DatasourceFeature.CONNECTION_CHECKING],
     datasource: {
         url: {
             type: types_1.DatasourceFieldType.STRING,
@@ -102,6 +103,20 @@ class ElasticSearchIntegration {
         }
         this.client = new elasticsearch_1.Client(clientConfig);
     }
+    testConnection() {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                yield this.client.info();
+                return { connected: true };
+            }
+            catch (e) {
+                return {
+                    connected: false,
+                    error: e.message,
+                };
+            }
+        });
+    }
     create(query) {
         return __awaiter(this, void 0, void 0, function* () {
             const { index, json } = query;

package/dist/integrations/firebase.js

@@ -16,6 +16,7 @@ const SCHEMA = {
     friendlyName: "Firestore",
     type: "Non-relational",
     description: "Cloud Firestore is a flexible, scalable database for mobile, web, and server development from Firebase and Google Cloud.",
+    features: [types_1.DatasourceFeature.CONNECTION_CHECKING],
     datasource: {
         email: {
             type: types_1.DatasourceFieldType.STRING,
@@ -93,6 +94,20 @@ class FirebaseIntegration {
             },
         });
     }
+    testConnection() {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                yield this.client.listCollections();
+                return { connected: true };
+            }
+            catch (e) {
+                return {
+                    connected: false,
+                    error: e.message,
+                };
+            }
+        });
+    }
     create(query) {
         return __awaiter(this, void 0, void 0, function* () {
             try {

package/dist/integrations/googlesheets.js

@@ -40,6 +40,7 @@ const SCHEMA = {
     description: "Create and collaborate on online spreadsheets in real-time and from any device. ",
     friendlyName: "Google Sheets",
     type: "Spreadsheet",
+    features: [types_1.DatasourceFeature.CONNECTION_CHECKING],
     datasource: {
         spreadsheetId: {
             display: "Google Sheet URL",
@@ -110,6 +111,21 @@ class GoogleSheetsIntegration {
         const spreadsheetId = this.cleanSpreadsheetUrl(this.config.spreadsheetId);
         this.client = new google_spreadsheet_1.GoogleSpreadsheet(spreadsheetId);
     }
+    testConnection() {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                yield this.connect();
+                yield this.client.loadInfo();
+                return { connected: true };
+            }
+            catch (e) {
+                return {
+                    connected: false,
+                    error: e.message,
+                };
+            }
+        });
+    }
     getBindingIdentifier() {
         return "";
     }

package/dist/integrations/index.js

@@ -50,6 +50,7 @@ const DEFINITIONS = {
     [types_1.SourceName.GOOGLE_SHEETS]: googlesheets_1.default.schema,
     [types_1.SourceName.REDIS]: redis_1.default.schema,
     [types_1.SourceName.SNOWFLAKE]: snowflake_1.default.schema,
+    [types_1.SourceName.ORACLE]: undefined,
 };
 const INTEGRATIONS = {
     [types_1.SourceName.POSTGRES]: postgres_1.default.integration,
@@ -68,6 +69,7 @@ const INTEGRATIONS = {
     [types_1.SourceName.REDIS]: redis_1.default.integration,
     [types_1.SourceName.FIRESTORE]: firebase_1.default.integration,
     [types_1.SourceName.SNOWFLAKE]: snowflake_1.default.integration,
+    [types_1.SourceName.ORACLE]: undefined,
 };
 // optionally add oracle integration if the oracle binary can be installed
 if (process.arch &&
@@ -79,8 +81,9 @@ if (process.arch &&
 function getDefinition(source) {
     return __awaiter(this, void 0, void 0, function* () {
         // check if its integrated, faster
-        if (DEFINITIONS[source]) {
-            return DEFINITIONS[source];
+        const definition = DEFINITIONS[source];
+        if (definition) {
+            return definition;
         }
         const allDefinitions = yield getDefinitions();
         return allDefinitions[source];

package/dist/integrations/microsoftSqlServer.js

@@ -23,6 +23,7 @@ const SCHEMA = {
     description: "Microsoft SQL Server is a relational database management system developed by Microsoft. ",
     friendlyName: "MS SQL Server",
     type: "Relational",
+    features: [types_1.DatasourceFeature.CONNECTION_CHECKING],
     datasource: {
         user: {
             type: types_1.DatasourceFieldType.STRING,
@@ -94,6 +95,21 @@ class SqlServerIntegration extends sql_1.default {
             this.pool = new sqlServer.ConnectionPool(clientCfg);
         }
     }
+    testConnection() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const response = {
+                connected: false,
+            };
+            try {
+                yield this.connect();
+                response.connected = true;
+            }
+            catch (e) {
+                response.error = e.message;
+            }
+            return response;
+        });
+    }
     getBindingIdentifier() {
         return `@p${this.index++}`;
     }

package/dist/integrations/mongodb.js

@@ -28,6 +28,7 @@ const getSchema = () => {
         friendlyName: "MongoDB",
         type: "Non-relational",
         description: "MongoDB is a general purpose, document-based, distributed database built for modern application developers and for the cloud era.",
+        features: [types_1.DatasourceFeature.CONNECTION_CHECKING],
         datasource: {
             connectionString: {
                 type: types_1.DatasourceFieldType.STRING,
@@ -340,6 +341,21 @@ class MongoIntegration {
         };
         this.client = new mongodb_1.MongoClient(config.connectionString, options);
     }
+    testConnection() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const response = {
+                connected: false,
+            };
+            try {
+                yield this.connect();
+                response.connected = true;
+            }
+            catch (e) {
+                response.error = e.message;
+            }
+            return response;
+        });
+    }
     connect() {
         return __awaiter(this, void 0, void 0, function* () {
             return this.client.connect();

package/dist/integrations/mysql.js

@@ -17,13 +17,14 @@ const utils_1 = require("./utils");
 const dayjs_1 = __importDefault(require("dayjs"));
 const utilities_1 = require("../utilities");
 const sql_1 = __importDefault(require("./base/sql"));
-const mysql = require("mysql2/promise");
+const promise_1 = __importDefault(require("mysql2/promise"));
 const SCHEMA = {
     docs: "https://github.com/sidorares/node-mysql2",
     plus: true,
     friendlyName: "MySQL",
     type: "Relational",
     description: "MySQL Database Service is a fully managed database service to deploy cloud-native applications. ",
+    features: [types_1.DatasourceFeature.CONNECTION_CHECKING],
     datasource: {
         host: {
             type: types_1.DatasourceFieldType.STRING,
@@ -74,7 +75,6 @@ const SCHEMA = {
         },
     },
 };
-const TimezoneAwareDateTypes = ["timestamp"];
 function bindingTypeCoerce(bindings) {
     for (let i = 0; i < bindings.length; i++) {
         const binding = bindings[i];
@@ -108,7 +108,8 @@ class MySQLIntegration extends sql_1.default {
         // make sure this defaults to true
         if (config.rejectUnauthorized != null &&
             !config.rejectUnauthorized &&
-            config.ssl) {
+            config.ssl &&
+            typeof config.ssl !== "string") {
             config.ssl.rejectUnauthorized = config.rejectUnauthorized;
         }
         // @ts-ignore
@@ -127,6 +128,21 @@ class MySQLIntegration extends sql_1.default {
                 return next();
             } });
     }
+    testConnection() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const response = {
+                connected: false,
+            };
+            try {
+                const [result] = yield this.internalQuery({ sql: "SELECT 1+1 AS checkRes" }, { connect: true });
+                response.connected = (result === null || result === void 0 ? void 0 : result.checkRes) == 2;
+            }
+            catch (e) {
+                response.error = e.message;
+            }
+            return response;
+        });
+    }
     getBindingIdentifier() {
         return "?";
     }
@@ -135,7 +151,7 @@ class MySQLIntegration extends sql_1.default {
     }
     connect() {
         return __awaiter(this, void 0, void 0, function* () {
-            this.client = yield mysql.createConnection(this.config);
+            this.client = yield promise_1.default.createConnection(this.config);
         });
     }
     disconnect() {
@@ -161,7 +177,7 @@ class MySQLIntegration extends sql_1.default {
                 return response[0];
             }
             finally {
-                if (opts === null || opts === void 0 ? void 0 : opts.connect) {
+                if ((opts === null || opts === void 0 ? void 0 : opts.connect) && this.client) {
                     yield this.disconnect();
                 }
             }

package/dist/integrations/oracle.js

@@ -30,6 +30,7 @@ const SCHEMA = {
     friendlyName: "Oracle",
     type: "Relational",
     description: "Oracle Database is an object-relational database management system developed by Oracle Corporation",
+    features: [types_1.DatasourceFeature.CONNECTION_CHECKING],
     datasource: {
         host: {
             type: types_1.DatasourceFieldType.STRING,
@@ -271,6 +272,34 @@ class OracleIntegration extends sql_1.default {
             this.schemaErrors = final.errors;
         });
     }
+    testConnection() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const response = {
+                connected: false,
+            };
+            let connection;
+            try {
+                connection = yield this.getConnection();
+                response.connected = true;
+            }
+            catch (err) {
+                response.connected = false;
+                response.error = err.message;
+            }
+            finally {
+                if (connection) {
+                    try {
+                        yield connection.close();
+                    }
+                    catch (err) {
+                        response.connected = false;
+                        response.error = err.message;
+                    }
+                }
+            }
+            return response;
+        });
+    }
     internalQuery(query) {
         return __awaiter(this, void 0, void 0, function* () {
             let connection;