From cbf4818feacae987e3df7925ca088c409f59e452 Mon Sep 17 00:00:00 2001 From: Jan Oberhauser Date: Mon, 20 Jan 2020 10:22:12 -0600 Subject: [PATCH 1/2] :bug: Fix bug with credentials in integrated workflows --- packages/cli/src/WorkflowExecuteAdditionalData.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/cli/src/WorkflowExecuteAdditionalData.ts b/packages/cli/src/WorkflowExecuteAdditionalData.ts index d5b471def9..fa7f0abc0a 100644 --- a/packages/cli/src/WorkflowExecuteAdditionalData.ts +++ b/packages/cli/src/WorkflowExecuteAdditionalData.ts @@ -9,6 +9,7 @@ import { Push, ResponseHelper, WebhookHelpers, + WorkflowCredentials, WorkflowHelpers, } from './'; @@ -306,6 +307,10 @@ export async function executeWorkflow(workflowInfo: IExecuteWorkflowInfo, additi const additionalDataIntegrated = await getBase(additionalData.credentials); additionalDataIntegrated.hooks = getWorkflowHooksIntegrated(mode, executionId, workflowData!, { parentProcessMode: additionalData.hooks!.mode }); + // Get the needed credentials for the current workflow as they will differ to the ones of the + // calling workflow. + additionalDataIntegrated.credentials = await WorkflowCredentials(workflowData!.nodes); + // Find Start-Node const requiredNodeTypes = ['n8n-nodes-base.start']; let startNode: INode | undefined; From 965ce74895e94fcc61936eac354a12d6815dae16 Mon Sep 17 00:00:00 2001 From: Jan Oberhauser Date: Mon, 20 Jan 2020 10:47:52 -0600 Subject: [PATCH 2/2] :zap: Do not allow to display NodeCreator via tab in readOnly-Mode --- packages/editor-ui/src/views/NodeView.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue index b9db49e03f..4df79a9658 100644 --- a/packages/editor-ui/src/views/NodeView.vue +++ b/packages/editor-ui/src/views/NodeView.vue @@ -376,7 +376,7 @@ export default mixins( this.createNodeActive = false; this.$store.commit('setActiveNode', null); } else if (e.key === 'Tab') { - this.createNodeActive = !this.createNodeActive; + this.createNodeActive = !this.createNodeActive && !this.isReadOnly; } else if (e.key === this.controlKeyCode) { this.ctrlKeyPressed = true; } else if (e.key === 'F2') {