n8n 2.13.1 → 2.14.0
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/build.tsbuildinfo +1 -1
- package/dist/chat/chat-execution-manager.js +8 -2
- package/dist/chat/chat-execution-manager.js.map +1 -1
- package/dist/chat/utils.d.ts +3 -2
- package/dist/chat/utils.js +71 -1
- package/dist/chat/utils.js.map +1 -1
- package/dist/commands/start.d.ts +1 -0
- package/dist/commands/start.js +18 -2
- package/dist/commands/start.js.map +1 -1
- package/dist/controllers/api-keys.controller.d.ts +4 -8
- package/dist/controllers/api-keys.controller.js +6 -23
- package/dist/controllers/api-keys.controller.js.map +1 -1
- package/dist/controllers/auth.controller.js +5 -1
- package/dist/controllers/auth.controller.js.map +1 -1
- package/dist/controllers/invitation.controller.d.ts +0 -1
- package/dist/controllers/invitation.controller.js +1 -32
- package/dist/controllers/invitation.controller.js.map +1 -1
- package/dist/controllers/oauth/oauth2-credential.controller.js +14 -13
- package/dist/controllers/oauth/oauth2-credential.controller.js.map +1 -1
- package/dist/controllers/project.controller.js +2 -1
- package/dist/controllers/project.controller.js.map +1 -1
- package/dist/controllers/users.controller.js +1 -5
- package/dist/controllers/users.controller.js.map +1 -1
- package/dist/credentials/credential-dependency.service.d.ts +36 -0
- package/dist/credentials/credential-dependency.service.js +77 -0
- package/dist/credentials/credential-dependency.service.js.map +1 -0
- package/dist/credentials/credentials-finder.service.d.ts +1 -0
- package/dist/credentials/credentials-finder.service.js +35 -0
- package/dist/credentials/credentials-finder.service.js.map +1 -1
- package/dist/credentials/credentials.controller.js +6 -2
- package/dist/credentials/credentials.controller.js.map +1 -1
- package/dist/credentials/credentials.service.d.ts +14 -13
- package/dist/credentials/credentials.service.js +86 -52
- package/dist/credentials/credentials.service.js.map +1 -1
- package/dist/credentials/external-secrets.utils.d.ts +4 -0
- package/dist/credentials/external-secrets.utils.js +51 -0
- package/dist/credentials/external-secrets.utils.js.map +1 -0
- package/dist/credentials/validation.d.ts +0 -2
- package/dist/credentials/validation.js +5 -32
- package/dist/credentials/validation.js.map +1 -1
- package/dist/errors/response-errors/scope-forbidden.error.d.ts +11 -0
- package/dist/errors/response-errors/scope-forbidden.error.js +13 -0
- package/dist/errors/response-errors/scope-forbidden.error.js.map +1 -0
- package/dist/evaluation.ee/test-runner/test-runner.service.ee.js +2 -0
- package/dist/evaluation.ee/test-runner/test-runner.service.ee.js.map +1 -1
- package/dist/evaluation.ee/test-runs.controller.ee.d.ts +2 -1
- package/dist/evaluation.ee/test-runs.controller.ee.js +13 -13
- package/dist/evaluation.ee/test-runs.controller.ee.js.map +1 -1
- package/dist/eventbus/message-event-bus/message-event-bus.d.ts +1 -2
- package/dist/eventbus/message-event-bus/message-event-bus.js +8 -8
- package/dist/eventbus/message-event-bus/message-event-bus.js.map +1 -1
- package/dist/events/maps/relay.event-map.d.ts +1 -0
- package/dist/events/relays/telemetry.event-relay.js +3 -2
- package/dist/events/relays/telemetry.event-relay.js.map +1 -1
- package/dist/execution-lifecycle/execution-lifecycle-hooks.js +90 -9
- package/dist/execution-lifecycle/execution-lifecycle-hooks.js.map +1 -1
- package/dist/executions/execution-redaction.d.ts +2 -1
- package/dist/executions/execution.service.d.ts +11 -2
- package/dist/executions/execution.service.js +19 -1
- package/dist/executions/execution.service.js.map +1 -1
- package/dist/executions/execution.types.d.ts +3 -0
- package/dist/executions/executions.controller.d.ts +5 -0
- package/dist/executions/executions.controller.js +13 -0
- package/dist/executions/executions.controller.js.map +1 -1
- package/dist/license.d.ts +0 -1
- package/dist/license.js +0 -3
- package/dist/license.js.map +1 -1
- package/dist/load-nodes-and-credentials.js +4 -0
- package/dist/load-nodes-and-credentials.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub-title.service.d.ts +3 -1
- package/dist/modules/chat-hub/chat-hub-title.service.js +9 -3
- package/dist/modules/chat-hub/chat-hub-title.service.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub-tool.service.d.ts +3 -1
- package/dist/modules/chat-hub/chat-hub-tool.service.js +13 -3
- package/dist/modules/chat-hub/chat-hub-tool.service.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub-workflow.service.d.ts +5 -5
- package/dist/modules/chat-hub/chat-hub-workflow.service.js +18 -13
- package/dist/modules/chat-hub/chat-hub-workflow.service.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub.module.d.ts +2 -0
- package/dist/modules/chat-hub/chat-hub.settings.controller.d.ts +6 -0
- package/dist/modules/data-table/csv-parser.service.d.ts +12 -1
- package/dist/modules/data-table/csv-parser.service.js +81 -74
- package/dist/modules/data-table/csv-parser.service.js.map +1 -1
- package/dist/modules/data-table/data-table-csv-import.service.d.ts +21 -0
- package/dist/modules/data-table/data-table-csv-import.service.js +123 -0
- package/dist/modules/data-table/data-table-csv-import.service.js.map +1 -0
- package/dist/modules/data-table/data-table-rows.repository.js +1 -1
- package/dist/modules/data-table/data-table-rows.repository.js.map +1 -1
- package/dist/modules/data-table/data-table.controller.d.ts +7 -1
- package/dist/modules/data-table/data-table.controller.js +36 -0
- package/dist/modules/data-table/data-table.controller.js.map +1 -1
- package/dist/modules/data-table/data-table.service.d.ts +7 -6
- package/dist/modules/data-table/data-table.service.js +24 -47
- package/dist/modules/data-table/data-table.service.js.map +1 -1
- package/dist/modules/data-table/utils/sql-utils.js +1 -2
- package/dist/modules/data-table/utils/sql-utils.js.map +1 -1
- package/dist/modules/dynamic-credentials.ee/credential-resolvers/identifiers/oauth2-introspection-identifier.js +15 -3
- package/dist/modules/dynamic-credentials.ee/credential-resolvers/identifiers/oauth2-introspection-identifier.js.map +1 -1
- package/dist/modules/dynamic-credentials.ee/credential-resolvers/identifiers/oauth2-userinfo-identifier.js +13 -1
- package/dist/modules/dynamic-credentials.ee/credential-resolvers/identifiers/oauth2-userinfo-identifier.js.map +1 -1
- package/dist/modules/dynamic-credentials.ee/credential-resolvers.controller.d.ts +2 -1
- package/dist/modules/dynamic-credentials.ee/credential-resolvers.controller.js +32 -2
- package/dist/modules/dynamic-credentials.ee/credential-resolvers.controller.js.map +1 -1
- package/dist/modules/dynamic-credentials.ee/dynamic-credentials.module.d.ts +5 -0
- package/dist/modules/dynamic-credentials.ee/dynamic-credentials.module.js +7 -0
- package/dist/modules/dynamic-credentials.ee/dynamic-credentials.module.js.map +1 -1
- package/dist/modules/dynamic-credentials.ee/services/credential-check-proxy.service.d.ts +14 -0
- package/dist/modules/dynamic-credentials.ee/services/credential-check-proxy.service.js +77 -0
- package/dist/modules/dynamic-credentials.ee/services/credential-check-proxy.service.js.map +1 -0
- package/dist/modules/dynamic-credentials.ee/services/credential-resolver.service.d.ts +9 -2
- package/dist/modules/dynamic-credentials.ee/services/credential-resolver.service.js +34 -3
- package/dist/modules/dynamic-credentials.ee/services/credential-resolver.service.js.map +1 -1
- package/dist/modules/dynamic-credentials.ee/services/index.d.ts +1 -0
- package/dist/modules/dynamic-credentials.ee/services/index.js +1 -0
- package/dist/modules/dynamic-credentials.ee/services/index.js.map +1 -1
- package/dist/modules/external-secrets.ee/providers/vault.d.ts +3 -0
- package/dist/modules/external-secrets.ee/providers/vault.js +77 -29
- package/dist/modules/external-secrets.ee/providers/vault.js.map +1 -1
- package/dist/modules/external-secrets.ee/secrets-providers-connections.service.ee.d.ts +4 -2
- package/dist/modules/external-secrets.ee/secrets-providers-connections.service.ee.js +28 -6
- package/dist/modules/external-secrets.ee/secrets-providers-connections.service.ee.js.map +1 -1
- package/dist/modules/log-streaming.ee/destinations/message-event-bus-destination-webhook.ee.d.ts +3 -0
- package/dist/modules/log-streaming.ee/destinations/message-event-bus-destination-webhook.ee.js +35 -25
- package/dist/modules/log-streaming.ee/destinations/message-event-bus-destination-webhook.ee.js.map +1 -1
- package/dist/modules/log-streaming.ee/log-streaming-destination.service.js +2 -2
- package/dist/modules/log-streaming.ee/log-streaming-destination.service.js.map +1 -1
- package/dist/modules/mcp/mcp.service.d.ts +3 -2
- package/dist/modules/mcp/mcp.service.js +11 -10
- package/dist/modules/mcp/mcp.service.js.map +1 -1
- package/dist/modules/mcp/tools/get-execution.tool.d.ts +9 -0
- package/dist/modules/mcp/tools/get-execution.tool.js +95 -20
- package/dist/modules/mcp/tools/get-execution.tool.js.map +1 -1
- package/dist/modules/mcp/tools/search-folders.tool.d.ts +12 -0
- package/dist/modules/mcp/tools/search-folders.tool.js +107 -0
- package/dist/modules/mcp/tools/search-folders.tool.js.map +1 -0
- package/dist/modules/mcp/tools/search-projects.tool.d.ts +11 -0
- package/dist/modules/mcp/tools/search-projects.tool.js +93 -0
- package/dist/modules/mcp/tools/search-projects.tool.js.map +1 -0
- package/dist/modules/mcp/tools/workflow-builder/create-workflow-from-code.tool.d.ts +1 -0
- package/dist/modules/mcp/tools/workflow-builder/create-workflow-from-code.tool.js +25 -12
- package/dist/modules/mcp/tools/workflow-builder/create-workflow-from-code.tool.js.map +1 -1
- package/dist/modules/mcp/tools/workflow-builder/update-workflow.tool.js +9 -7
- package/dist/modules/mcp/tools/workflow-builder/update-workflow.tool.js.map +1 -1
- package/dist/modules/provisioning.ee/claims-context.builder.d.ts +4 -0
- package/dist/modules/provisioning.ee/claims-context.builder.js +31 -0
- package/dist/modules/provisioning.ee/claims-context.builder.js.map +1 -0
- package/dist/modules/provisioning.ee/role-resolver-types.d.ts +35 -0
- package/dist/modules/provisioning.ee/role-resolver-types.js +3 -0
- package/dist/modules/provisioning.ee/role-resolver-types.js.map +1 -0
- package/dist/modules/provisioning.ee/role-resolver.service.ee.d.ts +13 -0
- package/dist/modules/provisioning.ee/role-resolver.service.ee.js +103 -0
- package/dist/modules/provisioning.ee/role-resolver.service.ee.js.map +1 -0
- package/dist/modules/redaction/executions/execution-redaction.interfaces.d.ts +3 -0
- package/dist/modules/redaction/executions/execution-redaction.service.d.ts +1 -0
- package/dist/modules/redaction/executions/execution-redaction.service.js +42 -10
- package/dist/modules/redaction/executions/execution-redaction.service.js.map +1 -1
- package/dist/modules/redaction/executions/strategies/full-item-redaction.strategy.d.ts +1 -0
- package/dist/modules/redaction/executions/strategies/full-item-redaction.strategy.js +8 -1
- package/dist/modules/redaction/executions/strategies/full-item-redaction.strategy.js.map +1 -1
- package/dist/modules/redaction/executions/strategies/node-defined-field-redaction.strategy.d.ts +4 -1
- package/dist/modules/redaction/executions/strategies/node-defined-field-redaction.strategy.js +52 -16
- package/dist/modules/redaction/executions/strategies/node-defined-field-redaction.strategy.js.map +1 -1
- package/dist/modules/sso-oidc/oidc.service.ee.js +6 -5
- package/dist/modules/sso-oidc/oidc.service.ee.js.map +1 -1
- package/dist/modules/sso-saml/saml.controller.ee.d.ts +32 -1
- package/dist/modules/sso-saml/saml.controller.ee.js +9 -1
- package/dist/modules/sso-saml/saml.controller.ee.js.map +1 -1
- package/dist/modules/sso-saml/saml.service.ee.d.ts +9 -2
- package/dist/modules/sso-saml/saml.service.ee.js +110 -8
- package/dist/modules/sso-saml/saml.service.ee.js.map +1 -1
- package/dist/modules/workflow-index/workflow-dependency-query.service.d.ts +25 -0
- package/dist/modules/workflow-index/workflow-dependency-query.service.js +220 -0
- package/dist/modules/workflow-index/workflow-dependency-query.service.js.map +1 -0
- package/dist/modules/workflow-index/workflow-dependency.controller.d.ts +12 -0
- package/dist/modules/workflow-index/workflow-dependency.controller.js +60 -0
- package/dist/modules/workflow-index/workflow-dependency.controller.js.map +1 -0
- package/dist/public-api/v1/handlers/audit/audit.handler.d.ts +1 -4
- package/dist/public-api/v1/handlers/credentials/credentials.handler.d.ts +8 -11
- package/dist/public-api/v1/handlers/data-tables/data-tables.handler.d.ts +8 -8
- package/dist/public-api/v1/handlers/data-tables/data-tables.rows.handler.d.ts +10 -10
- package/dist/public-api/v1/handlers/discover/discover.handler.d.ts +10 -0
- package/dist/public-api/v1/handlers/discover/discover.handler.js +37 -0
- package/dist/public-api/v1/handlers/discover/discover.handler.js.map +1 -0
- package/dist/public-api/v1/handlers/discover/discover.service.d.ts +30 -0
- package/dist/public-api/v1/handlers/discover/discover.service.js +166 -0
- package/dist/public-api/v1/handlers/discover/discover.service.js.map +1 -0
- package/dist/public-api/v1/handlers/executions/executions.handler.d.ts +8 -8
- package/dist/public-api/v1/handlers/projects/projects.handler.d.ts +8 -32
- package/dist/public-api/v1/handlers/source-control/source-control.handler.d.ts +1 -4
- package/dist/public-api/v1/handlers/tags/tags.handler.d.ts +5 -20
- package/dist/public-api/v1/handlers/users/users.handler.ee.d.ts +5 -20
- package/dist/public-api/v1/handlers/variables/variables.handler.d.ts +4 -16
- package/dist/public-api/v1/handlers/workflows/workflows.handler.d.ts +20 -20
- package/dist/public-api/v1/handlers/workflows/workflows.handler.js +2 -0
- package/dist/public-api/v1/handlers/workflows/workflows.handler.js.map +1 -1
- package/dist/public-api/v1/openapi.yml +122 -0
- package/dist/public-api/v1/shared/middlewares/global.middleware.d.ts +5 -6
- package/dist/public-api/v1/shared/middlewares/global.middleware.js +8 -14
- package/dist/public-api/v1/shared/middlewares/global.middleware.js.map +1 -1
- package/dist/scaling/job-processor.js +10 -0
- package/dist/scaling/job-processor.js.map +1 -1
- package/dist/scaling/scaling.types.d.ts +2 -0
- package/dist/server.d.ts +1 -0
- package/dist/server.js +1 -0
- package/dist/server.js.map +1 -1
- package/dist/services/credentials-tester.service.js +2 -2
- package/dist/services/credentials-tester.service.js.map +1 -1
- package/dist/services/frontend.service.js +1 -3
- package/dist/services/frontend.service.js.map +1 -1
- package/dist/services/project.service.ee.d.ts +4 -0
- package/dist/services/project.service.ee.js +27 -0
- package/dist/services/project.service.ee.js.map +1 -1
- package/dist/services/public-api-key.service.js +1 -0
- package/dist/services/public-api-key.service.js.map +1 -1
- package/dist/services/user.service.d.ts +2 -11
- package/dist/services/user.service.js +11 -75
- package/dist/services/user.service.js.map +1 -1
- package/dist/task-runners/task-broker/task-broker.service.js +8 -0
- package/dist/task-runners/task-broker/task-broker.service.js.map +1 -1
- package/dist/task-runners/task-managers/data-request-response-builder.js +1 -0
- package/dist/task-runners/task-managers/data-request-response-builder.js.map +1 -1
- package/dist/task-runners/task-managers/data-request-response-stripper.js +1 -0
- package/dist/task-runners/task-managers/data-request-response-stripper.js.map +1 -1
- package/dist/task-runners/task-managers/local-task-requester.js +3 -1
- package/dist/task-runners/task-managers/local-task-requester.js.map +1 -1
- package/dist/task-runners/task-managers/task-requester.d.ts +1 -1
- package/dist/task-runners/task-managers/task-requester.js.map +1 -1
- package/dist/telemetry/index.d.ts +19 -0
- package/dist/telemetry/index.js +35 -0
- package/dist/telemetry/index.js.map +1 -1
- package/dist/user-management/email/node-mailer.d.ts +1 -0
- package/dist/user-management/email/node-mailer.js +23 -1
- package/dist/user-management/email/node-mailer.js.map +1 -1
- package/dist/webhooks/waiting-forms.d.ts +1 -1
- package/dist/webhooks/waiting-forms.js +32 -35
- package/dist/webhooks/waiting-forms.js.map +1 -1
- package/dist/webhooks/waiting-webhooks.d.ts +11 -3
- package/dist/webhooks/waiting-webhooks.js +47 -32
- package/dist/webhooks/waiting-webhooks.js.map +1 -1
- package/dist/webhooks/webhook-helpers.js +6 -1
- package/dist/webhooks/webhook-helpers.js.map +1 -1
- package/dist/webhooks/webhook.service.js +2 -5
- package/dist/webhooks/webhook.service.js.map +1 -1
- package/dist/workflow-helpers.d.ts +2 -1
- package/dist/workflow-helpers.js +15 -0
- package/dist/workflow-helpers.js.map +1 -1
- package/dist/workflow-runner.js +10 -2
- package/dist/workflow-runner.js.map +1 -1
- package/dist/workflows/workflow-execution.service.d.ts +3 -1
- package/dist/workflows/workflow-execution.service.js +16 -4
- package/dist/workflows/workflow-execution.service.js.map +1 -1
- package/dist/workflows/workflow.service.js +1 -0
- package/dist/workflows/workflow.service.js.map +1 -1
- package/package.json +21 -20
- package/templates/form-invalid-token.handlebars +131 -0
- package/templates/form-trigger-completion.handlebars +24 -3
- package/templates/form-trigger.handlebars +24 -2
|
@@ -51,6 +51,7 @@ const not_found_error_1 = require("../errors/response-errors/not-found.error");
|
|
|
51
51
|
const WorkflowExecuteAdditionalData = __importStar(require("../workflow-execute-additional-data"));
|
|
52
52
|
const workflow_helpers_1 = require("../workflow-helpers");
|
|
53
53
|
const workflow_runner_1 = require("../workflow-runner");
|
|
54
|
+
const utils_1 = require("./utils");
|
|
54
55
|
const node_types_1 = require("../node-types");
|
|
55
56
|
const ownership_service_1 = require("../services/ownership.service");
|
|
56
57
|
let ChatExecutionManager = class ChatExecutionManager {
|
|
@@ -111,10 +112,15 @@ let ChatExecutionManager = class ChatExecutionManager {
|
|
|
111
112
|
async runNode(execution, message) {
|
|
112
113
|
const workflow = this.getWorkflow(execution);
|
|
113
114
|
const lastNodeExecuted = execution.data.resultData.lastNodeExecuted;
|
|
114
|
-
|
|
115
|
+
let node = workflow.getNode(lastNodeExecuted);
|
|
115
116
|
const additionalData = await WorkflowExecuteAdditionalData.getBase({ workflowId: workflow.id });
|
|
116
117
|
const executionData = execution.data.executionData?.nodeExecutionStack[0];
|
|
117
|
-
if (!
|
|
118
|
+
if (!executionData)
|
|
119
|
+
return null;
|
|
120
|
+
if (!node) {
|
|
121
|
+
node = (0, utils_1.redirectIfToolExecutor)(execution, executionData, workflow);
|
|
122
|
+
}
|
|
123
|
+
if (!node)
|
|
118
124
|
return null;
|
|
119
125
|
const inputData = executionData.data;
|
|
120
126
|
const connectionInputData = executionData.data.main[0];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chat-execution-manager.js","sourceRoot":"","sources":["../../src/chat/chat-execution-manager.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"chat-execution-manager.js","sourceRoot":"","sources":["../../src/chat/chat-execution-manager.ts"],"names":[],"mappings":"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"}
|
package/dist/chat/utils.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { IExecutionResponse } from '@n8n/db';
|
|
2
|
-
import type { INode } from 'n8n-workflow';
|
|
3
|
-
export declare function
|
|
2
|
+
import type { ChatNodeMessage, IExecuteData, INode, Workflow } from 'n8n-workflow';
|
|
3
|
+
export declare function redirectIfToolExecutor(execution: IExecutionResponse, executionData: IExecuteData, workflow: Workflow): INode | null;
|
|
4
|
+
export declare function getMessage(execution: IExecutionResponse): ChatNodeMessage | undefined;
|
|
4
5
|
export declare function getLastNodeExecuted(execution: IExecutionResponse): INode | undefined;
|
|
5
6
|
export declare function shouldResumeImmediately(lastNode: INode): boolean;
|
|
6
7
|
export declare function getLastNodeMessage(execution: IExecutionResponse, lastNode: INode): string;
|
package/dist/chat/utils.js
CHANGED
|
@@ -1,15 +1,71 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.redirectIfToolExecutor = redirectIfToolExecutor;
|
|
3
4
|
exports.getMessage = getMessage;
|
|
4
5
|
exports.getLastNodeExecuted = getLastNodeExecuted;
|
|
5
6
|
exports.shouldResumeImmediately = shouldResumeImmediately;
|
|
6
7
|
exports.getLastNodeMessage = getLastNodeMessage;
|
|
8
|
+
const constants_1 = require("@n8n/constants");
|
|
7
9
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
8
10
|
const AI_TOOL = 'ai_tool';
|
|
11
|
+
function redirectIfToolExecutor(execution, executionData, workflow) {
|
|
12
|
+
const lastNodeExecuted = execution.data.resultData.lastNodeExecuted;
|
|
13
|
+
if (lastNodeExecuted !== constants_1.TOOL_EXECUTOR_NODE_NAME)
|
|
14
|
+
return null;
|
|
15
|
+
const toolNodeName = executionData.node.parameters?.node;
|
|
16
|
+
const toolNode = toolNodeName ? workflow.getNode(toolNodeName) : null;
|
|
17
|
+
if (!toolNode)
|
|
18
|
+
return null;
|
|
19
|
+
executionData.node = toolNode;
|
|
20
|
+
execution.data.resultData.lastNodeExecuted = toolNode.name;
|
|
21
|
+
executionData.runIndex = 0;
|
|
22
|
+
if (execution.data.startData) {
|
|
23
|
+
execution.data.startData.runNodeFilter = undefined;
|
|
24
|
+
execution.data.startData.destinationNode = undefined;
|
|
25
|
+
}
|
|
26
|
+
return toolNode;
|
|
27
|
+
}
|
|
28
|
+
function getOriginalDestinationNodeName(startData) {
|
|
29
|
+
const dest = startData?.originalDestinationNode;
|
|
30
|
+
if (!dest)
|
|
31
|
+
return undefined;
|
|
32
|
+
return typeof dest === 'string' ? dest : dest.nodeName;
|
|
33
|
+
}
|
|
34
|
+
function getSendMessageFromToolNode(nodeRuns) {
|
|
35
|
+
const lastRun = nodeRuns[nodeRuns.length - 1];
|
|
36
|
+
const aiToolBranches = lastRun?.data?.[AI_TOOL];
|
|
37
|
+
if (!Array.isArray(aiToolBranches))
|
|
38
|
+
return undefined;
|
|
39
|
+
for (const branch of aiToolBranches) {
|
|
40
|
+
if (Array.isArray(branch) && branch[0]?.sendMessage) {
|
|
41
|
+
return branch[0].sendMessage;
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
return undefined;
|
|
45
|
+
}
|
|
46
|
+
function getToolExecutorSendMessage(executionData) {
|
|
47
|
+
const { startData, resultData } = executionData;
|
|
48
|
+
const { runData } = resultData;
|
|
49
|
+
const toolNodeName = getOriginalDestinationNodeName(startData);
|
|
50
|
+
if (toolNodeName && runData[toolNodeName]) {
|
|
51
|
+
return getSendMessageFromToolNode(runData[toolNodeName]);
|
|
52
|
+
}
|
|
53
|
+
for (const [nodeName, nodeRuns] of Object.entries(runData)) {
|
|
54
|
+
if (nodeName === constants_1.TOOL_EXECUTOR_NODE_NAME)
|
|
55
|
+
continue;
|
|
56
|
+
const message = getSendMessageFromToolNode(nodeRuns);
|
|
57
|
+
if (message)
|
|
58
|
+
return message;
|
|
59
|
+
}
|
|
60
|
+
return undefined;
|
|
61
|
+
}
|
|
9
62
|
function getMessage(execution) {
|
|
10
63
|
const lastNodeExecuted = execution.data.resultData.lastNodeExecuted;
|
|
11
64
|
if (typeof lastNodeExecuted !== 'string')
|
|
12
65
|
return undefined;
|
|
66
|
+
if (lastNodeExecuted === constants_1.TOOL_EXECUTOR_NODE_NAME) {
|
|
67
|
+
return getToolExecutorSendMessage(execution.data);
|
|
68
|
+
}
|
|
13
69
|
const runIndex = execution.data.resultData.runData[lastNodeExecuted].length - 1;
|
|
14
70
|
const data = execution.data.resultData.runData[lastNodeExecuted][runIndex]?.data;
|
|
15
71
|
const outputs = data?.main ?? data?.[AI_TOOL];
|
|
@@ -26,7 +82,21 @@ function getLastNodeExecuted(execution) {
|
|
|
26
82
|
const lastNodeExecuted = execution.data.resultData.lastNodeExecuted;
|
|
27
83
|
if (typeof lastNodeExecuted !== 'string')
|
|
28
84
|
return undefined;
|
|
29
|
-
|
|
85
|
+
const node = execution.workflowData?.nodes?.find((node) => node.name === lastNodeExecuted);
|
|
86
|
+
if (node)
|
|
87
|
+
return node;
|
|
88
|
+
if (lastNodeExecuted === constants_1.TOOL_EXECUTOR_NODE_NAME) {
|
|
89
|
+
return {
|
|
90
|
+
name: constants_1.TOOL_EXECUTOR_NODE_NAME,
|
|
91
|
+
type: '@n8n/n8n-nodes-langchain.toolExecutor',
|
|
92
|
+
parameters: {},
|
|
93
|
+
id: '',
|
|
94
|
+
typeVersion: 1,
|
|
95
|
+
position: [0, 0],
|
|
96
|
+
disabled: false,
|
|
97
|
+
};
|
|
98
|
+
}
|
|
99
|
+
return undefined;
|
|
30
100
|
}
|
|
31
101
|
function shouldResumeImmediately(lastNode) {
|
|
32
102
|
if (lastNode?.type === n8n_workflow_1.RESPOND_TO_WEBHOOK_NODE_TYPE) {
|
package/dist/chat/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/chat/utils.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/chat/utils.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/start.d.ts
CHANGED
|
@@ -21,6 +21,7 @@ export declare class Start extends BaseCommand<z.infer<typeof flagsSchema>> {
|
|
|
21
21
|
private generateStaticAssets;
|
|
22
22
|
init(): Promise<void>;
|
|
23
23
|
initOrchestration(): Promise<void>;
|
|
24
|
+
private ensureMultiMainLicensed;
|
|
24
25
|
run(): Promise<void>;
|
|
25
26
|
catch(error: Error): Promise<void>;
|
|
26
27
|
private runEnqueuedExecutions;
|
package/dist/commands/start.js
CHANGED
|
@@ -198,8 +198,8 @@ let Start = class Start extends base_command_1.BaseCommand {
|
|
|
198
198
|
await this.initOrchestration();
|
|
199
199
|
}
|
|
200
200
|
await this.initLicense();
|
|
201
|
-
if (isMultiMainEnabled
|
|
202
|
-
|
|
201
|
+
if (isMultiMainEnabled) {
|
|
202
|
+
await this.ensureMultiMainLicensed();
|
|
203
203
|
}
|
|
204
204
|
if (this.instanceSettings.instanceType === 'main') {
|
|
205
205
|
await di_1.Container.get(db_1.AuthRolesService).init();
|
|
@@ -263,6 +263,22 @@ let Start = class Start extends base_command_1.BaseCommand {
|
|
|
263
263
|
this.instanceSettings.markAsLeader();
|
|
264
264
|
}
|
|
265
265
|
}
|
|
266
|
+
async ensureMultiMainLicensed() {
|
|
267
|
+
if (this.license.isMultiMainLicensed())
|
|
268
|
+
return;
|
|
269
|
+
if (!this.instanceSettings.isLeader) {
|
|
270
|
+
const maxRetries = 5;
|
|
271
|
+
for (let attempt = 1; attempt <= maxRetries; attempt++) {
|
|
272
|
+
const delayMs = 2 ** attempt * 1000;
|
|
273
|
+
this.logger.warn(`Instance not licensed for multi-main — retrying license check in ${delayMs / 1000}s (attempt ${attempt}/${maxRetries})`);
|
|
274
|
+
await (0, n8n_workflow_1.sleep)(delayMs);
|
|
275
|
+
await this.license.reload();
|
|
276
|
+
if (this.license.isMultiMainLicensed())
|
|
277
|
+
return;
|
|
278
|
+
}
|
|
279
|
+
}
|
|
280
|
+
throw new feature_not_licensed_error_1.FeatureNotLicensedError(constants_1.LICENSE_FEATURES.MULTIPLE_MAIN_INSTANCES);
|
|
281
|
+
}
|
|
266
282
|
async run() {
|
|
267
283
|
const { flags } = this;
|
|
268
284
|
const databaseSettings = await di_1.Container.get(db_1.SettingsRepository).findBy({
|
|
@@ -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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"}
|
|
@@ -1,16 +1,13 @@
|
|
|
1
1
|
import { CreateApiKeyRequestDto, UpdateApiKeyRequestDto } from '@n8n/api-types';
|
|
2
2
|
import { AuthenticatedRequest } from '@n8n/db';
|
|
3
|
-
import { type ApiKeyScope } from '@n8n/permissions';
|
|
4
3
|
import type { RequestHandler } from 'express';
|
|
5
4
|
import { EventService } from '../events/event.service';
|
|
6
|
-
import { License } from '../license';
|
|
7
5
|
import { PublicApiKeyService } from '../services/public-api-key.service';
|
|
8
6
|
export declare const isApiEnabledMiddleware: RequestHandler;
|
|
9
7
|
export declare class ApiKeysController {
|
|
10
8
|
private readonly eventService;
|
|
11
9
|
private readonly publicApiKeyService;
|
|
12
|
-
|
|
13
|
-
constructor(eventService: EventService, publicApiKeyService: PublicApiKeyService, license: License);
|
|
10
|
+
constructor(eventService: EventService, publicApiKeyService: PublicApiKeyService);
|
|
14
11
|
createApiKey(req: AuthenticatedRequest, _res: Response, body: CreateApiKeyRequestDto): Promise<{
|
|
15
12
|
apiKey: string;
|
|
16
13
|
rawApiKey: string;
|
|
@@ -18,7 +15,7 @@ export declare class ApiKeysController {
|
|
|
18
15
|
user: import("@n8n/db").User;
|
|
19
16
|
userId: string;
|
|
20
17
|
label: string;
|
|
21
|
-
scopes: ApiKeyScope[];
|
|
18
|
+
scopes: import("@n8n/permissions").ApiKeyScope[];
|
|
22
19
|
audience: import("n8n-workflow").ApiKeyAudience;
|
|
23
20
|
id: string;
|
|
24
21
|
generateId(): void;
|
|
@@ -32,7 +29,7 @@ export declare class ApiKeysController {
|
|
|
32
29
|
user: import("@n8n/db").User;
|
|
33
30
|
userId: string;
|
|
34
31
|
label: string;
|
|
35
|
-
scopes: ApiKeyScope[];
|
|
32
|
+
scopes: import("@n8n/permissions").ApiKeyScope[];
|
|
36
33
|
audience: import("n8n-workflow").ApiKeyAudience;
|
|
37
34
|
id: string;
|
|
38
35
|
generateId(): void;
|
|
@@ -46,6 +43,5 @@ export declare class ApiKeysController {
|
|
|
46
43
|
updateApiKey(req: AuthenticatedRequest, _res: Response, apiKeyId: string, body: UpdateApiKeyRequestDto): Promise<{
|
|
47
44
|
success: boolean;
|
|
48
45
|
}>;
|
|
49
|
-
getApiKeyScopes(req: AuthenticatedRequest, _res: Response): Promise<ApiKeyScope[]>;
|
|
50
|
-
private resolveScopesForUser;
|
|
46
|
+
getApiKeyScopes(req: AuthenticatedRequest, _res: Response): Promise<import("@n8n/permissions").ApiKeyScope[]>;
|
|
51
47
|
}
|
|
@@ -14,12 +14,10 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.ApiKeysController = exports.isApiEnabledMiddleware = void 0;
|
|
16
16
|
const api_types_1 = require("@n8n/api-types");
|
|
17
|
-
const constants_1 = require("@n8n/constants");
|
|
18
17
|
const decorators_1 = require("@n8n/decorators");
|
|
19
18
|
const permissions_1 = require("@n8n/permissions");
|
|
20
19
|
const bad_request_error_1 = require("../errors/response-errors/bad-request.error");
|
|
21
20
|
const event_service_1 = require("../events/event.service");
|
|
22
|
-
const license_1 = require("../license");
|
|
23
21
|
const public_api_1 = require("../public-api");
|
|
24
22
|
const public_api_key_service_1 = require("../services/public-api-key.service");
|
|
25
23
|
const isApiEnabledMiddleware = (_, res, next) => {
|
|
@@ -32,20 +30,15 @@ const isApiEnabledMiddleware = (_, res, next) => {
|
|
|
32
30
|
};
|
|
33
31
|
exports.isApiEnabledMiddleware = isApiEnabledMiddleware;
|
|
34
32
|
let ApiKeysController = class ApiKeysController {
|
|
35
|
-
constructor(eventService, publicApiKeyService
|
|
33
|
+
constructor(eventService, publicApiKeyService) {
|
|
36
34
|
this.eventService = eventService;
|
|
37
35
|
this.publicApiKeyService = publicApiKeyService;
|
|
38
|
-
this.license = license;
|
|
39
36
|
}
|
|
40
37
|
async createApiKey(req, _res, body) {
|
|
41
|
-
|
|
42
|
-
if (!this.publicApiKeyService.apiKeyHasValidScopesForRole(req.user, scopes)) {
|
|
38
|
+
if (!this.publicApiKeyService.apiKeyHasValidScopesForRole(req.user, body.scopes)) {
|
|
43
39
|
throw new bad_request_error_1.BadRequestError('Invalid scopes for user role');
|
|
44
40
|
}
|
|
45
|
-
const newApiKey = await this.publicApiKeyService.createPublicApiKeyForUser(req.user,
|
|
46
|
-
...body,
|
|
47
|
-
scopes,
|
|
48
|
-
});
|
|
41
|
+
const newApiKey = await this.publicApiKeyService.createPublicApiKeyForUser(req.user, body);
|
|
49
42
|
this.eventService.emit('public-api-key-created', { user: req.user, publicApi: false });
|
|
50
43
|
return {
|
|
51
44
|
...newApiKey,
|
|
@@ -64,25 +57,16 @@ let ApiKeysController = class ApiKeysController {
|
|
|
64
57
|
return { success: true };
|
|
65
58
|
}
|
|
66
59
|
async updateApiKey(req, _res, apiKeyId, body) {
|
|
67
|
-
|
|
68
|
-
if (!this.publicApiKeyService.apiKeyHasValidScopesForRole(req.user, scopes)) {
|
|
60
|
+
if (!this.publicApiKeyService.apiKeyHasValidScopesForRole(req.user, body.scopes)) {
|
|
69
61
|
throw new bad_request_error_1.BadRequestError('Invalid scopes for user role');
|
|
70
62
|
}
|
|
71
|
-
await this.publicApiKeyService.updateApiKeyForUser(req.user, apiKeyId,
|
|
72
|
-
...body,
|
|
73
|
-
scopes,
|
|
74
|
-
});
|
|
63
|
+
await this.publicApiKeyService.updateApiKeyForUser(req.user, apiKeyId, body);
|
|
75
64
|
return { success: true };
|
|
76
65
|
}
|
|
77
66
|
async getApiKeyScopes(req, _res) {
|
|
78
67
|
const scopes = (0, permissions_1.getApiKeyScopesForRole)(req.user);
|
|
79
68
|
return scopes;
|
|
80
69
|
}
|
|
81
|
-
resolveScopesForUser(user, requestedScopes) {
|
|
82
|
-
return this.license.isLicensed(constants_1.LICENSE_FEATURES.API_KEY_SCOPES)
|
|
83
|
-
? requestedScopes
|
|
84
|
-
: (0, permissions_1.getApiKeyScopesForRole)(user);
|
|
85
|
-
}
|
|
86
70
|
};
|
|
87
71
|
exports.ApiKeysController = ApiKeysController;
|
|
88
72
|
__decorate([
|
|
@@ -128,7 +112,6 @@ __decorate([
|
|
|
128
112
|
exports.ApiKeysController = ApiKeysController = __decorate([
|
|
129
113
|
(0, decorators_1.RestController)('/api-keys'),
|
|
130
114
|
__metadata("design:paramtypes", [event_service_1.EventService,
|
|
131
|
-
public_api_key_service_1.PublicApiKeyService
|
|
132
|
-
license_1.License])
|
|
115
|
+
public_api_key_service_1.PublicApiKeyService])
|
|
133
116
|
], ApiKeysController);
|
|
134
117
|
//# sourceMappingURL=api-keys.controller.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-keys.controller.js","sourceRoot":"","sources":["../../src/controllers/api-keys.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8CAAgF;
|
|
1
|
+
{"version":3,"file":"api-keys.controller.js","sourceRoot":"","sources":["../../src/controllers/api-keys.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -129,7 +129,11 @@ let AuthController = class AuthController {
|
|
|
129
129
|
this.logger.debug('Invite links are not supported on this system, please use single sign on instead.');
|
|
130
130
|
throw new bad_request_error_1.BadRequestError('Invite links are not supported on this system, please use single sign on instead.');
|
|
131
131
|
}
|
|
132
|
-
|
|
132
|
+
if (!payload.token) {
|
|
133
|
+
this.logger.debug('Request to resolve signup token failed because token is missing');
|
|
134
|
+
throw new bad_request_error_1.BadRequestError('Token is required');
|
|
135
|
+
}
|
|
136
|
+
const { inviterId, inviteeId } = await this.userService.getInvitationIdsFromPayload(payload.token);
|
|
133
137
|
const isWithinUsersLimit = this.license.isWithinUsersLimit();
|
|
134
138
|
if (!isWithinUsersLimit) {
|
|
135
139
|
this.logger.debug('Request to resolve signup token failed because of users quota reached', {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.controller.js","sourceRoot":"","sources":["../../src/controllers/auth.controller.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"auth.controller.js","sourceRoot":"","sources":["../../src/controllers/auth.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,5 +26,4 @@ export declare class InvitationController {
|
|
|
26
26
|
inviteUser(req: AuthenticatedRequest, _res: Response, invitations: InviteUsersRequestDto): Promise<import("../requests").UserRequest.InviteResponse[]>;
|
|
27
27
|
private processInvitationAcceptance;
|
|
28
28
|
acceptInvitationWithToken(req: AuthlessRequest, res: Response, payload: AcceptInvitationRequestDto): Promise<import("@n8n/db").PublicUser>;
|
|
29
|
-
acceptInvitation(req: AuthlessRequest, res: Response, payload: AcceptInvitationRequestDto, inviteeId: string): Promise<import("@n8n/db").PublicUser>;
|
|
30
29
|
}
|
|
@@ -114,22 +114,7 @@ let InvitationController = class InvitationController {
|
|
|
114
114
|
throw new bad_request_error_1.BadRequestError('Token is required');
|
|
115
115
|
}
|
|
116
116
|
const { firstName, lastName, password } = payload;
|
|
117
|
-
const { inviterId, inviteeId } = await this.userService.getInvitationIdsFromPayload(
|
|
118
|
-
token: payload.token,
|
|
119
|
-
});
|
|
120
|
-
return await this.processInvitationAcceptance(inviterId, inviteeId, firstName, lastName, password, req, res);
|
|
121
|
-
}
|
|
122
|
-
async acceptInvitation(req, res, payload, inviteeId) {
|
|
123
|
-
if ((0, sso_helpers_1.isSsoCurrentAuthenticationMethod)()) {
|
|
124
|
-
this.logger.debug('Invite links are not supported on this system, please use single sign on instead.');
|
|
125
|
-
throw new bad_request_error_1.BadRequestError('Invite links are not supported on this system, please use single sign on instead.');
|
|
126
|
-
}
|
|
127
|
-
if (!payload.inviterId || !inviteeId) {
|
|
128
|
-
this.logger.debug('Request to accept invitation failed because inviterId or inviteeId is missing');
|
|
129
|
-
throw new bad_request_error_1.BadRequestError('InviterId and inviteeId are required');
|
|
130
|
-
}
|
|
131
|
-
const { firstName, lastName, password } = payload;
|
|
132
|
-
const inviterId = payload.inviterId;
|
|
117
|
+
const { inviterId, inviteeId } = await this.userService.getInvitationIdsFromPayload(payload.token);
|
|
133
118
|
return await this.processInvitationAcceptance(inviterId, inviteeId, firstName, lastName, password, req, res);
|
|
134
119
|
}
|
|
135
120
|
};
|
|
@@ -152,22 +137,6 @@ __decorate([
|
|
|
152
137
|
__metadata("design:paramtypes", [Object, Object, api_types_1.AcceptInvitationRequestDto]),
|
|
153
138
|
__metadata("design:returntype", Promise)
|
|
154
139
|
], InvitationController.prototype, "acceptInvitationWithToken", null);
|
|
155
|
-
__decorate([
|
|
156
|
-
(0, decorators_1.Post)('/:id/accept', {
|
|
157
|
-
skipAuth: true,
|
|
158
|
-
ipRateLimit: { limit: 100, windowMs: 5 * constants_2.Time.minutes.toMilliseconds },
|
|
159
|
-
keyedRateLimit: (0, decorators_1.createBodyKeyedRateLimiter)({
|
|
160
|
-
limit: 10,
|
|
161
|
-
windowMs: 1 * constants_2.Time.minutes.toMilliseconds,
|
|
162
|
-
field: 'inviterId',
|
|
163
|
-
}),
|
|
164
|
-
}),
|
|
165
|
-
__param(2, decorators_1.Body),
|
|
166
|
-
__param(3, (0, decorators_1.Param)('id')),
|
|
167
|
-
__metadata("design:type", Function),
|
|
168
|
-
__metadata("design:paramtypes", [Object, Object, api_types_1.AcceptInvitationRequestDto, String]),
|
|
169
|
-
__metadata("design:returntype", Promise)
|
|
170
|
-
], InvitationController.prototype, "acceptInvitation", null);
|
|
171
140
|
exports.InvitationController = InvitationController = __decorate([
|
|
172
141
|
(0, decorators_1.RestController)('/invitations'),
|
|
173
142
|
__metadata("design:paramtypes", [backend_common_1.Logger,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invitation.controller.js","sourceRoot":"","sources":["../../src/controllers/invitation.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8CAAmF;AACnF,wDAA6C;AAE7C,gCAA+D;AAC/D,
|
|
1
|
+
{"version":3,"file":"invitation.controller.js","sourceRoot":"","sources":["../../src/controllers/invitation.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,23 +44,24 @@ let OAuth2CredentialController = class OAuth2CredentialController {
|
|
|
44
44
|
return this.oauthService.renderCallbackError(res, 'Insufficient parameters for OAuth2 callback.', `Received following query parameters: ${JSON.stringify(req.query)}`);
|
|
45
45
|
}
|
|
46
46
|
const [credential, decryptedDataOriginal, oauthCredentials, state] = await this.oauthService.resolveCredential(req);
|
|
47
|
-
let options = {};
|
|
48
47
|
const oAuthOptions = this.convertCredentialToOptions(oauthCredentials);
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
48
|
+
const isPkce = oauthCredentials.grantType === 'pkce';
|
|
49
|
+
const isBodyAuth = oauthCredentials.authentication === 'body';
|
|
50
|
+
const body = { ...(oAuthOptions.body ?? {}) };
|
|
51
|
+
if (isPkce) {
|
|
52
|
+
body.code_verifier = decryptedDataOriginal.codeVerifier;
|
|
53
53
|
}
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
client_secret: oAuthOptions.clientSecret,
|
|
60
|
-
},
|
|
61
|
-
};
|
|
54
|
+
if (isBodyAuth) {
|
|
55
|
+
body.client_id = oAuthOptions.clientId;
|
|
56
|
+
if (oAuthOptions.clientSecret) {
|
|
57
|
+
body.client_secret = oAuthOptions.clientSecret;
|
|
58
|
+
}
|
|
62
59
|
delete oAuthOptions.clientSecret;
|
|
63
60
|
}
|
|
61
|
+
let options = {};
|
|
62
|
+
if (isPkce || isBodyAuth) {
|
|
63
|
+
options = { body };
|
|
64
|
+
}
|
|
64
65
|
await this.externalHooks.run('oauth2.callback', [oAuthOptions]);
|
|
65
66
|
const oAuthObj = new client_oauth2_1.ClientOAuth2(oAuthOptions);
|
|
66
67
|
const queryParameters = req.originalUrl.split('?').splice(1, 1).join('');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth2-credential.controller.js","sourceRoot":"","sources":["../../../src/controllers/oauth/oauth2-credential.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,sDAAkD;AAClD,gDAAsD;AAEtD,uDAA+B;AAC/B,qDAA6B;AAC7B,yDAAiC;AACjC,+CAAqE;AAGrE,yDAA4F;AAC5F,wDAA6C;AAC7C,qDAAiD;AAI1C,IAAM,0BAA0B,GAAhC,MAAM,0BAA0B;IACtC,YACkB,YAA0B,EAC1B,MAAc,EACd,aAA4B;QAF5B,iBAAY,GAAZ,YAAY,CAAc;QAC1B,WAAM,GAAN,MAAM,CAAQ;QACd,kBAAa,GAAb,aAAa,CAAe;IAC3C,CAAC;IAIE,AAAN,KAAK,CAAC,UAAU,CAAC,GAAuC;QACvD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;QAE9D,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,sBAAsB,CAAC,UAAU,EAAE;YACtE,GAAG,EAAE,UAAU,CAAC,EAAE;YAClB,MAAM,EAAE,mBAAmB;YAC3B,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE;SACnB,CAAC,CAAC;QACH,OAAO,GAAG,CAAC;IACZ,CAAC;IAIK,AAAN,KAAK,CAAC,cAAc,CAAC,GAA2C,EAAE,GAAa;QAC9E,IAAI,CAAC;YACJ,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,YAAY,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC;YAChD,IAAI,CAAC,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;gBAC5B,OAAO,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAC3C,GAAG,EACH,8CAA8C,EAC9C,wCAAwC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CACnE,CAAC;YACH,CAAC;YAED,MAAM,CAAC,UAAU,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,KAAK,CAAC,GACjE,MAAM,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAuB,GAAG,CAAC,CAAC;YAEtE,
|
|
1
|
+
{"version":3,"file":"oauth2-credential.controller.js","sourceRoot":"","sources":["../../../src/controllers/oauth/oauth2-credential.controller.ts"],"names":[],"mappings":"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"}
|