mohiit1502/Automata
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(editor): Resolve $vars and $secrets in expressions in credentials fields (#9289)

Browse Source
This commit is contained in:
Iván Ovejero
2024-05-03 14:39:31 +02:00
committed by GitHub
parent 6ab3781570
commit d92f994913
4 changed files with 55 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
packages/editor-ui/src/composables/useWorkflowHelpers.ts
View File

@@ -82,16 +82,51 @@ export function resolveParameter(
inputRunIndex?: number;
inputBranchIndex?: number;
additionalKeys?: IWorkflowDataProxyAdditionalKeys;
isForCredential?: boolean;
} = {},
): IDataObject | null {
let itemIndex = opts?.targetItem?.itemIndex || 0;
const workflow = getCurrentWorkflow();
const additionalKeys: IWorkflowDataProxyAdditionalKeys = {
$execution: {
id: PLACEHOLDER_FILLED_AT_EXECUTION_TIME,
mode: 'test',
resumeUrl: PLACEHOLDER_FILLED_AT_EXECUTION_TIME,
resumeFormUrl: PLACEHOLDER_FILLED_AT_EXECUTION_TIME,
},
$vars: useEnvironmentsStore().variablesAsObject,
// deprecated
$executionId: PLACEHOLDER_FILLED_AT_EXECUTION_TIME,
$resumeWebhookUrl: PLACEHOLDER_FILLED_AT_EXECUTION_TIME,
...opts.additionalKeys,
};
if (opts.isForCredential) {
// node-less expression resolution
return workflow.expression.getParameterValue(
parameter,
null,
0,
itemIndex,
'',
[],
'manual',
additionalKeys,
undefined,
false,
undefined,
'',
) as IDataObject;
}
const inputName = NodeConnectionType.Main;
const activeNode = useNDVStore().activeNode;
let contextNode = activeNode;
const workflow = getCurrentWorkflow();
if (activeNode) {
contextNode = workflow.getParentMainInputNode(activeNode);
}
@@ -159,22 +194,6 @@ export function resolveParameter(
_connectionInputData = [];
}
const additionalKeys: IWorkflowDataProxyAdditionalKeys = {
$execution: {
id: PLACEHOLDER_FILLED_AT_EXECUTION_TIME,
mode: 'test',
resumeUrl: PLACEHOLDER_FILLED_AT_EXECUTION_TIME,
resumeFormUrl: PLACEHOLDER_FILLED_AT_EXECUTION_TIME,
},
$vars: useEnvironmentsStore().variablesAsObject,
// deprecated
$executionId: PLACEHOLDER_FILLED_AT_EXECUTION_TIME,
$resumeWebhookUrl: PLACEHOLDER_FILLED_AT_EXECUTION_TIME,
...opts.additionalKeys,
};
if (activeNode?.type === HTTP_REQUEST_NODE_TYPE) {
const EMPTY_RESPONSE = { statusCode: 200, headers: {}, body: {} };
const EMPTY_REQUEST = { headers: {}, body: {}, qs: {} };
@@ -793,6 +812,7 @@ export function useWorkflowHelpers(options: { router: ReturnType<typeof useRoute
inputBranchIndex?: number;
c?: number;
additionalKeys?: IWorkflowDataProxyAdditionalKeys;
isForCredential?: boolean;
} = {},
stringifyObject = true,
) {