From 0ee86353480fa8b596fbf68f7d9d2fa04327578a Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Fri, 8 Jul 2022 11:09:06 +0100 Subject: [PATCH] make auth check optional when caller is automation --- .../server/src/api/controllers/query/index.ts | 16 +++++++++------- .../server/src/automations/steps/executeQuery.js | 3 ++- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/packages/server/src/api/controllers/query/index.ts b/packages/server/src/api/controllers/query/index.ts index ce6eeda7c7..b15333f80a 100644 --- a/packages/server/src/api/controllers/query/index.ts +++ b/packages/server/src/api/controllers/query/index.ts @@ -166,14 +166,16 @@ export async function preview(ctx: any) { } } -async function execute(ctx: any, opts = { rowsOnly: false }) { +async function execute(ctx: any, opts = { rowsOnly: false, isAutomation: false }) { const db = getAppDB() const query = await db.get(ctx.params.queryId) const datasource = await db.get(query.datasourceId) - - const authConfigCtx: any = getAuthConfig(ctx) - + + let authConfigCtx: any = {} + if (!opts.isAutomation) { + authConfigCtx = getAuthConfig(ctx) + } const enrichedParameters = ctx.request.body.parameters || {} // make sure parameters are fully enriched with defaults if (query && query.parameters) { @@ -214,11 +216,11 @@ async function execute(ctx: any, opts = { rowsOnly: false }) { } export async function executeV1(ctx: any) { - return execute(ctx, { rowsOnly: true }) + return execute(ctx, { rowsOnly: true, isAutomation: false }) } -export async function executeV2(ctx: any) { - return execute(ctx, { rowsOnly: false }) +export async function executeV2(ctx: any, isAutomation?: any) { + return execute(ctx, { rowsOnly: false, isAutomation }) } const removeDynamicVariables = async (queryId: any) => { diff --git a/packages/server/src/automations/steps/executeQuery.js b/packages/server/src/automations/steps/executeQuery.js index 156df504e9..b33ed678ba 100644 --- a/packages/server/src/automations/steps/executeQuery.js +++ b/packages/server/src/automations/steps/executeQuery.js @@ -71,8 +71,9 @@ exports.run = async function ({ inputs, appId, emitter }) { }, }) + const isAutomation = true try { - await queryController.executeV2(ctx) + await queryController.executeV2(ctx, isAutomation) const { data, ...rest } = ctx.body return { response: data,