Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/n8n-io/n8n into node-1533-…
Browse files Browse the repository at this point in the history
…schema-view-no-input-data-shown-for-first-node-after-a-loop
  • Loading branch information
michael-radency committed Jul 31, 2024
2 parents ead29c3 + cf73e29 commit 3bffd16
Show file tree
Hide file tree
Showing 9 changed files with 750 additions and 233 deletions.
2 changes: 2 additions & 0 deletions packages/cli/src/WorkflowExecuteAdditionalData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -651,6 +651,7 @@ function hookFunctionsSaveWorker(): IWorkflowExecuteHooks {
executionId,
success: runData.status === 'success',
isManual: runData.mode === 'manual',
runData,
});
},
async function (this: WorkflowHooks, fullRunData: IRun) {
Expand Down Expand Up @@ -940,6 +941,7 @@ async function executeWorkflow(
success: data.status === 'success',
isManual: data.mode === 'manual',
userId: additionalData.userId,
runData: data,
});

// subworkflow either finished, or is in status waiting due to a wait node, both cases are considered successes here
Expand Down
1 change: 1 addition & 0 deletions packages/cli/src/WorkflowRunner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ export class WorkflowRunner {
success: executionData?.status === 'success',
isManual: data.executionMode === 'manual',
userId: data.userId,
runData: executionData,
});
if (this.externalHooks.exists('workflow.postExecute')) {
try {
Expand Down
7 changes: 4 additions & 3 deletions packages/cli/src/config/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,10 @@ config.validate({
});
const userManagement = config.get('userManagement');
if (userManagement.jwtRefreshTimeoutHours >= userManagement.jwtSessionDurationHours) {
console.warn(
'N8N_USER_MANAGEMENT_JWT_REFRESH_TIMEOUT_HOURS needs to smaller than N8N_USER_MANAGEMENT_JWT_DURATION_HOURS. Setting N8N_USER_MANAGEMENT_JWT_REFRESH_TIMEOUT_HOURS to 0 for now.',
);
if (!inTest)
console.warn(
'N8N_USER_MANAGEMENT_JWT_REFRESH_TIMEOUT_HOURS needs to smaller than N8N_USER_MANAGEMENT_JWT_DURATION_HOURS. Setting N8N_USER_MANAGEMENT_JWT_REFRESH_TIMEOUT_HOURS to 0 for now.',
);

config.set('userManagement.jwtRefreshTimeoutHours', 0);
}
Expand Down
Loading

0 comments on commit 3bffd16

Please sign in to comment.