n8n 1.78.1 → 1.79.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/active-executions.d.ts +1 -1
- package/dist/active-executions.js +36 -17
- package/dist/active-executions.js.map +1 -1
- package/dist/active-workflow-manager.d.ts +10 -9
- package/dist/active-workflow-manager.js +42 -30
- package/dist/active-workflow-manager.js.map +1 -1
- package/dist/build.tsbuildinfo +1 -1
- package/dist/commands/base-command.d.ts +1 -0
- package/dist/commands/base-command.js +4 -0
- package/dist/commands/base-command.js.map +1 -1
- package/dist/commands/execute-batch.d.ts +2 -2
- package/dist/commands/execute-batch.js.map +1 -1
- package/dist/commands/import/workflow.js +6 -6
- package/dist/commands/import/workflow.js.map +1 -1
- package/dist/commands/start.js +4 -0
- package/dist/commands/start.js.map +1 -1
- package/dist/concurrency/concurrency-control.service.d.ts +1 -4
- package/dist/concurrency/concurrency-control.service.js +6 -7
- package/dist/concurrency/concurrency-control.service.js.map +1 -1
- package/dist/controllers/oauth/abstract-oauth.controller.d.ts +4 -2
- package/dist/controllers/oauth/abstract-oauth.controller.js +12 -6
- package/dist/controllers/oauth/abstract-oauth.controller.js.map +1 -1
- package/dist/controllers/oauth/oauth1-credential.controller.js +5 -8
- package/dist/controllers/oauth/oauth1-credential.controller.js.map +1 -1
- package/dist/controllers/oauth/oauth2-credential.controller.js +10 -12
- package/dist/controllers/oauth/oauth2-credential.controller.js.map +1 -1
- package/dist/credentials/credentials.service.d.ts +3 -2
- package/dist/credentials/credentials.service.js +20 -5
- package/dist/credentials/credentials.service.js.map +1 -1
- package/dist/databases/entities/folder.d.ts +11 -0
- package/dist/databases/entities/folder.js +56 -0
- package/dist/databases/entities/folder.js.map +1 -0
- package/dist/databases/entities/index.d.ts +2 -0
- package/dist/databases/entities/index.js +2 -0
- package/dist/databases/entities/index.js.map +1 -1
- package/dist/databases/entities/test-case-execution.ee.d.ts +6 -3
- package/dist/databases/entities/test-case-execution.ee.js.map +1 -1
- package/dist/databases/entities/test-run.ee.d.ts +9 -2
- package/dist/databases/entities/test-run.ee.js +12 -0
- package/dist/databases/entities/test-run.ee.js.map +1 -1
- package/dist/databases/entities/workflow-entity.d.ts +2 -1
- package/dist/databases/entities/workflow-entity.js +8 -3
- package/dist/databases/entities/workflow-entity.js.map +1 -1
- package/dist/databases/migrations/common/1737715421462-AddErrorColumnsToTestRuns.d.ts +5 -0
- package/dist/databases/migrations/common/1737715421462-AddErrorColumnsToTestRuns.js +21 -0
- package/dist/databases/migrations/common/1737715421462-AddErrorColumnsToTestRuns.js.map +1 -0
- package/dist/databases/migrations/common/1738709609940-CreateFolderTable.d.ts +5 -0
- package/dist/databases/migrations/common/1738709609940-CreateFolderTable.js +46 -0
- package/dist/databases/migrations/common/1738709609940-CreateFolderTable.js.map +1 -0
- package/dist/databases/migrations/mysqldb/index.js +4 -0
- package/dist/databases/migrations/mysqldb/index.js.map +1 -1
- package/dist/databases/migrations/postgresdb/index.js +4 -0
- package/dist/databases/migrations/postgresdb/index.js.map +1 -1
- package/dist/databases/migrations/sqlite/1738709609940-CreateFolderTable.d.ts +4 -0
- package/dist/databases/migrations/sqlite/1738709609940-CreateFolderTable.js +12 -0
- package/dist/databases/migrations/sqlite/1738709609940-CreateFolderTable.js.map +1 -0
- package/dist/databases/migrations/sqlite/index.js +4 -0
- package/dist/databases/migrations/sqlite/index.js.map +1 -1
- package/dist/databases/repositories/folder.repository.d.ts +5 -0
- package/dist/databases/repositories/folder.repository.js +26 -0
- package/dist/databases/repositories/folder.repository.js.map +1 -0
- package/dist/databases/repositories/shared-workflow.repository.d.ts +1 -0
- package/dist/databases/repositories/tag.repository.d.ts +2 -2
- package/dist/databases/repositories/tag.repository.js.map +1 -1
- package/dist/databases/repositories/test-case-execution.repository.ee.d.ts +27 -4
- package/dist/databases/repositories/test-case-execution.repository.ee.js +18 -6
- package/dist/databases/repositories/test-case-execution.repository.ee.js.map +1 -1
- package/dist/databases/repositories/test-run.repository.ee.d.ts +26 -1
- package/dist/databases/repositories/test-run.repository.ee.js +30 -1
- package/dist/databases/repositories/test-run.repository.ee.js.map +1 -1
- package/dist/environments.ee/source-control/source-control-export.service.ee.js +3 -2
- package/dist/environments.ee/source-control/source-control-export.service.ee.js.map +1 -1
- package/dist/environments.ee/source-control/types/exportable-workflow.d.ts +1 -1
- package/dist/errors/workflow-missing-id.error.d.ts +2 -3
- package/dist/errors/workflow-missing-id.error.js.map +1 -1
- package/dist/evaluation.ee/test-definition.service.ee.js +1 -5
- package/dist/evaluation.ee/test-definition.service.ee.js.map +1 -1
- package/dist/evaluation.ee/test-runner/errors.ee.d.ts +11 -0
- package/dist/evaluation.ee/test-runner/errors.ee.js +19 -0
- package/dist/evaluation.ee/test-runner/errors.ee.js.map +1 -0
- package/dist/evaluation.ee/test-runner/evaluation-metrics.ee.d.ts +7 -1
- package/dist/evaluation.ee/test-runner/evaluation-metrics.ee.js +32 -5
- package/dist/evaluation.ee/test-runner/evaluation-metrics.ee.js.map +1 -1
- package/dist/evaluation.ee/test-runner/test-runner.service.ee.d.ts +1 -0
- package/dist/evaluation.ee/test-runner/test-runner.service.ee.js +86 -19
- package/dist/evaluation.ee/test-runner/test-runner.service.ee.js.map +1 -1
- package/dist/evaluation.ee/test-runner/utils.ee.d.ts +4 -2
- package/dist/evaluation.ee/test-runner/utils.ee.js +22 -0
- package/dist/evaluation.ee/test-runner/utils.ee.js.map +1 -1
- package/dist/evaluation.ee/test-runs.controller.ee.d.ts +18 -2
- package/dist/evaluation.ee/test-runs.controller.ee.js +2 -1
- package/dist/evaluation.ee/test-runs.controller.ee.js.map +1 -1
- package/dist/events/maps/pub-sub.event-map.d.ts +2 -2
- package/dist/execution-lifecycle/execution-lifecycle-hooks.d.ts +5 -5
- package/dist/execution-lifecycle/execution-lifecycle-hooks.js +258 -313
- package/dist/execution-lifecycle/execution-lifecycle-hooks.js.map +1 -1
- package/dist/executions/execution-recovery.service.js +2 -2
- package/dist/executions/execution-recovery.service.js.map +1 -1
- package/dist/executions/execution.service.d.ts +3 -3
- package/dist/executions/execution.service.js.map +1 -1
- package/dist/interfaces.d.ts +1 -0
- package/dist/interfaces.js.map +1 -1
- package/dist/manual-execution.service.js +3 -0
- package/dist/manual-execution.service.js.map +1 -1
- package/dist/node-types.d.ts +4 -2
- package/dist/node-types.js +14 -4
- package/dist/node-types.js.map +1 -1
- package/dist/public-api/v1/handlers/workflows/workflows.handler.js +2 -2
- package/dist/public-api/v1/handlers/workflows/workflows.handler.js.map +1 -1
- package/dist/public-api/v1/handlers/workflows/workflows.service.d.ts +3 -2
- package/dist/public-api/v1/handlers/workflows/workflows.service.js +4 -4
- package/dist/public-api/v1/handlers/workflows/workflows.service.js.map +1 -1
- package/dist/push/websocket.push.d.ts +1 -0
- package/dist/push/websocket.push.js +11 -2
- package/dist/push/websocket.push.js.map +1 -1
- package/dist/scaling/job-processor.js +12 -13
- package/dist/scaling/job-processor.js.map +1 -1
- package/dist/security-audit/risk-reporters/credentials-risk-reporter.d.ts +2 -2
- package/dist/security-audit/risk-reporters/credentials-risk-reporter.js.map +1 -1
- package/dist/security-audit/risk-reporters/database-risk-reporter.d.ts +2 -2
- package/dist/security-audit/risk-reporters/database-risk-reporter.js.map +1 -1
- package/dist/security-audit/risk-reporters/filesystem-risk-reporter.d.ts +2 -2
- package/dist/security-audit/risk-reporters/filesystem-risk-reporter.js.map +1 -1
- package/dist/security-audit/risk-reporters/instance-risk-reporter.d.ts +2 -2
- package/dist/security-audit/risk-reporters/instance-risk-reporter.js.map +1 -1
- package/dist/security-audit/risk-reporters/nodes-risk-reporter.d.ts +2 -2
- package/dist/security-audit/risk-reporters/nodes-risk-reporter.js.map +1 -1
- package/dist/security-audit/types.d.ts +5 -5
- package/dist/security-audit/utils.d.ts +4 -4
- package/dist/security-audit/utils.js.map +1 -1
- package/dist/server.d.ts +0 -1
- package/dist/server.js +1 -1
- package/dist/server.js.map +1 -1
- package/dist/services/import.service.d.ts +4 -3
- package/dist/services/import.service.js.map +1 -1
- package/dist/services/redis-client.service.js +3 -1
- package/dist/services/redis-client.service.js.map +1 -1
- package/dist/user-management/email/user-management-mailer.d.ts +2 -2
- package/dist/user-management/email/user-management-mailer.js.map +1 -1
- package/dist/webhooks/test-webhook-registrations.service.d.ts +2 -3
- package/dist/webhooks/test-webhook-registrations.service.js.map +1 -1
- package/dist/webhooks/test-webhooks.d.ts +3 -4
- package/dist/webhooks/test-webhooks.js.map +1 -1
- package/dist/webhooks/waiting-webhooks.js +2 -0
- package/dist/webhooks/waiting-webhooks.js.map +1 -1
- package/dist/webhooks/webhook-helpers.d.ts +2 -3
- package/dist/webhooks/webhook-helpers.js +1 -0
- package/dist/webhooks/webhook-helpers.js.map +1 -1
- package/dist/workflow-execute-additional-data.js +5 -1
- package/dist/workflow-execute-additional-data.js.map +1 -1
- package/dist/workflow-helpers.d.ts +3 -4
- package/dist/workflow-helpers.js.map +1 -1
- package/dist/workflow-runner.d.ts +3 -2
- package/dist/workflow-runner.js +19 -25
- package/dist/workflow-runner.js.map +1 -1
- package/dist/workflows/workflow-execution.service.d.ts +4 -4
- package/dist/workflows/workflow-execution.service.js +4 -1
- package/dist/workflows/workflow-execution.service.js.map +1 -1
- package/dist/workflows/workflow-history.ee/workflow-history.service.ee.d.ts +2 -2
- package/dist/workflows/workflow-history.ee/workflow-history.service.ee.js.map +1 -1
- package/dist/workflows/workflow.formatter.d.ts +2 -0
- package/dist/workflows/workflow.formatter.js +7 -0
- package/dist/workflows/workflow.formatter.js.map +1 -0
- package/dist/workflows/workflow.request.d.ts +2 -3
- package/dist/workflows/workflow.service.ee.d.ts +7 -7
- package/dist/workflows/workflow.service.ee.js +2 -2
- package/dist/workflows/workflow.service.ee.js.map +1 -1
- package/dist/workflows/workflows.controller.d.ts +4 -2
- package/dist/workflows/workflows.controller.js +1 -1
- package/dist/workflows/workflows.controller.js.map +1 -1
- package/package.json +12 -13
- package/dist/controllers/curl.controller.d.ts +0 -9
- package/dist/controllers/curl.controller.js +0 -41
- package/dist/controllers/curl.controller.js.map +0 -1
- package/dist/services/curl.service.d.ts +0 -51
- package/dist/services/curl.service.js +0 -334
- package/dist/services/curl.service.js.map +0 -1
|
@@ -32,6 +32,7 @@ export declare abstract class BaseCommand extends Command {
|
|
|
32
32
|
initLicense(): Promise<void>;
|
|
33
33
|
initExternalSecrets(): Promise<void>;
|
|
34
34
|
initWorkflowHistory(): void;
|
|
35
|
+
cleanupTestRunner(): Promise<void>;
|
|
35
36
|
finally(error: Error | undefined): Promise<void>;
|
|
36
37
|
protected onTerminationSignal(signal: string): () => Promise<void>;
|
|
37
38
|
}
|
|
@@ -49,6 +49,7 @@ const CrashJournal = __importStar(require("../crash-journal"));
|
|
|
49
49
|
const Db = __importStar(require("../db"));
|
|
50
50
|
const deduplication_1 = require("../deduplication");
|
|
51
51
|
const deprecation_service_1 = require("../deprecation/deprecation.service");
|
|
52
|
+
const test_runner_service_ee_1 = require("../evaluation.ee/test-runner/test-runner.service.ee");
|
|
52
53
|
const message_event_bus_1 = require("../eventbus/message-event-bus/message-event-bus");
|
|
53
54
|
const telemetry_event_relay_1 = require("../events/relays/telemetry.event-relay");
|
|
54
55
|
const expression_evaluator_1 = require("../expression-evaluator");
|
|
@@ -208,6 +209,9 @@ class BaseCommand extends core_1.Command {
|
|
|
208
209
|
initWorkflowHistory() {
|
|
209
210
|
di_1.Container.get(workflow_history_manager_ee_1.WorkflowHistoryManager).init();
|
|
210
211
|
}
|
|
212
|
+
async cleanupTestRunner() {
|
|
213
|
+
await di_1.Container.get(test_runner_service_ee_1.TestRunnerService).cleanupIncompleteRuns();
|
|
214
|
+
}
|
|
211
215
|
async finally(error) {
|
|
212
216
|
if (constants_1.inTest || this.id === 'start')
|
|
213
217
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-command.js","sourceRoot":"","sources":["../../src/commands/base-command.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4BAA0B;AAC1B,wCAA2C;AAC3C,gCAAoC;AACpC,sCAA8C;AAC9C,uCAOkB;AAClB,+CAAoE;AAGpE,sDAA8B;AAC9B,2CAAsE;AACtE,8DAAgD;AAChD,yCAA2B;AAC3B,mDAA8D;AAC9D,2EAAuE;AACvE,sFAAiF;AACjF,iFAA4E;AAC5E,iEAAiE;AACjE,qDAAiD;AACjD,mGAA2F;AAC3F,uCAAoC;AACpC,6EAAuE;AACvE,6CAAyC;AACzC,uCAA0C;AAC1C,kEAA8D;AAC9D,6GAAqG;AAErG,MAAsB,WAAY,SAAQ,cAAO;IAAjD;;QACW,WAAM,GAAG,cAAS,CAAC,GAAG,CAAC,iBAAM,CAAC,CAAC;QAQ/B,qBAAgB,GAAqB,cAAS,CAAC,GAAG,CAAC,2BAAgB,CAAC,CAAC;QAIrE,oBAAe,GAAoB,cAAS,CAAC,GAAG,CAAC,kCAAe,CAAC,CAAC;QAIzD,iBAAY,GAAG,cAAS,CAAC,GAAG,CAAC,qBAAY,CAAC,CAAC;QAKpD,+BAA0B,GACnC,cAAS,CAAC,GAAG,CAAC,qBAAY,CAAC,CAAC,OAAO,CAAC,uBAAuB,CAAC;QAGnD,2BAAsB,GAAG,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"base-command.js","sourceRoot":"","sources":["../../src/commands/base-command.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
+
import type { IWorkflowBase } from 'n8n-workflow';
|
|
1
2
|
import type { User } from '../databases/entities/user';
|
|
2
|
-
import type { IWorkflowDb } from '../interfaces';
|
|
3
3
|
import { BaseCommand } from './base-command';
|
|
4
4
|
import type { IExecutionResult, IResult, IWorkflowExecutionProgress } from '../types/commands.types';
|
|
5
5
|
export declare class ExecuteBatch extends BaseCommand {
|
|
@@ -41,5 +41,5 @@ export declare class ExecuteBatch extends BaseCommand {
|
|
|
41
41
|
setOutput(key: string, value: any): void;
|
|
42
42
|
updateStatus(): void;
|
|
43
43
|
initializeLogs(): void;
|
|
44
|
-
startThread(workflowData:
|
|
44
|
+
startThread(workflowData: IWorkflowBase): Promise<IExecutionResult>;
|
|
45
45
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute-batch.js","sourceRoot":"","sources":["../../src/commands/execute-batch.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"execute-batch.js","sourceRoot":"","sources":["../../src/commands/execute-batch.ts"],"names":[],"mappings":"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"}
|
|
@@ -65,10 +65,10 @@ class ImportWorkflowsCommand extends base_command_1.BaseCommand {
|
|
|
65
65
|
};
|
|
66
66
|
}
|
|
67
67
|
for (const workflow of workflows) {
|
|
68
|
-
if (!(await this.workflowExists(workflow))) {
|
|
68
|
+
if (!(await this.workflowExists(workflow.id))) {
|
|
69
69
|
continue;
|
|
70
70
|
}
|
|
71
|
-
const { user, project: ownerProject } = await this.getWorkflowOwner(workflow);
|
|
71
|
+
const { user, project: ownerProject } = await this.getWorkflowOwner(workflow.id);
|
|
72
72
|
if (!ownerProject) {
|
|
73
73
|
continue;
|
|
74
74
|
}
|
|
@@ -98,9 +98,9 @@ class ImportWorkflowsCommand extends base_command_1.BaseCommand {
|
|
|
98
98
|
reportSuccess(total) {
|
|
99
99
|
this.logger.info(`Successfully imported ${total} ${total === 1 ? 'workflow.' : 'workflows.'}`);
|
|
100
100
|
}
|
|
101
|
-
async getWorkflowOwner(
|
|
101
|
+
async getWorkflowOwner(workflowId) {
|
|
102
102
|
const sharing = await di_1.Container.get(shared_workflow_repository_1.SharedWorkflowRepository).findOne({
|
|
103
|
-
where: { workflowId
|
|
103
|
+
where: { workflowId, role: 'workflow:owner' },
|
|
104
104
|
relations: { project: true },
|
|
105
105
|
});
|
|
106
106
|
if (sharing && sharing.project.type === 'personal') {
|
|
@@ -114,8 +114,8 @@ class ImportWorkflowsCommand extends base_command_1.BaseCommand {
|
|
|
114
114
|
}
|
|
115
115
|
return {};
|
|
116
116
|
}
|
|
117
|
-
async workflowExists(
|
|
118
|
-
return await di_1.Container.get(workflow_repository_1.WorkflowRepository).existsBy({ id:
|
|
117
|
+
async workflowExists(workflowId) {
|
|
118
|
+
return await di_1.Container.get(workflow_repository_1.WorkflowRepository).existsBy({ id: workflowId });
|
|
119
119
|
}
|
|
120
120
|
async readWorkflows(path, separate) {
|
|
121
121
|
if (process.platform === 'win32') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workflow.js","sourceRoot":"","sources":["../../../src/commands/import/workflow.ts"],"names":[],"mappings":";;;;;;AAAA,gCAAoC;AACpC,sCAAoC;AACpC,0DAA6B;AAC7B,4CAAoB;
|
|
1
|
+
{"version":3,"file":"workflow.js","sourceRoot":"","sources":["../../../src/commands/import/workflow.ts"],"names":[],"mappings":";;;;;;AAAA,gCAAoC;AACpC,sCAAoC;AACpC,0DAA6B;AAC7B,4CAAoB;AAEpB,+CAA2D;AAE3D,2CAAiD;AAEjD,oFAAgF;AAChF,oGAA+F;AAC/F,8EAA0E;AAC1E,sFAAkF;AAClF,6DAA8D;AAE9D,8DAA0D;AAE1D,kDAA8C;AAE9C,SAAS,0BAA0B,CAAC,SAAkB;IACrD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;QAC/B,MAAM,IAAI,+BAAgB,CACzB,6FAA6F,CAC7F,CAAC;IACH,CAAC;IAED,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QAClC,IACC,OAAO,QAAQ,KAAK,QAAQ;YAC5B,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC;YACxD,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,EAAE,aAAa,CAAC,EAC7D,CAAC;YACF,MAAM,IAAI,+BAAgB,CAAC,gDAAgD,CAAC,CAAC;QAC9E,CAAC;IACF,CAAC;AACF,CAAC;AAED,MAAa,sBAAuB,SAAQ,0BAAW;IA4BtD,KAAK,CAAC,GAAG;QACR,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;QAE3D,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;YAClB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,0DAA0D,CAAC,CAAC;YAC7E,OAAO;QACR,CAAC;QAED,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;YACpB,IAAI,YAAE,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;gBAChC,IAAI,CAAC,YAAE,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;oBAC9C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,6CAA6C,CAAC,CAAC;oBAChE,OAAO;gBACR,CAAC;YACF,CAAC;QACF,CAAC;QAED,IAAI,KAAK,CAAC,SAAS,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;YACrC,MAAM,IAAI,+BAAgB,CACzB,6EAA6E,CAC7E,CAAC;QACH,CAAC;QAED,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;QAErE,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;QAExE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;QAEnF,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACrB,MAAM,IAAI,+BAAgB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC5C,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,SAAS,CAAC,MAAM,eAAe,CAAC,CAAC;QAE/D,MAAM,cAAS,CAAC,GAAG,CAAC,8BAAa,CAAC,CAAC,eAAe,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;QAE1E,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IACtC,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,SAA0B,EAAE,SAAkB,EAAE,MAAe;QAE3F,IAAI,CAAC,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;YAC3B,OAAO;gBACN,OAAO,EAAE,IAAa;gBACtB,OAAO,EAAE,SAAS;aAClB,CAAC;QACH,CAAC;QAED,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;YAClC,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;gBAC/C,SAAS;YACV,CAAC;YAED,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YAEjF,IAAI,CAAC,YAAY,EAAE,CAAC;gBACnB,SAAS;YACV,CAAC;YAED,IAAI,YAAY,CAAC,EAAE,KAAK,SAAS,EAAE,CAAC;gBACnC,MAAM,YAAY,GACjB,YAAY,CAAC,IAAI,KAAK,UAAU;oBAC/B,CAAC,CAAC,yBAAyB,IAAI,CAAC,EAAE,GAAG;oBACrC,CAAC,CAAC,4BAA4B,YAAY,CAAC,EAAE,GAAG,CAAC;gBACnD,MAAM,QAAQ,GAAG,MAAM;oBACtB,CAAC;wBAEA,yBAAyB,MAAM,GAAG;oBACnC,CAAC,CAAC,4BAA4B,SAAS,GAAG,CAAC;gBAE5C,OAAO;oBACN,OAAO,EAAE,KAAc;oBACvB,OAAO,EAAE,2BAA2B,QAAQ,CAAC,EAAE,yBAAyB,YAAY,6BAA6B,QAAQ,GAAG;iBAC5H,CAAC;YACH,CAAC;QACF,CAAC;QAED,OAAO;YACN,OAAO,EAAE,IAAa;YACtB,OAAO,EAAE,SAAS;SAClB,CAAC;IACH,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,KAAY;QACvB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4EAA4E,CAAC,CAAC;QAChG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAClC,CAAC;IAEO,aAAa,CAAC,KAAa;QAClC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,yBAAyB,KAAK,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,YAAY,EAAE,CAAC,CAAC;IAChG,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAAC,UAAsB;QACpD,MAAM,OAAO,GAAG,MAAM,cAAS,CAAC,GAAG,CAAC,qDAAwB,CAAC,CAAC,OAAO,CAAC;YACrE,KAAK,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,gBAAgB,EAAE;YAC7C,SAAS,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;SAC5B,CAAC,CAAC;QAEH,IAAI,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;YACpD,MAAM,IAAI,GAAG,MAAM,cAAS,CAAC,GAAG,CAAC,gCAAc,CAAC,CAAC,eAAe,CAAC;gBAChE,gBAAgB,EAAE;oBACjB,IAAI,EAAE,uBAAuB;oBAC7B,SAAS,EAAE,OAAO,CAAC,SAAS;iBAC5B;aACD,CAAC,CAAC;YAEH,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC;QAC3C,CAAC;QAED,OAAO,EAAE,CAAC;IACX,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,UAAsB;QAClD,OAAO,MAAM,cAAS,CAAC,GAAG,CAAC,wCAAkB,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;IAC7E,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,IAAY,EAAE,QAAiB;QAC1D,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;YAClC,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACjC,CAAC;QAED,IAAI,QAAQ,EAAE,CAAC;YACd,MAAM,KAAK,GAAG,MAAM,IAAA,mBAAI,EAAC,QAAQ,EAAE;gBAClC,GAAG,EAAE,IAAI;gBACT,QAAQ,EAAE,IAAI;aACd,CAAC,CAAC;YACH,MAAM,iBAAiB,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;gBAC5C,MAAM,QAAQ,GAAG,IAAA,wBAAS,EAAoB,YAAE,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;gBAC3F,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;oBAClB,QAAQ,CAAC,EAAE,GAAG,IAAA,2BAAc,GAAE,CAAC;gBAChC,CAAC;gBAED,MAAM,gBAAgB,GAAG,cAAS,CAAC,GAAG,CAAC,wCAAkB,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;gBAE5E,OAAO,gBAAgB,CAAC;YACzB,CAAC,CAAC,CAAC;YAEH,OAAO,iBAAiB,CAAC;QAC1B,CAAC;aAAM,CAAC;YACP,MAAM,SAAS,GAAG,IAAA,wBAAS,EAAsB,YAAE,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;YAE9F,MAAM,iBAAiB,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,cAAS,CAAC,GAAG,CAAC,wCAAkB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;YAC5F,0BAA0B,CAAC,SAAS,CAAC,CAAC;YAEtC,OAAO,iBAAiB,CAAC;QAC1B,CAAC;IACF,CAAC;IAEO,KAAK,CAAC,UAAU,CAAC,MAAe,EAAE,SAAkB;QAC3D,IAAI,SAAS,EAAE,CAAC;YACf,OAAO,MAAM,cAAS,CAAC,GAAG,CAAC,sCAAiB,CAAC,CAAC,eAAe,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;QAClF,CAAC;QAED,IAAI,CAAC,MAAM,EAAE,CAAC;YACb,MAAM,KAAK,GAAG,MAAM,cAAS,CAAC,GAAG,CAAC,gCAAc,CAAC,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,CAAC;YACtF,IAAI,CAAC,KAAK,EAAE,CAAC;gBACZ,MAAM,IAAI,+BAAgB,CAAC,yBAAyB,8BAAkB,EAAE,CAAC,CAAC;YAC3E,CAAC;YACD,MAAM,GAAG,KAAK,CAAC,EAAE,CAAC;QACnB,CAAC;QAED,OAAO,MAAM,cAAS,CAAC,GAAG,CAAC,sCAAiB,CAAC,CAAC,+BAA+B,CAAC,MAAM,CAAC,CAAC;IACvF,CAAC;;AA/LF,wDAgMC;AA/LO,kCAAW,GAAG,kBAAkB,CAAC;AAEjC,+BAAQ,GAAG;IACjB,yCAAyC;IACzC,0DAA0D;IAC1D,uFAAuF;IACvF,sEAAsE;IACtE,wGAAwG;CACxG,CAAC;AAEK,4BAAK,GAAG;IACd,IAAI,EAAE,YAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;IAC/B,KAAK,EAAE,YAAK,CAAC,MAAM,CAAC;QACnB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,oDAAoD;KACjE,CAAC;IACF,QAAQ,EAAE,YAAK,CAAC,OAAO,CAAC;QACvB,WAAW,EAAE,yDAAyD;KACtE,CAAC;IACF,MAAM,EAAE,YAAK,CAAC,MAAM,CAAC;QACpB,WAAW,EAAE,wDAAwD;KACrE,CAAC;IACF,SAAS,EAAE,YAAK,CAAC,MAAM,CAAC;QACvB,WAAW,EAAE,2DAA2D;KACxE,CAAC;CACF,CAAC"}
|
package/dist/commands/start.js
CHANGED
|
@@ -178,6 +178,10 @@ class Start extends base_command_1.BaseCommand {
|
|
|
178
178
|
this.logger.debug('External secrets init complete');
|
|
179
179
|
this.initWorkflowHistory();
|
|
180
180
|
this.logger.debug('Workflow history init complete');
|
|
181
|
+
if (!isMultiMainEnabled) {
|
|
182
|
+
await this.cleanupTestRunner();
|
|
183
|
+
this.logger.debug('Test runner cleanup complete');
|
|
184
|
+
}
|
|
181
185
|
if (!this.globalConfig.endpoints.disableUi) {
|
|
182
186
|
await this.generateStaticAssets();
|
|
183
187
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,6 @@ import { Logger } from 'n8n-core';
|
|
|
2
2
|
import type { WorkflowExecuteMode as ExecutionMode } from 'n8n-workflow';
|
|
3
3
|
import { ExecutionRepository } from '../databases/repositories/execution.repository';
|
|
4
4
|
import { EventService } from '../events/event.service';
|
|
5
|
-
import type { IExecutingWorkflowData } from '../interfaces';
|
|
6
5
|
import { Telemetry } from '../telemetry';
|
|
7
6
|
export declare const CLOUD_TEMP_PRODUCTION_LIMIT = 999;
|
|
8
7
|
export declare const CLOUD_TEMP_REPORTABLE_THRESHOLDS: number[];
|
|
@@ -29,9 +28,7 @@ export declare class ConcurrencyControlService {
|
|
|
29
28
|
mode: ExecutionMode;
|
|
30
29
|
executionId: string;
|
|
31
30
|
}): void;
|
|
32
|
-
removeAll(
|
|
33
|
-
[executionId: string]: IExecutingWorkflowData;
|
|
34
|
-
}): Promise<void>;
|
|
31
|
+
removeAll(executionIdsToCancel: string[]): Promise<void>;
|
|
35
32
|
disable(): void;
|
|
36
33
|
private logInit;
|
|
37
34
|
private isUnlimited;
|
|
@@ -101,7 +101,7 @@ let ConcurrencyControlService = class ConcurrencyControlService {
|
|
|
101
101
|
return;
|
|
102
102
|
this.getQueue(mode)?.remove(executionId);
|
|
103
103
|
}
|
|
104
|
-
async removeAll(
|
|
104
|
+
async removeAll(executionIdsToCancel) {
|
|
105
105
|
if (!this.isEnabled)
|
|
106
106
|
return;
|
|
107
107
|
this.queues.forEach((queue) => {
|
|
@@ -110,13 +110,12 @@ let ConcurrencyControlService = class ConcurrencyControlService {
|
|
|
110
110
|
queue.remove(id);
|
|
111
111
|
}
|
|
112
112
|
});
|
|
113
|
-
|
|
114
|
-
.filter(([_, execution]) => execution.status === 'new' && execution.responsePromise)
|
|
115
|
-
.map(([executionId, _]) => executionId);
|
|
116
|
-
if (executionIds.length === 0)
|
|
113
|
+
if (executionIdsToCancel.length === 0)
|
|
117
114
|
return;
|
|
118
|
-
await this.executionRepository.cancelMany(
|
|
119
|
-
this.logger.info('Canceled enqueued executions with response promises', {
|
|
115
|
+
await this.executionRepository.cancelMany(executionIdsToCancel);
|
|
116
|
+
this.logger.info('Canceled enqueued executions with response promises', {
|
|
117
|
+
executionIds: executionIdsToCancel,
|
|
118
|
+
});
|
|
120
119
|
}
|
|
121
120
|
disable() {
|
|
122
121
|
this.isEnabled = false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"concurrency-control.service.js","sourceRoot":"","sources":["../../src/concurrency/concurrency-control.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gCAAkC;AAClC,mCAAoC;AACpC,uCAAkC;AAGlC,sDAA8B;AAC9B,wFAAoF;AACpF,8FAAwF;AACxF,wFAAkF;AAClF,0DAAsD;
|
|
1
|
+
{"version":3,"file":"concurrency-control.service.js","sourceRoot":"","sources":["../../src/concurrency/concurrency-control.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gCAAkC;AAClC,mCAAoC;AACpC,uCAAkC;AAGlC,sDAA8B;AAC9B,wFAAoF;AACpF,8FAAwF;AACxF,wFAAkF;AAClF,0DAAsD;AACtD,2CAAwC;AAExC,2DAAuD;AAE1C,QAAA,2BAA2B,GAAG,GAAG,CAAC;AAClC,QAAA,gCAAgC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;AAKnE,IAAM,yBAAyB,GAA/B,MAAM,yBAAyB;IAWrC,YACkB,MAAc,EACd,mBAAwC,EACxC,SAAoB,EACpB,YAA0B;QAH1B,WAAM,GAAN,MAAM,CAAQ;QACd,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,cAAS,GAAT,SAAS,CAAW;QACpB,iBAAY,GAAZ,YAAY,CAAc;QAR3B,mBAAc,GAAG,wCAAgC,CAAC,GAAG,CACrE,CAAC,CAAC,EAAE,EAAE,CAAC,mCAA2B,GAAG,CAAC,CACtC,CAAC;QAQD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QAEhD,IAAI,CAAC,MAAM,GAAG,IAAI,GAAG,CAAC;YACrB,CAAC,YAAY,EAAE,gBAAM,CAAC,MAAM,CAAC,wCAAwC,CAAC,CAAC;YACvE,CAAC,YAAY,EAAE,gBAAM,CAAC,MAAM,CAAC,wCAAwC,CAAC,CAAC;SACvE,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;YACnC,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;gBACjB,MAAM,IAAI,8DAA4B,CAAC,KAAK,CAAC,CAAC;YAC/C,CAAC;YAED,IAAI,KAAK,GAAG,CAAC,CAAC,EAAE,CAAC;gBAChB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;YAC3B,CAAC;QACF,CAAC,CAAC,CAAC;QAEH,IACC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC;YAC/D,gBAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,KAAK,OAAO,EAC3C,CAAC;YACF,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;YACvB,OAAO;QACR,CAAC;QAED,IAAI,CAAC,MAAM,GAAG,IAAI,GAAG,EAAE,CAAC;QACxB,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;YACnC,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;gBACf,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,oCAAgB,CAAC,KAAK,CAAC,CAAC,CAAC;YACpD,CAAC;QACF,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,EAAE,CAAC;QAEf,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QAEtB,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;YACnC,KAAK,CAAC,EAAE,CAAC,mBAAmB,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE;gBAC9C,IAAI,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC;oBACjC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,4BAA4B,EAAE;wBAClD,SAAS,EAAE,mCAA2B,GAAG,QAAQ;wBACjD,gBAAgB,EAAE,IAAI;qBACtB,CAAC,CAAC;gBACJ,CAAC;YACF,CAAC,CAAC,CAAC;YAEH,KAAK,CAAC,EAAE,CAAC,qBAAqB,EAAE,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE;gBACnD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,qBAAqB,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;gBAChE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,qBAAqB,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;YACtE,CAAC,CAAC,CAAC;YAEH,KAAK,CAAC,EAAE,CAAC,oBAAoB,EAAE,CAAC,WAAW,EAAE,EAAE;gBAC9C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oBAAoB,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;YAChE,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;IACJ,CAAC;IAKD,GAAG,CAAC,WAAmB;QACtB,IAAI,CAAC,IAAI,CAAC,SAAS;YAAE,OAAO,KAAK,CAAC;QAElC,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;YAC1C,IAAI,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC;gBAC5B,OAAO,IAAI,CAAC;YACb,CAAC;QACF,CAAC;QAED,OAAO,KAAK,CAAC;IACd,CAAC;IAKD,KAAK,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,WAAW,EAAgD;QACjF,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;YAAE,OAAO;QAEtD,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IACjD,CAAC;IAKD,OAAO,CAAC,EAAE,IAAI,EAA2B;QACxC,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;YAAE,OAAO;QAEtD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,CAAC;IAChC,CAAC;IAKD,MAAM,CAAC,EAAE,IAAI,EAAE,WAAW,EAAgD;QACzE,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;YAAE,OAAO;QAEtD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;IAC1C,CAAC;IAOD,KAAK,CAAC,SAAS,CAAC,oBAA8B;QAC7C,IAAI,CAAC,IAAI,CAAC,SAAS;YAAE,OAAO;QAE5B,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YAC7B,MAAM,oBAAoB,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;YAE5C,KAAK,MAAM,EAAE,IAAI,oBAAoB,EAAE,CAAC;gBACvC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAClB,CAAC;QACF,CAAC,CAAC,CAAC;QAEH,IAAI,oBAAoB,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QAE9C,MAAM,IAAI,CAAC,mBAAmB,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC;QAEhE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qDAAqD,EAAE;YACvE,YAAY,EAAE,oBAAoB;SAClC,CAAC,CAAC;IACJ,CAAC;IAED,OAAO;QACN,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;IACxB,CAAC;IAMO,OAAO;QACd,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAE7B,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;YACnC,IAAI,CAAC,MAAM,CAAC,KAAK,CAChB;gBACC,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,2BAA2B;gBAC9C,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,aAAa,GAAG,KAAK,CAAC,QAAQ,EAAE;aAC7D,CAAC,IAAI,CAAC,GAAG,CAAC,CACX,CAAC;QACH,CAAC,CAAC,CAAC;IACJ,CAAC;IAEO,WAAW,CAAC,IAAmB;QACtC,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,SAAS,CAAC;IAC1C,CAAC;IAEO,YAAY,CAAC,QAAgB;QACpC,OAAO,gBAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,KAAK,OAAO,IAAI,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC/F,CAAC;IAKO,QAAQ,CAAC,IAAmB;QACnC,IACC,IAAI,KAAK,OAAO;YAChB,IAAI,KAAK,YAAY;YACrB,IAAI,KAAK,KAAK;YACd,IAAI,KAAK,UAAU;YACnB,IAAI,KAAK,QAAQ;YACjB,IAAI,KAAK,OAAO,EACf,CAAC;YACF,OAAO,SAAS,CAAC;QAClB,CAAC;QAED,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,KAAK,SAAS;YAAE,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QAEnF,IAAI,IAAI,KAAK,YAAY;YAAE,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QAEhE,MAAM,IAAI,wDAAyB,CAAC,IAAI,CAAC,CAAC;IAC3C,CAAC;CACD,CAAA;AA/LY,8DAAyB;oCAAzB,yBAAyB;IADrC,IAAA,YAAO,GAAE;qCAaiB,iBAAM;QACO,0CAAmB;QAC7B,qBAAS;QACN,4BAAY;GAfhC,yBAAyB,CA+LrC"}
|
|
@@ -30,9 +30,11 @@ export declare abstract class AbstractOAuthController {
|
|
|
30
30
|
get baseUrl(): string;
|
|
31
31
|
protected getCredential(req: OAuthRequest.OAuth2Credential.Auth): Promise<CredentialsEntity>;
|
|
32
32
|
protected getAdditionalData(): Promise<IWorkflowExecuteAdditionalData>;
|
|
33
|
-
protected
|
|
33
|
+
protected getDecryptedDataForAuthUri(credential: ICredentialsDb, additionalData: IWorkflowExecuteAdditionalData): Promise<ICredentialDataDecryptedObject>;
|
|
34
|
+
protected getDecryptedDataForCallback(credential: ICredentialsDb, additionalData: IWorkflowExecuteAdditionalData): Promise<ICredentialDataDecryptedObject>;
|
|
35
|
+
private getDecryptedData;
|
|
34
36
|
protected applyDefaultsAndOverwrites<T>(credential: ICredentialsDb, decryptedData: ICredentialDataDecryptedObject, additionalData: IWorkflowExecuteAdditionalData): T;
|
|
35
|
-
protected encryptAndSaveData(credential: ICredentialsDb,
|
|
37
|
+
protected encryptAndSaveData(credential: ICredentialsDb, toUpdate: ICredentialDataDecryptedObject, toDelete?: string[]): Promise<void>;
|
|
36
38
|
protected getCredentialWithoutUser(credentialId: string): Promise<ICredentialsDb | null>;
|
|
37
39
|
createCsrfState(credentialsId: string, userId?: string): [string, string];
|
|
38
40
|
protected decodeCsrfState(encodedState: string, req: AuthenticatedRequest): CsrfStateParam;
|
|
@@ -92,15 +92,21 @@ let AbstractOAuthController = class AbstractOAuthController {
|
|
|
92
92
|
async getAdditionalData() {
|
|
93
93
|
return await WorkflowExecuteAdditionalData.getBase();
|
|
94
94
|
}
|
|
95
|
-
async
|
|
96
|
-
return await this.
|
|
95
|
+
async getDecryptedDataForAuthUri(credential, additionalData) {
|
|
96
|
+
return await this.getDecryptedData(credential, additionalData, false);
|
|
97
|
+
}
|
|
98
|
+
async getDecryptedDataForCallback(credential, additionalData) {
|
|
99
|
+
return await this.getDecryptedData(credential, additionalData, true);
|
|
100
|
+
}
|
|
101
|
+
async getDecryptedData(credential, additionalData, raw) {
|
|
102
|
+
return await this.credentialsHelper.getDecrypted(additionalData, credential, credential.type, 'internal', undefined, raw);
|
|
97
103
|
}
|
|
98
104
|
applyDefaultsAndOverwrites(credential, decryptedData, additionalData) {
|
|
99
105
|
return this.credentialsHelper.applyDefaultsAndOverwrites(additionalData, decryptedData, credential.type, 'internal');
|
|
100
106
|
}
|
|
101
|
-
async encryptAndSaveData(credential,
|
|
102
|
-
const credentials = new n8n_core_1.Credentials(credential, credential.type);
|
|
103
|
-
credentials.
|
|
107
|
+
async encryptAndSaveData(credential, toUpdate, toDelete = []) {
|
|
108
|
+
const credentials = new n8n_core_1.Credentials(credential, credential.type, credential.data);
|
|
109
|
+
credentials.updateData(toUpdate, toDelete);
|
|
104
110
|
await this.credentialsRepository.update(credential.id, {
|
|
105
111
|
...credentials.getDataToSave(),
|
|
106
112
|
updatedAt: new Date(),
|
|
@@ -147,7 +153,7 @@ let AbstractOAuthController = class AbstractOAuthController {
|
|
|
147
153
|
throw new n8n_workflow_1.ApplicationError('OAuth callback failed because of insufficient permissions');
|
|
148
154
|
}
|
|
149
155
|
const additionalData = await this.getAdditionalData();
|
|
150
|
-
const decryptedDataOriginal = await this.
|
|
156
|
+
const decryptedDataOriginal = await this.getDecryptedDataForCallback(credential, additionalData);
|
|
151
157
|
const oauthCredentials = this.applyDefaultsAndOverwrites(credential, decryptedDataOriginal, additionalData);
|
|
152
158
|
if (!this.verifyCsrfState(decryptedDataOriginal, state)) {
|
|
153
159
|
throw new n8n_workflow_1.ApplicationError('The OAuth callback state is invalid!');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"abstract-oauth.controller.js","sourceRoot":"","sources":["../../../src/controllers/oauth/abstract-oauth.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wCAA2C;AAC3C,gCAAkC;AAClC,gDAAwB;AAExB,uCAA+C;AAE/C,+CAA2D;AAE3D,2CAA4D;AAC5D,6DAAyD;AAEzD,4FAAwF;AACxF,0GAAqG;AACrG,oEAAgE;AAChE,kFAA6E;AAC7E,8EAAyE;AACzE,qDAAiD;AAGjD,wDAAoD;AACpD,kGAAoF;AAapF,MAAM,YAAY,GAAG,CAAC,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,CAAC;AAIxC,QAAA,uBAAuB,GAAG,OAAO,CAAC,GAAG,CAAC,+BAA+B,KAAK,MAAM,CAAC;AAGvF,IAAe,uBAAuB,GAAtC,MAAe,uBAAuB;IAG5C,YACoB,MAAc,EACd,aAA4B,EAC9B,iBAAoC,EACpC,qBAA4C,EAC5C,2BAAwD,EACxD,UAAsB,EACtB,YAA0B;QANxB,WAAM,GAAN,MAAM,CAAQ;QACd,kBAAa,GAAb,aAAa,CAAe;QAC9B,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,gCAA2B,GAA3B,2BAA2B,CAA6B;QACxD,eAAU,GAAV,UAAU,CAAY;QACtB,iBAAY,GAAZ,YAAY,CAAc;IACzC,CAAC;IAEJ,IAAI,OAAO;QACV,MAAM,OAAO,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,kBAAkB,EAAE,IAAI,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;QAC9F,OAAO,GAAG,OAAO,SAAS,IAAI,CAAC,YAAY,aAAa,CAAC;IAC1D,CAAC;IAES,KAAK,CAAC,aAAa,CAC5B,GAAuC;QAEvC,MAAM,EAAE,EAAE,EAAE,YAAY,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC;QAEvC,IAAI,CAAC,YAAY,EAAE,CAAC;YACnB,MAAM,IAAI,mCAAe,CAAC,mCAAmC,CAAC,CAAC;QAChE,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAAC,qBAAqB,CAC9E,YAAY,EACZ,GAAG,CAAC,IAAI,EACR,CAAC,iBAAiB,CAAC,CACnB,CAAC;QAEF,IAAI,CAAC,UAAU,EAAE,CAAC;YACjB,IAAI,CAAC,MAAM,CAAC,KAAK,CAChB,QAAQ,IAAI,CAAC,YAAY,iGAAiG,EAC1H,EAAE,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,CACvB,CAAC;YACF,MAAM,IAAI,+BAAa,CAAC,mCAAuB,CAAC,aAAa,CAAC,CAAC;QAChE,CAAC;QAED,OAAO,UAAU,CAAC;IACnB,CAAC;IAES,KAAK,CAAC,iBAAiB;QAChC,OAAO,MAAM,6BAA6B,CAAC,OAAO,EAAE,CAAC;IACtD,CAAC;
|
|
1
|
+
{"version":3,"file":"abstract-oauth.controller.js","sourceRoot":"","sources":["../../../src/controllers/oauth/abstract-oauth.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wCAA2C;AAC3C,gCAAkC;AAClC,gDAAwB;AAExB,uCAA+C;AAE/C,+CAA2D;AAE3D,2CAA4D;AAC5D,6DAAyD;AAEzD,4FAAwF;AACxF,0GAAqG;AACrG,oEAAgE;AAChE,kFAA6E;AAC7E,8EAAyE;AACzE,qDAAiD;AAGjD,wDAAoD;AACpD,kGAAoF;AAapF,MAAM,YAAY,GAAG,CAAC,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,CAAC;AAIxC,QAAA,uBAAuB,GAAG,OAAO,CAAC,GAAG,CAAC,+BAA+B,KAAK,MAAM,CAAC;AAGvF,IAAe,uBAAuB,GAAtC,MAAe,uBAAuB;IAG5C,YACoB,MAAc,EACd,aAA4B,EAC9B,iBAAoC,EACpC,qBAA4C,EAC5C,2BAAwD,EACxD,UAAsB,EACtB,YAA0B;QANxB,WAAM,GAAN,MAAM,CAAQ;QACd,kBAAa,GAAb,aAAa,CAAe;QAC9B,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,gCAA2B,GAA3B,2BAA2B,CAA6B;QACxD,eAAU,GAAV,UAAU,CAAY;QACtB,iBAAY,GAAZ,YAAY,CAAc;IACzC,CAAC;IAEJ,IAAI,OAAO;QACV,MAAM,OAAO,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,kBAAkB,EAAE,IAAI,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;QAC9F,OAAO,GAAG,OAAO,SAAS,IAAI,CAAC,YAAY,aAAa,CAAC;IAC1D,CAAC;IAES,KAAK,CAAC,aAAa,CAC5B,GAAuC;QAEvC,MAAM,EAAE,EAAE,EAAE,YAAY,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC;QAEvC,IAAI,CAAC,YAAY,EAAE,CAAC;YACnB,MAAM,IAAI,mCAAe,CAAC,mCAAmC,CAAC,CAAC;QAChE,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAAC,qBAAqB,CAC9E,YAAY,EACZ,GAAG,CAAC,IAAI,EACR,CAAC,iBAAiB,CAAC,CACnB,CAAC;QAEF,IAAI,CAAC,UAAU,EAAE,CAAC;YACjB,IAAI,CAAC,MAAM,CAAC,KAAK,CAChB,QAAQ,IAAI,CAAC,YAAY,iGAAiG,EAC1H,EAAE,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,CACvB,CAAC;YACF,MAAM,IAAI,+BAAa,CAAC,mCAAuB,CAAC,aAAa,CAAC,CAAC;QAChE,CAAC;QAED,OAAO,UAAU,CAAC;IACnB,CAAC;IAES,KAAK,CAAC,iBAAiB;QAChC,OAAO,MAAM,6BAA6B,CAAC,OAAO,EAAE,CAAC;IACtD,CAAC;IAKS,KAAK,CAAC,0BAA0B,CACzC,UAA0B,EAC1B,cAA8C;QAE9C,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAAC,UAAU,EAAE,cAAc,EAAE,KAAK,CAAC,CAAC;IACvE,CAAC;IAKS,KAAK,CAAC,2BAA2B,CAC1C,UAA0B,EAC1B,cAA8C;QAE9C,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAAC,UAAU,EAAE,cAAc,EAAE,IAAI,CAAC,CAAC;IACtE,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAC7B,UAA0B,EAC1B,cAA8C,EAC9C,GAAY;QAEZ,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAC/C,cAAc,EACd,UAAU,EACV,UAAU,CAAC,IAAI,EACf,UAAU,EACV,SAAS,EACT,GAAG,CACH,CAAC;IACH,CAAC;IAES,0BAA0B,CACnC,UAA0B,EAC1B,aAA6C,EAC7C,cAA8C;QAE9C,OAAO,IAAI,CAAC,iBAAiB,CAAC,0BAA0B,CACvD,cAAc,EACd,aAAa,EACb,UAAU,CAAC,IAAI,EACf,UAAU,CACM,CAAC;IACnB,CAAC;IAES,KAAK,CAAC,kBAAkB,CACjC,UAA0B,EAC1B,QAAwC,EACxC,WAAqB,EAAE;QAEvB,MAAM,WAAW,GAAG,IAAI,sBAAW,CAAC,UAAU,EAAE,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;QAClF,WAAW,CAAC,UAAU,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAC3C,MAAM,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,EAAE;YACtD,GAAG,WAAW,CAAC,aAAa,EAAE;YAC9B,SAAS,EAAE,IAAI,IAAI,EAAE;SACrB,CAAC,CAAC;IACJ,CAAC;IAGS,KAAK,CAAC,wBAAwB,CAAC,YAAoB;QAC5D,OAAO,MAAM,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,YAAY,EAAE,CAAC,CAAC;IACzE,CAAC;IAED,eAAe,CAAC,aAAqB,EAAE,MAAe;QACrD,MAAM,KAAK,GAAG,IAAI,cAAI,EAAE,CAAC;QACzB,MAAM,UAAU,GAAG,KAAK,CAAC,UAAU,EAAE,CAAC;QACtC,MAAM,KAAK,GAAmB;YAC7B,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC;YAC/B,GAAG,EAAE,aAAa;YAClB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YACrB,MAAM;SACN,CAAC;QACF,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC5E,CAAC;IAES,eAAe,CAAC,YAAoB,EAAE,GAAyB;QACxE,MAAM,YAAY,GAAG,sBAAsB,CAAC;QAC5C,MAAM,OAAO,GAAG,IAAA,wBAAS,EAAiB,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC,QAAQ,EAAE,EAAE;YACzF,YAAY;SACZ,CAAC,CAAC;QAEH,IAAI,OAAO,OAAO,CAAC,GAAG,KAAK,QAAQ,IAAI,OAAO,OAAO,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC1E,MAAM,IAAI,+BAAgB,CAAC,YAAY,CAAC,CAAC;QAC1C,CAAC;QAED,IAAI,OAAO,CAAC,MAAM,KAAK,GAAG,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC;YACrC,MAAM,IAAI,sBAAS,CAAC,cAAc,CAAC,CAAC;QACrC,CAAC;QAED,OAAO,OAAO,CAAC;IAChB,CAAC;IAES,eAAe,CACxB,SAAmE,EACnE,KAAqB;QAErB,MAAM,KAAK,GAAG,IAAI,cAAI,EAAE,CAAC;QAEzB,OAAO,CACN,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,SAAS,IAAI,YAAY;YAC5C,SAAS,CAAC,UAAU,KAAK,SAAS;YAClC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,EAAE,KAAK,CAAC,KAAK,CAAC,CAC/C,CAAC;IACH,CAAC;IAES,KAAK,CAAC,iBAAiB,CAChC,GAAoF;QAEpF,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC;QAC1C,MAAM,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;QACtD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAClE,IAAI,CAAC,UAAU,EAAE,CAAC;YACjB,MAAM,IAAI,+BAAgB,CAAC,2DAA2D,CAAC,CAAC;QACzF,CAAC;QAED,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACtD,MAAM,qBAAqB,GAAG,MAAM,IAAI,CAAC,2BAA2B,CACnE,UAAU,EACV,cAAc,CACd,CAAC;QACF,MAAM,gBAAgB,GAAG,IAAI,CAAC,0BAA0B,CACvD,UAAU,EACV,qBAAqB,EACrB,cAAc,CACd,CAAC;QAEF,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,qBAAqB,EAAE,KAAK,CAAC,EAAE,CAAC;YACzD,MAAM,IAAI,+BAAgB,CAAC,sCAAsC,CAAC,CAAC;QACpE,CAAC;QAED,OAAO,CAAC,UAAU,EAAE,qBAAqB,EAAE,gBAAgB,CAAC,CAAC;IAC9D,CAAC;IAES,mBAAmB,CAAC,GAAa,EAAE,OAAe,EAAE,MAAe;QAC5E,GAAG,CAAC,MAAM,CAAC,sBAAsB,EAAE,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;IACpE,CAAC;CACD,CAAA;AA3LqB,0DAAuB;kCAAvB,uBAAuB;IAD5C,IAAA,YAAO,GAAE;qCAKmB,iBAAM;QACC,8BAAa;QACX,sCAAiB;QACb,8CAAqB;QACf,2DAA2B;QAC5C,wBAAU;QACR,qBAAY;GAVvB,uBAAuB,CA2L5C"}
|
|
@@ -32,7 +32,7 @@ let OAuth1CredentialController = class OAuth1CredentialController extends abstra
|
|
|
32
32
|
async getAuthUri(req) {
|
|
33
33
|
const credential = await this.getCredential(req);
|
|
34
34
|
const additionalData = await this.getAdditionalData();
|
|
35
|
-
const decryptedDataOriginal = await this.
|
|
35
|
+
const decryptedDataOriginal = await this.getDecryptedDataForAuthUri(credential, additionalData);
|
|
36
36
|
const oauthCredentials = this.applyDefaultsAndOverwrites(credential, decryptedDataOriginal, additionalData);
|
|
37
37
|
const [csrfSecret, state] = this.createCsrfState(credential.id, abstract_oauth_controller_1.skipAuthOnOAuthCallback ? undefined : req.user.id);
|
|
38
38
|
const signatureMethod = oauthCredentials.signatureMethod;
|
|
@@ -63,8 +63,7 @@ let OAuth1CredentialController = class OAuth1CredentialController extends abstra
|
|
|
63
63
|
const paramsParser = new URLSearchParams(response);
|
|
64
64
|
const responseJson = Object.fromEntries(paramsParser.entries());
|
|
65
65
|
const returnUri = `${oauthCredentials.authUrl}?oauth_token=${responseJson.oauth_token}`;
|
|
66
|
-
|
|
67
|
-
await this.encryptAndSaveData(credential, decryptedDataOriginal);
|
|
66
|
+
await this.encryptAndSaveData(credential, { csrfSecret });
|
|
68
67
|
this.logger.debug('OAuth1 authorization successful for new credential', {
|
|
69
68
|
userId: req.user.id,
|
|
70
69
|
credentialId: credential.id,
|
|
@@ -77,16 +76,14 @@ let OAuth1CredentialController = class OAuth1CredentialController extends abstra
|
|
|
77
76
|
if (!oauth_verifier || !oauth_token || !encodedState) {
|
|
78
77
|
return this.renderCallbackError(res, 'Insufficient parameters for OAuth1 callback.', `Received following query parameters: ${JSON.stringify(req.query)}`);
|
|
79
78
|
}
|
|
80
|
-
const [credential,
|
|
79
|
+
const [credential, _, oauthCredentials] = await this.resolveCredential(req);
|
|
81
80
|
const oauthToken = await axios_1.default.post(oauthCredentials.accessTokenUrl, {
|
|
82
81
|
oauth_token,
|
|
83
82
|
oauth_verifier,
|
|
84
83
|
});
|
|
85
84
|
const paramParser = new URLSearchParams(oauthToken.data);
|
|
86
|
-
const
|
|
87
|
-
|
|
88
|
-
decryptedDataOriginal.oauthTokenData = oauthTokenJson;
|
|
89
|
-
await this.encryptAndSaveData(credential, decryptedDataOriginal);
|
|
85
|
+
const oauthTokenData = Object.fromEntries(paramParser.entries());
|
|
86
|
+
await this.encryptAndSaveData(credential, { oauthTokenData }, ['csrfSecret']);
|
|
90
87
|
this.logger.debug('OAuth1 callback successful for new credential', {
|
|
91
88
|
credentialId: credential.id,
|
|
92
89
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth1-credential.controller.js","sourceRoot":"","sources":["../../../src/controllers/oauth/oauth1-credential.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,kDAA0B;AAC1B,mCAAoC;AAEpC,+CAA0D;AAE1D,4DAAsC;AAEtC,6CAAmD;AAGnD,2EAA+F;AAW/F,MAAM,YAAY,GAAG;IACpB,aAAa,EAAE,QAAQ;IACvB,aAAa,EAAE,QAAQ;IACvB,WAAW,EAAE,MAAM;CACV,CAAC;AAGJ,IAAM,0BAA0B,GAAhC,MAAM,0BAA2B,SAAQ,mDAAuB;IAAhE;;QACG,iBAAY,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"oauth1-credential.controller.js","sourceRoot":"","sources":["../../../src/controllers/oauth/oauth1-credential.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -64,7 +64,7 @@ let OAuth2CredentialController = class OAuth2CredentialController extends abstra
|
|
|
64
64
|
async getAuthUri(req) {
|
|
65
65
|
const credential = await this.getCredential(req);
|
|
66
66
|
const additionalData = await this.getAdditionalData();
|
|
67
|
-
const decryptedDataOriginal = await this.
|
|
67
|
+
const decryptedDataOriginal = await this.getDecryptedDataForAuthUri(credential, additionalData);
|
|
68
68
|
if (decryptedDataOriginal?.scope &&
|
|
69
69
|
credential.type.includes('OAuth2') &&
|
|
70
70
|
!constants_1.GENERIC_OAUTH2_CREDENTIALS_WITH_EDITABLE_SCOPE.includes(credential.type)) {
|
|
@@ -80,7 +80,7 @@ let OAuth2CredentialController = class OAuth2CredentialController extends abstra
|
|
|
80
80
|
oAuthOptions.query = qs.parse(oauthCredentials.authQueryParameters);
|
|
81
81
|
}
|
|
82
82
|
await this.externalHooks.run('oauth2.authenticate', [oAuthOptions]);
|
|
83
|
-
|
|
83
|
+
const toUpdate = { csrfSecret };
|
|
84
84
|
if (oauthCredentials.grantType === 'pkce') {
|
|
85
85
|
const { code_verifier, code_challenge } = (0, pkce_challenge_1.default)();
|
|
86
86
|
oAuthOptions.query = {
|
|
@@ -88,9 +88,9 @@ let OAuth2CredentialController = class OAuth2CredentialController extends abstra
|
|
|
88
88
|
code_challenge,
|
|
89
89
|
code_challenge_method: 'S256',
|
|
90
90
|
};
|
|
91
|
-
|
|
91
|
+
toUpdate.codeVerifier = code_verifier;
|
|
92
92
|
}
|
|
93
|
-
await this.encryptAndSaveData(credential,
|
|
93
|
+
await this.encryptAndSaveData(credential, toUpdate);
|
|
94
94
|
const oAuthObj = new client_oauth2_1.ClientOAuth2(oAuthOptions);
|
|
95
95
|
const returnUri = oAuthObj.code.getUri();
|
|
96
96
|
this.logger.debug('OAuth2 authorization url created for credential', {
|
|
@@ -129,14 +129,12 @@ let OAuth2CredentialController = class OAuth2CredentialController extends abstra
|
|
|
129
129
|
if (Object.keys(req.query).length > 2) {
|
|
130
130
|
(0, set_1.default)(oauthToken.data, 'callbackQueryString', (0, omit_1.default)(req.query, 'state', 'code'));
|
|
131
131
|
}
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
}
|
|
138
|
-
delete decryptedDataOriginal.csrfSecret;
|
|
139
|
-
await this.encryptAndSaveData(credential, decryptedDataOriginal);
|
|
132
|
+
let { oauthTokenData } = decryptedDataOriginal;
|
|
133
|
+
oauthTokenData = {
|
|
134
|
+
...(typeof oauthTokenData === 'object' ? oauthTokenData : {}),
|
|
135
|
+
...oauthToken.data,
|
|
136
|
+
};
|
|
137
|
+
await this.encryptAndSaveData(credential, { oauthTokenData }, ['csrfSecret']);
|
|
140
138
|
this.logger.debug('OAuth2 callback successful for credential', {
|
|
141
139
|
credentialId: credential.id,
|
|
142
140
|
});
|