CodeMirror/budibase
1
0
Fork 0
mirror of synced 2024-06-28 11:00:55 +12:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6612 from Budibase/fix/automation-auth-issue

Browse source 
Fix Automation auth issue - External Data Connector not working
This commit is contained in:
Peter Clement 2022-07-08 13:21:56 +01:00 committed by GitHub
parent 474948d27c 218abe39cc
commit 02629fcf38
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
packages/server/src/api/controllers/query/index.ts
View file

@ -166,14 +166,19 @@ export async function preview(ctx: any) {
}
}
async function execute(ctx: any, opts = { rowsOnly: false }) {
async function execute(
ctx: any,
opts: any = { 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) {
@ -217,8 +222,11 @@ export async function executeV1(ctx: any) {
return execute(ctx, { rowsOnly: true })
}
export async function executeV2(ctx: any) {
return execute(ctx, { rowsOnly: false })
export async function executeV2(
ctx: any,
{ isAutomation }: { isAutomation?: boolean } = {}
) {
return execute(ctx, { rowsOnly: false, isAutomation })
}
const removeDynamicVariables = async (queryId: any) => {

2
packages/server/src/automations/steps/executeQuery.js
View file

@ -72,7 +72,7 @@ exports.run = async function ({ inputs, appId, emitter }) {
})
try {
await queryController.executeV2(ctx)
await queryController.executeV2(ctx, { isAutomation: true })
const { data, ...rest } = ctx.body
return {
response: data,