From a3106219f4931a4d58a8f18b66a9f76ac369f5ac Mon Sep 17 00:00:00 2001 From: Jan Oberhauser Date: Sun, 26 Apr 2020 15:28:51 +0200 Subject: [PATCH] :zap: Add Expression-Support to responseHeaders --- packages/cli/src/WebhookHelpers.ts | 9 +++++++-- packages/workflow/src/Workflow.ts | 6 +++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/packages/cli/src/WebhookHelpers.ts b/packages/cli/src/WebhookHelpers.ts index f6ba52587a..d39e3f5dee 100644 --- a/packages/cli/src/WebhookHelpers.ts +++ b/packages/cli/src/WebhookHelpers.ts @@ -150,11 +150,16 @@ export function getWorkflowWebhooks(workflow: Workflow, additionalData: IWorkflo } if (webhookData.webhookDescription['responseHeaders'] !== undefined) { - const responseHeaders = workflow.getComplexParameterValue(workflowStartNode, webhookData.webhookDescription['responseHeaders'], undefined) as any; + const responseHeaders = workflow.getComplexParameterValue(workflowStartNode, webhookData.webhookDescription['responseHeaders'], undefined) as { + entries?: Array<{ + name: string; + value: string; + }> | undefined; + }; if (responseHeaders !== undefined && responseHeaders['entries'] !== undefined) { for (const item of responseHeaders['entries']) { - res.setHeader(item['name'], item['value']) + res.setHeader(item['name'], item['value']); } } } diff --git a/packages/workflow/src/Workflow.ts b/packages/workflow/src/Workflow.ts index 233da1e56d..9a7d3ef1eb 100644 --- a/packages/workflow/src/Workflow.ts +++ b/packages/workflow/src/Workflow.ts @@ -759,7 +759,11 @@ export class Workflow { } }; - return this.getParameterValue(parameterValue, runData, runIndex, itemIndex, node.name, connectionInputData); + // Resolve the "outer" main values + const returnData = this.getParameterValue(parameterValue, runData, runIndex, itemIndex, node.name, connectionInputData); + + // Resolve the "inner" values + return this.getParameterValue(returnData, runData, runIndex, itemIndex, node.name, connectionInputData); } /**