@budibase/server 1.0.212-alpha.13 → 1.0.212-alpha.14

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

@@ -128,6 +128,9 @@ function preview(ctx) {
                 parameters,
                 transformer,
                 queryId,
+                ctx: {
+                    user: ctx.user,
+                },
             });
             const { rows, keys, info, extra } = yield pro_1.quotas.addQuery(runFn);
             yield backend_core_1.events.query.previewed(datasource, query);
@@ -169,6 +172,9 @@ function execute(ctx, opts = { rowsOnly: false }) {
                 parameters: enrichedParameters,
                 transformer: query.transformer,
                 queryId: ctx.params.queryId,
+                ctx: {
+                    user: ctx.user,
+                },
             });
             const { rows, pagination, extra } = yield pro_1.quotas.addQuery(runFn);
             if (opts && opts.rowsOnly) {

package/dist/integrations/queries/sql.js

@@ -5,6 +5,9 @@ const string_templates_1 = require("@budibase/string-templates");
 const CONST_CHAR_REGEX = new RegExp("'[^']*'", "g");
 function enrichQueryFields(fields, parameters = {}) {
     const enrichedQuery = Array.isArray(fields) ? [] : {};
+    if (!fields || !parameters) {
+        return enrichedQuery;
+    }
     // enrich the fields with dynamic parameters
     for (let key of Object.keys(fields)) {
         if (fields[key] == null) {

package/dist/integrations/rest.js

@@ -252,7 +252,7 @@ var RestModule;
                     input.body = form;
                     break;
                 case BodyTypes.XML:
-                    if (object != null) {
+                    if (object != null && Object.keys(object).length) {
                         string = new XmlBuilder().buildObject(object);
                     }
                     input.body = string;

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.0.212-alpha.12",
+    "version": "1.0.212-alpha.13",
     "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.0.212-alpha.12",
-        "@budibase/client": "^1.0.212-alpha.12",
-        "@budibase/pro": "1.0.212-alpha.12",
-        "@budibase/string-templates": "^1.0.212-alpha.12",
-        "@budibase/types": "^1.0.212-alpha.12",
+        "@budibase/backend-core": "^1.0.212-alpha.13",
+        "@budibase/client": "^1.0.212-alpha.13",
+        "@budibase/pro": "1.0.212-alpha.13",
+        "@budibase/string-templates": "^1.0.212-alpha.13",
+        "@budibase/types": "^1.0.212-alpha.13",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",

package/dist/tests/utilities/TestConfiguration.js

@@ -26,6 +26,8 @@ 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 FIRSTNAME = "Barbara";
+const LASTNAME = "Barbington";
 const CSRF_TOKEN = "e3727778-7af0-4226-b5eb-f43cbe60a306";
 class TestConfiguration {
     constructor(openServer = true) {
@@ -51,6 +53,14 @@ class TestConfiguration {
     getProdAppId() {
         return this.prodAppId;
     }
+    getUserDetails() {
+        return {
+            globalId: GLOBAL_USER_ID,
+            email: EMAIL,
+            firstName: FIRSTNAME,
+            lastName: LASTNAME,
+        };
+    }
     doInContext(appId, task) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!appId) {
@@ -109,7 +119,7 @@ class TestConfiguration {
         });
     }
     // USER / AUTH
-    globalUser({ id = GLOBAL_USER_ID, builder = true, admin = false, email = EMAIL, roles, } = {}) {
+    globalUser({ id = GLOBAL_USER_ID, firstName = FIRSTNAME, lastName = LASTNAME, builder = true, admin = false, email = EMAIL, roles, } = {}) {
         return __awaiter(this, void 0, void 0, function* () {
             return doWithGlobalDB(TENANT_ID, (db) => __awaiter(this, void 0, void 0, function* () {
                 let existing;
@@ -119,7 +129,8 @@ class TestConfiguration {
                 catch (err) {
                     existing = { email };
                 }
-                const user = Object.assign(Object.assign({ _id: id }, existing), { roles: roles || {}, tenantId: TENANT_ID });
+                const user = Object.assign(Object.assign({ _id: id }, existing), { roles: roles || {}, tenantId: TENANT_ID, firstName,
+                    lastName });
                 yield createASession(id, {
                     sessionId: "sessionid",
                     tenantId: TENANT_ID,
@@ -142,11 +153,13 @@ class TestConfiguration {
             }));
         });
     }
-    createUser(id = null, email = EMAIL, builder = true, admin = false, roles = {}) {
+    createUser(id = null, firstName = FIRSTNAME, lastName = LASTNAME, email = EMAIL, builder = true, admin = false, roles = {}) {
         return __awaiter(this, void 0, void 0, function* () {
             const globalId = !id ? `us_${Math.random()}` : `us_${id}`;
             const resp = yield this.globalUser({
                 id: globalId,
+                firstName,
+                lastName,
                 email,
                 builder,
                 admin,
@@ -466,15 +479,15 @@ class TestConfiguration {
         });
     }
     // QUERY
-    previewQuery(request, config, datasource, fields) {
+    previewQuery(request, config, datasource, fields, params, verb) {
         return __awaiter(this, void 0, void 0, function* () {
             return request
                 .post(`/api/queries/preview`)
                 .send({
                 datasourceId: datasource._id,
-                parameters: {},
+                parameters: params || {},
                 fields,
-                queryVerb: "read",
+                queryVerb: verb || "read",
                 name: datasource.name,
             })
                 .set(config.defaultHeaders())

package/dist/threads/query.js

@@ -27,6 +27,8 @@ class QueryRunner {
         this.queryId = input.queryId;
         this.noRecursiveQuery = flags.noRecursiveQuery;
         this.cachedVariables = [];
+        // Additional context items for enrichment
+        this.ctx = input.ctx;
         // allows the response from a query to be stored throughout this
         // execution so that if it needs to be re-used for another variable
         // it can be
@@ -40,16 +42,29 @@ class QueryRunner {
             if (!Integration) {
                 throw "Integration type does not exist.";
             }
+            if (datasource.config.authConfigs) {
+                datasource.config.authConfigs = datasource.config.authConfigs.map(config => {
+                    return enrichQueryFields(config, this.ctx);
+                });
+            }
             const integration = new Integration(datasource.config);
             // pre-query, make sure datasource variables are added to parameters
             const parameters = yield this.addDatasourceVariables();
+            // Enrich the parameters with the addition context items.
+            // 'user' is now a reserved variable key in mapping parameters
+            const enrichedParameters = enrichQueryFields(parameters, this.ctx);
+            const enrichedContext = Object.assign(Object.assign({}, enrichedParameters), this.ctx);
+            // Parse global headers
+            if (datasource.config.defaultHeaders) {
+                datasource.config.defaultHeaders = enrichQueryFields(datasource.config.defaultHeaders, enrichedContext);
+            }
             let query;
             // handle SQL injections by interpolating the variables
             if (isSQL(datasource)) {
-                query = interpolateSQL(fields, parameters, integration);
+                query = interpolateSQL(fields, enrichedParameters, integration);
             }
             else {
-                query = enrichQueryFields(fields, parameters);
+                query = enrichQueryFields(fields, enrichedContext);
             }
             // Add pagination values for REST queries
             if (this.pagination) {
@@ -67,7 +82,7 @@ class QueryRunner {
             if (transformer) {
                 const runner = new ScriptRunner(transformer, {
                     data: rows,
-                    params: parameters,
+                    params: enrichedParameters,
                 });
                 rows = runner.execute();
             }