@budibase/server 1.0.217 → 1.0.219-alpha.1

package/dist/integrations/base/sql.js

@@ -89,6 +89,23 @@ function parseFilters(filters) {
     }
     return filters;
 }
+function generateSelectStatement(json, knex) {
+    var _a;
+    const { resource, meta } = json;
+    const schema = (_a = meta === null || meta === void 0 ? void 0 : meta.table) === null || _a === void 0 ? void 0 : _a.schema;
+    return resource.fields.map(field => {
+        const fieldNames = field.split(/\./g);
+        const tableName = fieldNames[0];
+        const columnName = fieldNames[1];
+        if (columnName && knex.client.config.client === utils_1.SqlClients.POSTGRES) {
+            const externalType = schema === null || schema === void 0 ? void 0 : schema[columnName].externalType;
+            if (externalType === null || externalType === void 0 ? void 0 : externalType.includes("money")) {
+                return knex.raw(`"${tableName}"."${columnName}"::money::numeric as "${field}"`);
+            }
+        }
+        return `${field} as ${field}`;
+    });
+}
 class InternalBuilder {
     constructor(client) {
         this.client = client;
@@ -209,7 +226,7 @@ class InternalBuilder {
         }
         return query;
     }
-    addRelationships(knex, query, fields, fromTable, relationships) {
+    addRelationships(query, fromTable, relationships) {
         if (!relationships) {
             return query;
         }
@@ -311,7 +328,7 @@ class InternalBuilder {
         if (resource.fields && resource.fields.length > 0) {
             // select the resources as the format "table.columnName" - this is what is provided
             // by the resource builder further up
-            selectStatement = resource.fields.map(field => `${field} as ${field}`);
+            selectStatement = generateSelectStatement(json, knex);
         }
         let foundLimit = limit || BASE_LIMIT;
         // handle pagination
@@ -347,7 +364,7 @@ class InternalBuilder {
             preQuery = this.addSorting(preQuery, json);
         }
         // handle joins
-        query = this.addRelationships(knex, preQuery, selectStatement, tableName, relationships);
+        query = this.addRelationships(preQuery, tableName, relationships);
         return this.addFilters(query, filters, { relationship: true });
     }
     update(knex, json, opts) {

package/dist/integrations/couchdb.js

@@ -16,6 +16,7 @@ var CouchDBModule;
     const SCHEMA = {
         docs: "https://docs.couchdb.org/en/stable/",
         friendlyName: "CouchDB",
+        type: "Non-relational",
         description: "Apache CouchDB is an open-source document-oriented NoSQL database, implemented in Erlang.",
         datasource: {
             url: {

package/dist/integrations/dynamodb.js

@@ -18,6 +18,7 @@ var DynamoModule;
         docs: "https://github.com/dabit3/dynamodb-documentclient-cheat-sheet",
         description: "Amazon DynamoDB is a key-value and document database that delivers single-digit millisecond performance at any scale.",
         friendlyName: "DynamoDB",
+        type: "Non-relational",
         datasource: {
             region: {
                 type: datasource_1.DatasourceFieldTypes.STRING,

package/dist/integrations/elasticsearch.js

@@ -17,6 +17,7 @@ var ElasticsearchModule;
         docs: "https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/index.html",
         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",
         datasource: {
             url: {
                 type: datasource_1.DatasourceFieldTypes.STRING,

package/dist/integrations/firebase.js

@@ -16,6 +16,7 @@ var Firebase;
     const SCHEMA = {
         docs: "https://firebase.google.com/docs/firestore/quickstart",
         friendlyName: "Firestore",
+        type: "Non-relational",
         description: "Cloud Firestore is a flexible, scalable database for mobile, web, and server development from Firebase and Google Cloud.",
         datasource: {
             email: {

package/dist/integrations/googlesheets.js

@@ -33,6 +33,7 @@ var GoogleSheetsModule;
         docs: "https://developers.google.com/sheets/api/quickstart/nodejs",
         description: "Create and collaborate on online spreadsheets in real-time and from any device. ",
         friendlyName: "Google Sheets",
+        type: "Spreadsheet",
         datasource: {
             spreadsheetId: {
                 display: "Google Sheet URL",

package/dist/integrations/index.js

@@ -13,6 +13,7 @@ const rest = require("./rest");
 const googlesheets = require("./googlesheets");
 const firebase = require("./firebase");
 const redis = require("./redis");
+const snowflake = require("./snowflake");
 const { SourceNames } = require("../definitions/datasource");
 const environment = require("../environment");
 const DEFINITIONS = {
@@ -29,6 +30,7 @@ const DEFINITIONS = {
     [SourceNames.REST]: rest.schema,
     [SourceNames.FIRESTORE]: firebase.schema,
     [SourceNames.REDIS]: redis.schema,
+    [SourceNames.SNOWFLAKE]: snowflake.schema,
 };
 const INTEGRATIONS = {
     [SourceNames.POSTGRES]: postgres.integration,
@@ -45,6 +47,8 @@ const INTEGRATIONS = {
     [SourceNames.FIRESTORE]: firebase.integration,
     [SourceNames.GOOGLE_SHEETS]: googlesheets.integration,
     [SourceNames.REDIS]: redis.integration,
+    [SourceNames.FIREBASE]: firebase.integration,
+    [SourceNames.SNOWFLAKE]: snowflake.integration,
 };
 // optionally add oracle integration if the oracle binary can be installed
 if (!(process.arch === "arm64" && process.platform === "darwin")) {

package/dist/integrations/microsoftSqlServer.js

@@ -21,6 +21,7 @@ var MSSQLModule;
         plus: true,
         description: "Microsoft SQL Server is a relational database management system developed by Microsoft. ",
         friendlyName: "MS SQL Server",
+        type: "Relational",
         datasource: {
             user: {
                 type: datasource_1.DatasourceFieldTypes.STRING,
@@ -201,7 +202,7 @@ var MSSQLModule;
                         if (typeof name !== "string") {
                             continue;
                         }
-                        schema[name] = Object.assign({ autocolumn: !!autoColumns.find((col) => col === name), name: name }, (0, utils_1.convertSqlType)(def.DATA_TYPE));
+                        schema[name] = Object.assign(Object.assign({ autocolumn: !!autoColumns.find((col) => col === name), name: name }, (0, utils_1.convertSqlType)(def.DATA_TYPE)), { externalType: def.DATA_TYPE });
                     }
                     tables[tableName] = {
                         _id: (0, utils_1.buildExternalTableId)(datasourceId, tableName),

package/dist/integrations/mongodb.js

@@ -16,6 +16,7 @@ var MongoDBModule;
     const SCHEMA = {
         docs: "https://github.com/mongodb/node-mongodb-native",
         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.",
         datasource: {
             connectionString: {

package/dist/integrations/mysql.js

@@ -24,6 +24,7 @@ var MySQLModule;
         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. ",
         datasource: {
             host: {
@@ -187,7 +188,7 @@ var MySQLModule;
                             const isAuto = typeof column.Extra === "string" &&
                                 (column.Extra === "auto_increment" ||
                                     column.Extra.toLowerCase().includes("generated"));
-                            schema[columnName] = Object.assign({ name: columnName, autocolumn: isAuto, constraints }, (0, utils_1.convertSqlType)(column.Type));
+                            schema[columnName] = Object.assign(Object.assign({ name: columnName, autocolumn: isAuto, constraints }, (0, utils_1.convertSqlType)(column.Type)), { externalType: column.Type });
                         }
                         if (!tables[tableName]) {
                             tables[tableName] = {

package/dist/integrations/oracle.js

@@ -24,6 +24,7 @@ var OracleModule;
         docs: "https://github.com/oracle/node-oracledb",
         plus: true,
         friendlyName: "Oracle",
+        type: "Relational",
         description: "Oracle Database is an object-relational database management system developed by Oracle Corporation",
         datasource: {
             host: {

package/dist/integrations/postgres.js

@@ -29,6 +29,7 @@ var PostgresModule;
         docs: "https://node-postgres.com",
         plus: true,
         friendlyName: "PostgreSQL",
+        type: "Relational",
         description: "PostgreSQL, also known as Postgres, is a free and open-source relational database management system emphasizing extensibility and SQL compliance.",
         datasource: {
             host: {
@@ -229,7 +230,7 @@ var PostgresModule;
                             column.column_default.startsWith("nextval");
                         const isGenerated = column.is_generated && column.is_generated !== "NEVER";
                         const isAuto = hasDefault || identity || isGenerated;
-                        tables[tableName].schema[columnName] = Object.assign({ autocolumn: isAuto, name: columnName }, (0, utils_1.convertSqlType)(column.data_type));
+                        tables[tableName].schema[columnName] = Object.assign(Object.assign({ autocolumn: isAuto, name: columnName }, (0, utils_1.convertSqlType)(column.data_type)), { externalType: column.data_type });
                     }
                     const final = (0, utils_1.finaliseExternalTables)(tables, entities);
                     this.tables = final.tables;

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/redis.js

@@ -20,6 +20,7 @@ var RedisModule;
         docs: "https://redis.io/docs/",
         description: "",
         friendlyName: "Redis",
+        type: "Non-relational",
         datasource: {
             host: {
                 type: "string",

package/dist/integrations/rest.js

@@ -56,6 +56,7 @@ var RestModule;
         docs: "https://github.com/node-fetch/node-fetch",
         description: "With the REST API datasource, you can connect, query and pull data from multiple REST APIs. You can then use the retrieved data to build apps.",
         friendlyName: "REST API",
+        type: "API",
         datasource: {
             url: {
                 type: datasource_1.DatasourceFieldTypes.STRING,
@@ -251,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/integrations/s3.js

@@ -17,6 +17,7 @@ var S3Module;
         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",

package/dist/integrations/snowflake.js

@@ -0,0 +1,102 @@
+"use strict";
+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 datasource_1 = require("../definitions/datasource");
+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,
+            },
+        },
+        query: {
+            create: {
+                type: datasource_1.QueryTypes.SQL,
+            },
+            read: {
+                type: datasource_1.QueryTypes.SQL,
+            },
+            update: {
+                type: datasource_1.QueryTypes.SQL,
+            },
+            delete: {
+                type: datasource_1.QueryTypes.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);
+            });
+        }
+        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);
+            });
+        }
+    }
+    module.exports = {
+        schema: SCHEMA,
+        integration: SnowflakeIntegration,
+    };
+})(SnowflakeModule || (SnowflakeModule = {}));

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.0.216",
+    "version": "1.0.219-alpha.0",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -77,10 +77,11 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "10.0.3",
-        "@budibase/backend-core": "^1.0.216",
-        "@budibase/client": "^1.0.216",
-        "@budibase/pro": "1.0.216",
-        "@budibase/string-templates": "^1.0.216",
+        "@budibase/backend-core": "^1.0.219-alpha.0",
+        "@budibase/client": "^1.0.219-alpha.0",
+        "@budibase/pro": "1.0.219-alpha.0",
+        "@budibase/string-templates": "^1.0.219-alpha.0",
+        "@budibase/types": "^1.0.219-alpha.0",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",
@@ -135,6 +136,7 @@
         "pouchdb-replication-stream": "1.2.9",
         "redis": "4",
         "server-destroy": "1.0.1",
+        "snowflake-promise": "^4.5.0",
         "svelte": "3.44.1",
         "swagger-parser": "10.0.3",
         "to-json-schema": "0.2.5",
@@ -150,7 +152,6 @@
         "@babel/core": "7.17.4",
         "@babel/preset-env": "7.16.11",
         "@budibase/standard-components": "^0.9.139",
-        "@budibase/types": "^1.0.216",
         "@jest/test-sequencer": "24.9.0",
         "@types/apidoc": "0.50.0",
         "@types/bson": "4.2.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/automation.js

@@ -19,10 +19,11 @@ const { doInTenant } = require("@budibase/backend-core/tenancy");
 const { definitions: triggerDefs } = require("../automations/triggerInfo");
 const { doInAppContext, getAppDB } = require("@budibase/backend-core/context");
 const { AutomationErrors, LoopStepTypes } = require("../constants");
+const { storeLog } = require("../automations/logging");
 const FILTER_STEP_ID = actions.ACTION_DEFINITIONS.FILTER.stepId;
 const LOOP_STEP_ID = actions.ACTION_DEFINITIONS.LOOP.stepId;
 const CRON_STEP_ID = triggerDefs.CRON.stepId;
-const STOPPED_STATUS = { success: false, status: "STOPPED" };
+const STOPPED_STATUS = { success: true, status: "STOPPED" };
 const { cloneDeep } = require("lodash/fp");
 const env = require("../environment");
 function typecastForLooping(loopStep, input) {
@@ -195,7 +196,7 @@ class Orchestrator {
                                 }
                             }
                         }
-                        if (index === parseInt(env.AUTOMATION_MAX_ITERATIONS) ||
+                        if (index === env.AUTOMATION_MAX_ITERATION ||
                             index === parseInt(loopStep.inputs.iterations)) {
                             this.updateContextAndOutput(loopStepNumber, step, tempOutput, {
                                 status: AutomationErrors.MAX_ITERATIONS,
@@ -248,7 +249,7 @@ class Orchestrator {
                         this._context.steps[stepCount] = outputs;
                         // if filter causes us to stop execution don't break the loop, set a var
                         // so that we can finish iterating through the steps and record that it stopped
-                        if (step.stepId === FILTER_STEP_ID && !outputs.success) {
+                        if (step.stepId === FILTER_STEP_ID && !outputs.result) {
                             stopped = true;
                             this.updateExecutionOutput(step.id, step.stepId, step.inputs, Object.assign(Object.assign({}, outputs), STOPPED_STATUS));
                             continue;
@@ -289,6 +290,8 @@ class Orchestrator {
                     loopSteps = null;
                 }
             }
+            // store the logs for the automation run
+            yield storeLog(this._automation, this.executionOutput);
             return this.executionOutput;
         });
     }

package/dist/threads/index.js

@@ -22,6 +22,15 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __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());
+    });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -92,7 +101,7 @@ class Thread {
             });
         });
     }
-    static shutdown() {
+    static stopThreads() {
         return new Promise(resolve => {
             if (Thread.workerRefs.length === 0) {
                 resolve();
@@ -110,6 +119,11 @@ class Thread {
             Thread.workerRefs = [];
         });
     }
+    static shutdown() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield Thread.stopThreads();
+        });
+    }
 }
 exports.Thread = Thread;
 Thread.workerRefs = [];

package/dist/threads/query.js

@@ -14,6 +14,8 @@ const ScriptRunner = require("../utilities/scriptRunner");
 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");
+const { getGlobalIDFromUserMetadataID } = require("../db/utils");
 const { isSQL } = require("../integrations/utils");
 const { enrichQueryFields, interpolateSQL, } = require("../integrations/queries/sql");
 class QueryRunner {
@@ -27,29 +29,46 @@ 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
         this.queryResponse = {};
         this.hasRerun = false;
+        this.hasRefreshedOAuth = false;
     }
     execute() {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             let { datasource, fields, queryVerb, transformer } = this;
             const Integration = integrations[datasource.source];
             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,17 +86,25 @@ class QueryRunner {
             if (transformer) {
                 const runner = new ScriptRunner(transformer, {
                     data: rows,
-                    params: parameters,
+                    params: enrichedParameters,
                 });
                 rows = runner.execute();
             }
             // if the request fails we retry once, invalidating the cached value
-            if (info &&
-                info.code >= 400 &&
-                this.cachedVariables.length > 0 &&
-                !this.hasRerun) {
+            if (info && info.code >= 400 && !this.hasRerun) {
+                if (((_a = this.ctx.user) === null || _a === void 0 ? void 0 : _a.provider) &&
+                    info.code === 401 &&
+                    !this.hasRefreshedOAuth) {
+                    // Attempt to refresh the access token from the provider
+                    this.hasRefreshedOAuth = true;
+                    const authResponse = yield this.refreshOAuth2(this.ctx);
+                    if (!authResponse || authResponse.err) {
+                        // In this event the user may have oAuth issues that
+                        // could require re-authenticating with their provider.
+                        throw new Error("OAuth2 access token could not be refreshed");
+                    }
+                }
                 this.hasRerun = true;
-                // invalidate the cache value
                 yield threadUtils.invalidateDynamicVariables(this.cachedVariables);
                 return this.execute();
             }
@@ -115,6 +142,24 @@ class QueryRunner {
             }, { noRecursiveQuery: true }).execute();
         });
     }
+    refreshOAuth2(ctx) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { oauth2, providerType, _id } = ctx.user;
+            const { configId } = ctx.auth;
+            if (!providerType || !(oauth2 === null || oauth2 === void 0 ? void 0 : oauth2.refreshToken)) {
+                console.error("No refresh token found for authenticated user");
+                return;
+            }
+            const resp = yield refreshOAuthToken(oauth2.refreshToken, providerType, configId);
+            // Refresh session flow. Should be in same location as refreshOAuthToken
+            // There are several other properties available in 'resp'
+            if (!resp.error) {
+                const globalUserId = getGlobalIDFromUserMetadataID(_id);
+                yield updateUserOAuth(globalUserId, resp);
+            }
+            return resp;
+        });
+    }
     getDynamicVariable(variable) {
         return __awaiter(this, void 0, void 0, function* () {
             let { parameters } = this;