@budibase/server 2.2.12-alpha.43 → 2.2.12-alpha.45

package/dist/threads/query.js

@@ -20,9 +20,10 @@ const integrations_1 = require("../integrations");
 const string_templates_1 = require("@budibase/string-templates");
 const backend_core_1 = require("@budibase/backend-core");
 const utils_2 = require("../db/utils");
+const sdk_1 = __importDefault(require("../sdk"));
 const fp_1 = require("lodash/fp");
-const { isSQL } = require("../integrations/utils");
-const { enrichQueryFields, interpolateSQL, } = require("../integrations/queries/sql");
+const utils_3 = require("../integrations/utils");
+const sql_1 = require("../integrations/queries/sql");
 class QueryRunner {
     constructor(input, flags = { noRecursiveQuery: false }) {
         this.datasource = input.datasource;
@@ -55,29 +56,30 @@ class QueryRunner {
                 throw "Integration type does not exist.";
             }
             if (datasourceClone.config.authConfigs) {
-                datasourceClone.config.authConfigs =
-                    datasourceClone.config.authConfigs.map((config) => {
-                        return enrichQueryFields(config, this.ctx);
-                    });
+                const updatedConfigs = [];
+                for (let config of datasourceClone.config.authConfigs) {
+                    updatedConfigs.push(yield sdk_1.default.queries.enrichContext(config, this.ctx));
+                }
+                datasourceClone.config.authConfigs = updatedConfigs;
             }
             const integration = new Integration(datasourceClone.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 enrichedParameters = yield sdk_1.default.queries.enrichContext(parameters, this.ctx);
             const enrichedContext = Object.assign(Object.assign({}, enrichedParameters), this.ctx);
             // Parse global headers
             if (datasourceClone.config.defaultHeaders) {
-                datasourceClone.config.defaultHeaders = enrichQueryFields(datasourceClone.config.defaultHeaders, enrichedContext);
+                datasourceClone.config.defaultHeaders = yield sdk_1.default.queries.enrichContext(datasourceClone.config.defaultHeaders, enrichedContext);
             }
             let query;
             // handle SQL injections by interpolating the variables
-            if (isSQL(datasourceClone)) {
-                query = interpolateSQL(fieldsClone, enrichedParameters, integration);
+            if ((0, utils_3.isSQL)(datasourceClone)) {
+                query = yield (0, sql_1.interpolateSQL)(fieldsClone, enrichedParameters, integration);
             }
             else {
-                query = enrichQueryFields(fieldsClone, enrichedContext);
+                query = yield sdk_1.default.queries.enrichContext(fieldsClone, enrichedContext);
             }
             // Add pagination values for REST queries
             if (this.pagination) {
@@ -138,7 +140,9 @@ class QueryRunner {
         return __awaiter(this, void 0, void 0, function* () {
             const db = backend_core_1.context.getAppDB();
             const query = yield db.get(queryId);
-            const datasource = yield db.get(query.datasourceId);
+            const datasource = yield sdk_1.default.datasources.get(query.datasourceId, {
+                enriched: true,
+            });
             return new QueryRunner({
                 datasource,
                 queryVerb: query.queryVerb,
@@ -237,7 +241,7 @@ class QueryRunner {
     }
 }
 function execute(input, callback) {
-    backend_core_1.context.doInAppContext(input.appId, () => __awaiter(this, void 0, void 0, function* () {
+    const run = () => __awaiter(this, void 0, void 0, function* () {
         const Runner = new QueryRunner(input);
         try {
             const response = yield Runner.execute();
@@ -246,6 +250,16 @@ function execute(input, callback) {
         catch (err) {
             callback(err);
         }
+    });
+    backend_core_1.context.doInAppContext(input.appId, () => __awaiter(this, void 0, void 0, function* () {
+        if (input.environmentVariables) {
+            return backend_core_1.context.doInEnvironmentContext(input.environmentVariables, () => {
+                return run();
+            });
+        }
+        else {
+            return run();
+        }
     }));
 }
 exports.execute = execute;