n8n 2.1.2 → 2.2.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/constants.js +0 -1
- package/dist/constants.js.map +1 -1
- package/dist/controllers/ai.controller.d.ts +4 -1
- package/dist/controllers/ai.controller.js +20 -1
- package/dist/controllers/ai.controller.js.map +1 -1
- package/dist/controllers/mfa.controller.d.ts +3 -1
- package/dist/controllers/mfa.controller.js +24 -2
- package/dist/controllers/mfa.controller.js.map +1 -1
- package/dist/controllers/oauth/oauth2-credential.controller.js +4 -4
- package/dist/controllers/oauth/oauth2-credential.controller.js.map +1 -1
- package/dist/controllers/users.controller.d.ts +2 -2
- package/dist/credentials/dynamic-credentials-proxy.d.ts +2 -1
- package/dist/credentials/dynamic-credentials-proxy.js +22 -0
- package/dist/credentials/dynamic-credentials-proxy.js.map +1 -1
- package/dist/credentials-helper.d.ts +1 -1
- package/dist/credentials-helper.js +16 -2
- package/dist/credentials-helper.js.map +1 -1
- package/dist/environments.ee/source-control/source-control-import.service.ee.d.ts +4 -3
- package/dist/environments.ee/source-control/source-control-import.service.ee.js +20 -3
- package/dist/environments.ee/source-control/source-control-import.service.ee.js.map +1 -1
- package/dist/environments.ee/source-control/source-control.service.ee.js +1 -1
- package/dist/environments.ee/source-control/source-control.service.ee.js.map +1 -1
- package/dist/environments.ee/variables/variables.service.ee.js +32 -2
- package/dist/environments.ee/variables/variables.service.ee.js.map +1 -1
- package/dist/eventbus/event-message-classes/event-message-audit.d.ts +7 -0
- package/dist/eventbus/event-message-classes/event-message-audit.js.map +1 -1
- package/dist/eventbus/event-message-classes/index.d.ts +2 -2
- package/dist/eventbus/event-message-classes/index.js +7 -0
- package/dist/eventbus/event-message-classes/index.js.map +1 -1
- package/dist/events/maps/relay.event-map.d.ts +24 -1
- package/dist/events/relays/log-streaming.event-relay.d.ts +7 -0
- package/dist/events/relays/log-streaming.event-relay.js +103 -1
- package/dist/events/relays/log-streaming.event-relay.js.map +1 -1
- package/dist/events/relays/telemetry.event-relay.d.ts +1 -0
- package/dist/events/relays/telemetry.event-relay.js +13 -4
- package/dist/events/relays/telemetry.event-relay.js.map +1 -1
- package/dist/middlewares/list-query/dtos/workflow.filter.dto.d.ts +1 -1
- package/dist/middlewares/list-query/dtos/workflow.filter.dto.js +4 -3
- package/dist/middlewares/list-query/dtos/workflow.filter.dto.js.map +1 -1
- package/dist/middlewares/list-query/filter.js +1 -1
- package/dist/middlewares/list-query/filter.js.map +1 -1
- package/dist/middlewares/list-query/select.js +1 -1
- package/dist/middlewares/list-query/select.js.map +1 -1
- package/dist/middlewares/list-query/sort-by.js +1 -1
- package/dist/middlewares/list-query/sort-by.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub-agent.entity.d.ts +14 -0
- package/dist/modules/chat-hub/chat-hub-agent.entity.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub-agent.repository.d.ts +3 -3
- package/dist/modules/chat-hub/chat-hub-agent.repository.js +3 -3
- package/dist/modules/chat-hub/chat-hub-agent.repository.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub-agent.service.js +3 -3
- package/dist/modules/chat-hub/chat-hub-agent.service.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub-message.entity.d.ts +0 -6
- package/dist/modules/chat-hub/chat-hub-message.entity.js +0 -36
- package/dist/modules/chat-hub/chat-hub-message.entity.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub-session.entity.d.ts +16 -1
- package/dist/modules/chat-hub/chat-hub-session.entity.js +2 -2
- package/dist/modules/chat-hub/chat-hub-session.entity.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub-workflow.service.d.ts +3 -2
- package/dist/modules/chat-hub/chat-hub-workflow.service.js +36 -22
- package/dist/modules/chat-hub/chat-hub-workflow.service.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub.attachment.service.d.ts +5 -4
- package/dist/modules/chat-hub/chat-hub.attachment.service.js +5 -5
- package/dist/modules/chat-hub/chat-hub.attachment.service.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub.controller.js +1 -1
- package/dist/modules/chat-hub/chat-hub.controller.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub.models.service.d.ts +2 -1
- package/dist/modules/chat-hub/chat-hub.models.service.js +4 -2
- package/dist/modules/chat-hub/chat-hub.models.service.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub.service.d.ts +8 -8
- package/dist/modules/chat-hub/chat-hub.service.js +25 -32
- package/dist/modules/chat-hub/chat-hub.service.js.map +1 -1
- package/dist/modules/chat-hub/chat-message.repository.d.ts +3 -3
- package/dist/modules/chat-hub/chat-message.repository.js +8 -8
- package/dist/modules/chat-hub/chat-message.repository.js.map +1 -1
- package/dist/modules/chat-hub/chat-session.repository.d.ts +4 -5
- package/dist/modules/chat-hub/chat-session.repository.js +10 -28
- package/dist/modules/chat-hub/chat-session.repository.js.map +1 -1
- package/dist/modules/dynamic-credentials.ee/credential-resolvers/oauth-credential-resolver.d.ts +1 -0
- package/dist/modules/dynamic-credentials.ee/credential-resolvers/oauth-credential-resolver.js +8 -0
- package/dist/modules/dynamic-credentials.ee/credential-resolvers/oauth-credential-resolver.js.map +1 -1
- package/dist/modules/dynamic-credentials.ee/dynamic-credentials.controller.d.ts +7 -1
- package/dist/modules/dynamic-credentials.ee/dynamic-credentials.controller.js +37 -2
- package/dist/modules/dynamic-credentials.ee/dynamic-credentials.controller.js.map +1 -1
- package/dist/modules/dynamic-credentials.ee/services/credential-resolver-workflow.service.d.ts +1 -0
- package/dist/modules/dynamic-credentials.ee/services/credential-resolver-workflow.service.js +30 -27
- package/dist/modules/dynamic-credentials.ee/services/credential-resolver-workflow.service.js.map +1 -1
- package/dist/modules/dynamic-credentials.ee/services/shared-fields.d.ts +1 -1
- package/dist/modules/dynamic-credentials.ee/services/shared-fields.js +16 -1
- package/dist/modules/dynamic-credentials.ee/services/shared-fields.js.map +1 -1
- package/dist/modules/dynamic-credentials.ee/utils.d.ts +2 -0
- package/dist/modules/dynamic-credentials.ee/utils.js +19 -0
- package/dist/modules/dynamic-credentials.ee/utils.js.map +1 -0
- package/dist/modules/dynamic-credentials.ee/workflow-status.controller.d.ts +5 -1
- package/dist/modules/dynamic-credentials.ee/workflow-status.controller.js +14 -14
- package/dist/modules/dynamic-credentials.ee/workflow-status.controller.js.map +1 -1
- package/dist/modules/external-secrets.ee/external-secrets-manager.ee.d.ts +40 -35
- package/dist/modules/external-secrets.ee/external-secrets-manager.ee.js +163 -272
- package/dist/modules/external-secrets.ee/external-secrets-manager.ee.js.map +1 -1
- package/dist/modules/external-secrets.ee/external-secrets.controller.ee.d.ts +8 -3
- package/dist/modules/external-secrets.ee/external-secrets.controller.ee.js +13 -8
- package/dist/modules/external-secrets.ee/external-secrets.controller.ee.js.map +1 -1
- package/dist/modules/external-secrets.ee/external-secrets.service.ee.d.ts +11 -5
- package/dist/modules/external-secrets.ee/external-secrets.service.ee.js +18 -13
- package/dist/modules/external-secrets.ee/external-secrets.service.ee.js.map +1 -1
- package/dist/modules/external-secrets.ee/provider-lifecycle.service.d.ts +22 -0
- package/dist/modules/external-secrets.ee/provider-lifecycle.service.js +99 -0
- package/dist/modules/external-secrets.ee/provider-lifecycle.service.js.map +1 -0
- package/dist/modules/external-secrets.ee/provider-registry.service.d.ts +13 -0
- package/dist/modules/external-secrets.ee/provider-registry.service.js +49 -0
- package/dist/modules/external-secrets.ee/provider-registry.service.js.map +1 -0
- package/dist/modules/external-secrets.ee/providers/aws-secrets-manager.d.ts +4 -4
- package/dist/modules/external-secrets.ee/providers/aws-secrets-manager.js +7 -9
- package/dist/modules/external-secrets.ee/providers/aws-secrets-manager.js.map +1 -1
- package/dist/modules/external-secrets.ee/providers/azure-key-vault/azure-key-vault.d.ts +3 -4
- package/dist/modules/external-secrets.ee/providers/azure-key-vault/azure-key-vault.js +7 -16
- package/dist/modules/external-secrets.ee/providers/azure-key-vault/azure-key-vault.js.map +1 -1
- package/dist/modules/external-secrets.ee/providers/gcp-secrets-manager/gcp-secrets-manager.d.ts +3 -4
- package/dist/modules/external-secrets.ee/providers/gcp-secrets-manager/gcp-secrets-manager.js +9 -17
- package/dist/modules/external-secrets.ee/providers/gcp-secrets-manager/gcp-secrets-manager.js.map +1 -1
- package/dist/modules/external-secrets.ee/providers/infisical.d.ts +4 -4
- package/dist/modules/external-secrets.ee/providers/infisical.js +8 -14
- package/dist/modules/external-secrets.ee/providers/infisical.js.map +1 -1
- package/dist/modules/external-secrets.ee/providers/vault.d.ts +2 -3
- package/dist/modules/external-secrets.ee/providers/vault.js +12 -35
- package/dist/modules/external-secrets.ee/providers/vault.js.map +1 -1
- package/dist/modules/external-secrets.ee/retry-manager.service.d.ts +23 -0
- package/dist/modules/external-secrets.ee/retry-manager.service.js +89 -0
- package/dist/modules/external-secrets.ee/retry-manager.service.js.map +1 -0
- package/dist/modules/external-secrets.ee/secrets-cache.service.d.ts +13 -0
- package/dist/modules/external-secrets.ee/secrets-cache.service.js +69 -0
- package/dist/modules/external-secrets.ee/secrets-cache.service.js.map +1 -0
- package/dist/modules/external-secrets.ee/settings-store.service.d.ts +21 -0
- package/dist/modules/external-secrets.ee/settings-store.service.js +96 -0
- package/dist/modules/external-secrets.ee/settings-store.service.js.map +1 -0
- package/dist/modules/external-secrets.ee/types.d.ts +18 -6
- package/dist/modules/external-secrets.ee/types.js +33 -0
- package/dist/modules/external-secrets.ee/types.js.map +1 -1
- package/dist/modules/mcp/mcp.controller.d.ts +3 -1
- package/dist/modules/mcp/mcp.controller.js +10 -2
- package/dist/modules/mcp/mcp.controller.js.map +1 -1
- package/dist/modules/mcp/mcp.settings.controller.d.ts +2 -0
- package/dist/modules/mcp/mcp.settings.controller.js +22 -0
- package/dist/modules/mcp/mcp.settings.controller.js.map +1 -1
- package/dist/oauth/oauth.service.js +1 -1
- package/dist/oauth/oauth.service.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/services/ai-workflow-builder.service.d.ts +1 -0
- package/dist/services/ai-workflow-builder.service.js +4 -0
- package/dist/services/ai-workflow-builder.service.js.map +1 -1
- package/dist/services/redis-client.service.d.ts +1 -0
- package/dist/services/redis-client.service.js +15 -4
- package/dist/services/redis-client.service.js.map +1 -1
- package/dist/webhooks/webhook-request-handler.js +1 -5
- package/dist/webhooks/webhook-request-handler.js.map +1 -1
- package/dist/workflows/workflow-history/workflow-history.controller.d.ts +7 -1
- package/dist/workflows/workflow-history/workflow-history.controller.js +20 -0
- package/dist/workflows/workflow-history/workflow-history.controller.js.map +1 -1
- package/dist/workflows/workflow-history/workflow-history.service.d.ts +4 -0
- package/dist/workflows/workflow-history/workflow-history.service.js +20 -0
- package/dist/workflows/workflow-history/workflow-history.service.js.map +1 -1
- package/dist/workflows/workflow.service.d.ts +2 -1
- package/dist/workflows/workflow.service.js +22 -4
- package/dist/workflows/workflow.service.js.map +1 -1
- package/dist/workflows/workflows.controller.d.ts +3 -0
- package/dist/workflows/workflows.controller.js +18 -3
- package/dist/workflows/workflows.controller.js.map +1 -1
- package/package.json +16 -16
package/dist/constants.js
CHANGED
|
@@ -19,7 +19,6 @@ exports.N8N_VERSION = n8nPackageJson.version;
|
|
|
19
19
|
exports.N8N_RELEASE_DATE = (0, fs_1.statSync)(packageJsonPath).mtime;
|
|
20
20
|
exports.STARTING_NODES = [
|
|
21
21
|
'@n8n/n8n-nodes-langchain.manualChatTrigger',
|
|
22
|
-
'n8n-nodes-base.start',
|
|
23
22
|
'n8n-nodes-base.manualTrigger',
|
|
24
23
|
];
|
|
25
24
|
exports.TRIGGER_COUNT_EXCLUDED_NODES = [
|
package/dist/constants.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":";;;AAAA,8CAAsC;AACtC,2BAA4C;AAG5C,+CAKsB;AACtB,+BAA8C;AAE9C,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AACrB,QAAA,UAAU,GAAG,SAAS,KAAK,MAAM,CAAC;AAElC,QAAA,oBAAoB,GAAG,iBAAiB,CAAC;AACzC,QAAA,mBAAmB,GAAG,qBAAqB,CAAC;AAE5C,QAAA,OAAO,GAAG,IAAA,cAAO,EAAC,SAAS,EAAE,IAAI,CAAC,CAAC;AACnC,QAAA,aAAa,GAAG,IAAA,WAAI,EAAC,eAAO,EAAE,WAAW,CAAC,CAAC;AAC3C,QAAA,cAAc,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC;AAC5D,QAAA,kBAAkB,GAAG,IAAA,WAAI,EAAC,IAAA,cAAO,EAAC,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;AAE1F,MAAM,eAAe,GAAG,IAAA,WAAI,EAAC,eAAO,EAAE,cAAc,CAAC,CAAC;AACtD,MAAM,cAAc,GAAG,IAAA,wBAAS,EAAkB,IAAA,iBAAY,EAAC,eAAe,EAAE,MAAM,CAAC,CAAC,CAAC;AAC5E,QAAA,WAAW,GAAG,cAAc,CAAC,OAAO,CAAC;AACrC,QAAA,gBAAgB,GAAG,IAAA,aAAQ,EAAC,eAAe,CAAC,CAAC,KAAK,CAAC;AAEnD,QAAA,cAAc,GAAG;IAC7B,4CAA4C;IAC5C,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { AiChatRequestDto, AiApplySuggestionRequestDto, AiAskRequestDto, AiFreeCreditsRequestDto, AiBuilderChatRequestDto, AiSessionRetrievalRequestDto, AiSessionMetadataResponseDto } from '@n8n/api-types';
|
|
1
|
+
import { AiChatRequestDto, AiApplySuggestionRequestDto, AiAskRequestDto, AiFreeCreditsRequestDto, AiBuilderChatRequestDto, AiSessionRetrievalRequestDto, AiSessionMetadataResponseDto, AiTruncateMessagesRequestDto } from '@n8n/api-types';
|
|
2
2
|
import { AuthenticatedRequest } from '@n8n/db';
|
|
3
3
|
import { type AiAssistantSDK } from '@n8n_io/ai-assistant-sdk';
|
|
4
4
|
import { Response } from 'express';
|
|
@@ -40,4 +40,7 @@ export declare class AiController {
|
|
|
40
40
|
}>;
|
|
41
41
|
getSessionsMetadata(req: AuthenticatedRequest, _: Response, payload: AiSessionRetrievalRequestDto): Promise<AiSessionMetadataResponseDto>;
|
|
42
42
|
getBuilderCredits(req: AuthenticatedRequest, _: Response): Promise<AiAssistantSDK.BuilderInstanceCreditsResponse>;
|
|
43
|
+
truncateMessages(req: AuthenticatedRequest, _: Response, payload: AiTruncateMessagesRequestDto): Promise<{
|
|
44
|
+
success: boolean;
|
|
45
|
+
}>;
|
|
43
46
|
}
|
|
@@ -41,7 +41,7 @@ let AiController = class AiController {
|
|
|
41
41
|
const { signal } = abortController;
|
|
42
42
|
const handleClose = () => abortController.abort();
|
|
43
43
|
res.on('close', handleClose);
|
|
44
|
-
const { id, text, workflowContext, featureFlags } = payload.payload;
|
|
44
|
+
const { id, text, workflowContext, featureFlags, versionId } = payload.payload;
|
|
45
45
|
const aiResponse = this.workflowBuilderService.chat({
|
|
46
46
|
id,
|
|
47
47
|
message: text,
|
|
@@ -52,6 +52,7 @@ let AiController = class AiController {
|
|
|
52
52
|
expressionValues: workflowContext.expressionValues,
|
|
53
53
|
},
|
|
54
54
|
featureFlags,
|
|
55
|
+
versionId,
|
|
55
56
|
}, req.user, signal);
|
|
56
57
|
res.header('Content-type', 'application/json-lines').flush();
|
|
57
58
|
try {
|
|
@@ -192,6 +193,16 @@ let AiController = class AiController {
|
|
|
192
193
|
throw new internal_server_error_1.InternalServerError(e.message, e);
|
|
193
194
|
}
|
|
194
195
|
}
|
|
196
|
+
async truncateMessages(req, _, payload) {
|
|
197
|
+
try {
|
|
198
|
+
const success = await this.workflowBuilderService.truncateMessagesAfter(payload.workflowId, req.user, payload.messageId);
|
|
199
|
+
return { success };
|
|
200
|
+
}
|
|
201
|
+
catch (e) {
|
|
202
|
+
(0, node_assert_1.strict)(e instanceof Error);
|
|
203
|
+
throw new internal_server_error_1.InternalServerError(e.message, e);
|
|
204
|
+
}
|
|
205
|
+
}
|
|
195
206
|
};
|
|
196
207
|
exports.AiController = AiController;
|
|
197
208
|
__decorate([
|
|
@@ -253,6 +264,14 @@ __decorate([
|
|
|
253
264
|
__metadata("design:paramtypes", [Object, Object]),
|
|
254
265
|
__metadata("design:returntype", Promise)
|
|
255
266
|
], AiController.prototype, "getBuilderCredits", null);
|
|
267
|
+
__decorate([
|
|
268
|
+
(0, decorators_1.Licensed)('feat:aiBuilder'),
|
|
269
|
+
(0, decorators_1.Post)('/build/truncate-messages', { rateLimit: { limit: 100 } }),
|
|
270
|
+
__param(2, decorators_1.Body),
|
|
271
|
+
__metadata("design:type", Function),
|
|
272
|
+
__metadata("design:paramtypes", [Object, Object, api_types_1.AiTruncateMessagesRequestDto]),
|
|
273
|
+
__metadata("design:returntype", Promise)
|
|
274
|
+
], AiController.prototype, "truncateMessages", null);
|
|
256
275
|
exports.AiController = AiController = __decorate([
|
|
257
276
|
(0, decorators_1.RestController)('/ai'),
|
|
258
277
|
__metadata("design:paramtypes", [ai_service_1.AiService,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ai.controller.js","sourceRoot":"","sources":["../../src/controllers/ai.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAgF;AAEhF,
|
|
1
|
+
{"version":3,"file":"ai.controller.js","sourceRoot":"","sources":["../../src/controllers/ai.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { AuthenticatedRequest, UserRepository } from '@n8n/db';
|
|
2
2
|
import { Response } from 'express';
|
|
3
3
|
import { AuthService } from '../auth/auth.service';
|
|
4
|
+
import { EventService } from '../events/event.service';
|
|
4
5
|
import { ExternalHooks } from '../external-hooks';
|
|
5
6
|
import { MfaService } from '../mfa/mfa.service';
|
|
6
7
|
import { MFA } from '../requests';
|
|
@@ -9,7 +10,8 @@ export declare class MFAController {
|
|
|
9
10
|
private externalHooks;
|
|
10
11
|
private authService;
|
|
11
12
|
private userRepository;
|
|
12
|
-
|
|
13
|
+
private eventService;
|
|
14
|
+
constructor(mfaService: MfaService, externalHooks: ExternalHooks, authService: AuthService, userRepository: UserRepository, eventService: EventService);
|
|
13
15
|
enforceMFA(req: MFA.Enforce): Promise<void>;
|
|
14
16
|
canEnableMFA(req: AuthenticatedRequest): Promise<void>;
|
|
15
17
|
getQRCode(req: AuthenticatedRequest): Promise<{
|
|
@@ -14,14 +14,16 @@ const db_1 = require("@n8n/db");
|
|
|
14
14
|
const decorators_1 = require("@n8n/decorators");
|
|
15
15
|
const auth_service_1 = require("../auth/auth.service");
|
|
16
16
|
const bad_request_error_1 = require("../errors/response-errors/bad-request.error");
|
|
17
|
+
const event_service_1 = require("../events/event.service");
|
|
17
18
|
const external_hooks_1 = require("../external-hooks");
|
|
18
19
|
const mfa_service_1 = require("../mfa/mfa.service");
|
|
19
20
|
let MFAController = class MFAController {
|
|
20
|
-
constructor(mfaService, externalHooks, authService, userRepository) {
|
|
21
|
+
constructor(mfaService, externalHooks, authService, userRepository, eventService) {
|
|
21
22
|
this.mfaService = mfaService;
|
|
22
23
|
this.externalHooks = externalHooks;
|
|
23
24
|
this.authService = authService;
|
|
24
25
|
this.userRepository = userRepository;
|
|
26
|
+
this.eventService = eventService;
|
|
25
27
|
}
|
|
26
28
|
async enforceMFA(req) {
|
|
27
29
|
if (req.body.enforce && !(req.authInfo?.usedMfa ?? false)) {
|
|
@@ -76,6 +78,15 @@ let MFAController = class MFAController {
|
|
|
76
78
|
if (!verified)
|
|
77
79
|
throw new bad_request_error_1.BadRequestError('MFA code expired. Close the modal and enable MFA again', 997);
|
|
78
80
|
const updatedUser = await this.mfaService.enableMfa(id);
|
|
81
|
+
this.eventService.emit('user-mfa-enabled', {
|
|
82
|
+
user: {
|
|
83
|
+
id: req.user.id,
|
|
84
|
+
email: req.user.email,
|
|
85
|
+
firstName: req.user.firstName,
|
|
86
|
+
lastName: req.user.lastName,
|
|
87
|
+
role: req.user.role,
|
|
88
|
+
},
|
|
89
|
+
});
|
|
79
90
|
this.authService.issueCookie(res, updatedUser, verified, req.browserId);
|
|
80
91
|
}
|
|
81
92
|
async disableMFA(req, res) {
|
|
@@ -92,6 +103,16 @@ let MFAController = class MFAController {
|
|
|
92
103
|
else if (mfaRecoveryCodeDefined) {
|
|
93
104
|
await this.mfaService.disableMfaWithRecoveryCode(userId, mfaRecoveryCode);
|
|
94
105
|
}
|
|
106
|
+
this.eventService.emit('user-mfa-disabled', {
|
|
107
|
+
user: {
|
|
108
|
+
id: req.user.id,
|
|
109
|
+
email: req.user.email,
|
|
110
|
+
firstName: req.user.firstName,
|
|
111
|
+
lastName: req.user.lastName,
|
|
112
|
+
role: req.user.role,
|
|
113
|
+
},
|
|
114
|
+
disableMethod: mfaCodeDefined ? 'mfaCode' : 'recoveryCode',
|
|
115
|
+
});
|
|
95
116
|
const updatedUser = await this.userRepository.findOneOrFail({
|
|
96
117
|
where: { id: userId },
|
|
97
118
|
relations: ['role'],
|
|
@@ -158,6 +179,7 @@ exports.MFAController = MFAController = __decorate([
|
|
|
158
179
|
__metadata("design:paramtypes", [mfa_service_1.MfaService,
|
|
159
180
|
external_hooks_1.ExternalHooks,
|
|
160
181
|
auth_service_1.AuthService,
|
|
161
|
-
db_1.UserRepository
|
|
182
|
+
db_1.UserRepository,
|
|
183
|
+
event_service_1.EventService])
|
|
162
184
|
], MFAController);
|
|
163
185
|
//# sourceMappingURL=mfa.controller.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mfa.controller.js","sourceRoot":"","sources":["../../src/controllers/mfa.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAA+D;AAC/D,gDAAyE;AAGzE,sDAAkD;AAClD,kFAA6E;AAC7E,qDAAiD;AACjD,mDAA+C;AAIxC,IAAM,aAAa,GAAnB,MAAM,aAAa;IACzB,YACS,UAAsB,EACtB,aAA4B,EAC5B,WAAwB,EACxB,cAA8B;
|
|
1
|
+
{"version":3,"file":"mfa.controller.js","sourceRoot":"","sources":["../../src/controllers/mfa.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -68,9 +68,9 @@ let OAuth2CredentialController = class OAuth2CredentialController {
|
|
|
68
68
|
if (Object.keys(req.query).length > 2) {
|
|
69
69
|
(0, set_1.default)(oauthToken.data, 'callbackQueryString', (0, omit_1.default)(req.query, 'state', 'code'));
|
|
70
70
|
}
|
|
71
|
-
|
|
72
|
-
oauthTokenData = {
|
|
73
|
-
...(typeof
|
|
71
|
+
const { oauthTokenData: tokenData } = decryptedDataOriginal;
|
|
72
|
+
const oauthTokenData = {
|
|
73
|
+
...(typeof tokenData === 'object' ? tokenData : {}),
|
|
74
74
|
...oauthToken.data,
|
|
75
75
|
};
|
|
76
76
|
if (!state.origin || state.origin === 'static-credential') {
|
|
@@ -89,7 +89,7 @@ let OAuth2CredentialController = class OAuth2CredentialController {
|
|
|
89
89
|
!state.authorizationHeader.startsWith('Bearer ')) {
|
|
90
90
|
return this.oauthService.renderCallbackError(res, 'Authorization header is required');
|
|
91
91
|
}
|
|
92
|
-
await this.oauthService.saveDynamicCredential(credential,
|
|
92
|
+
await this.oauthService.saveDynamicCredential(credential, { oauthTokenData }, state.authorizationHeader.split('Bearer ')[1], state.credentialResolverId);
|
|
93
93
|
return res.render('oauth-callback');
|
|
94
94
|
}
|
|
95
95
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth2-credential.controller.js","sourceRoot":"","sources":["../../../src/controllers/oauth/oauth2-credential.controller.ts"],"names":[],"mappings":"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
|
|
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,IAAI,OAAO,GAAiC,EAAE,CAAC;YAE/C,MAAM,YAAY,GAAG,IAAI,CAAC,0BAA0B,CAAC,gBAAgB,CAAC,CAAC;YAEvE,IAAI,gBAAgB,CAAC,SAAS,KAAK,MAAM,EAAE,CAAC;gBAC3C,OAAO,GAAG;oBACT,IAAI,EAAE,EAAE,aAAa,EAAE,qBAAqB,CAAC,YAAY,EAAE;iBAC3D,CAAC;YACH,CAAC;iBAAM,IAAI,gBAAgB,CAAC,cAAc,KAAK,MAAM,EAAE,CAAC;gBACvD,OAAO,GAAG;oBACT,IAAI,EAAE;wBACL,GAAG,CAAC,YAAY,CAAC,IAAI,IAAI,EAAE,CAAC;wBAC5B,SAAS,EAAE,YAAY,CAAC,QAAQ;wBAChC,aAAa,EAAE,YAAY,CAAC,YAAY;qBACxC;iBACD,CAAC;gBACF,OAAO,YAAY,CAAC,YAAY,CAAC;YAClC,CAAC;YAED,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,iBAAiB,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;YAEhE,MAAM,QAAQ,GAAG,IAAI,4BAAY,CAAC,YAAY,CAAC,CAAC;YAEhD,MAAM,eAAe,GAAG,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAEzE,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAC9C,GAAG,YAAY,CAAC,WAAqB,IAAI,eAAe,EAAE,EAC1D,OAAO,CACP,CAAC;YAEF,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACvC,IAAA,aAAG,EAAC,UAAU,CAAC,IAAI,EAAE,qBAAqB,EAAE,IAAA,cAAI,EAAC,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;YAC/E,CAAC;YAID,MAAM,EAAE,cAAc,EAAE,SAAS,EAAE,GAAG,qBAAqB,CAAC;YAC5D,MAAM,cAAc,GAAmC;gBACtD,GAAG,CAAC,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;gBACnD,GAAG,UAAU,CAAC,IAAI;aACgB,CAAC;YAEpC,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,KAAK,mBAAmB,EAAE,CAAC;gBAC3D,MAAM,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,UAAU,EAAE,EAAE,cAAc,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;gBAE3F,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,2CAA2C,EAAE;oBAC9D,YAAY,EAAE,UAAU,CAAC,EAAE;iBAC3B,CAAC,CAAC;gBAEH,OAAO,GAAG,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;YACrC,CAAC;YAED,IAAI,KAAK,CAAC,MAAM,KAAK,oBAAoB,EAAE,CAAC;gBAC3C,IAAI,CAAC,KAAK,CAAC,oBAAoB,IAAI,OAAO,KAAK,CAAC,oBAAoB,KAAK,QAAQ,EAAE,CAAC;oBACnF,OAAO,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAAC,GAAG,EAAE,oCAAoC,CAAC,CAAC;gBACzF,CAAC;gBAED,IACC,CAAC,KAAK,CAAC,mBAAmB;oBAC1B,OAAO,KAAK,CAAC,mBAAmB,KAAK,QAAQ;oBAC7C,CAAC,KAAK,CAAC,mBAAmB,CAAC,UAAU,CAAC,SAAS,CAAC,EAC/C,CAAC;oBACF,OAAO,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAAC,GAAG,EAAE,kCAAkC,CAAC,CAAC;gBACvF,CAAC;gBAED,MAAM,IAAI,CAAC,YAAY,CAAC,qBAAqB,CAC5C,UAAU,EACV,EAAE,cAAc,EAAE,EAClB,KAAK,CAAC,mBAAmB,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAC7C,KAAK,CAAC,oBAAoB,CAC1B,CAAC;gBACF,OAAO,GAAG,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;YACrC,CAAC;QACF,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACZ,MAAM,KAAK,GAAG,IAAA,0BAAW,EAAC,CAAC,CAAC,CAAC;YAC7B,OAAO,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAC3C,GAAG,EACH,KAAK,CAAC,OAAO,EACb,MAAM,IAAI,KAAK,CAAC,CAAC,CAAC,IAAA,4BAAa,EAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CACvD,CAAC;QACH,CAAC;IACF,CAAC;IAEO,0BAA0B,CAAC,UAAgC;QAClE,MAAM,OAAO,GAAwB;YACpC,QAAQ,EAAE,UAAU,CAAC,QAAQ;YAC7B,YAAY,EAAE,UAAU,CAAC,YAAY,IAAI,EAAE;YAC3C,cAAc,EAAE,UAAU,CAAC,cAAc,IAAI,EAAE;YAC/C,gBAAgB,EAAE,UAAU,CAAC,OAAO,IAAI,EAAE;YAC1C,cAAc,EAAE,UAAU,CAAC,cAAc,IAAI,QAAQ;YACrD,WAAW,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,UAAU,GAAiB,WAAW;YACxE,MAAM,EAAE,IAAA,eAAK,EAAC,UAAU,CAAC,KAAK,IAAI,QAAQ,EAAE,GAAG,CAAC;YAChD,eAAe,EAAE,UAAU,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG;YAC5D,eAAe,EAAE,UAAU,CAAC,eAAe,IAAI,KAAK;SACpD,CAAC;QAEF,IACC,UAAU,CAAC,wBAAwB;YACnC,OAAO,UAAU,CAAC,wBAAwB,KAAK,QAAQ,EACtD,CAAC;YACF,MAAM,UAAU,GAAG,IAAA,wBAAS,EAAyB,UAAU,CAAC,wBAAwB,CAAC,CAAC;YAE1F,IAAI,UAAU,EAAE,CAAC;gBAChB,OAAO,CAAC,IAAI,GAAG,UAAU,CAAC;YAC3B,CAAC;QACF,CAAC;QAED,OAAO,OAAO,CAAC;IAChB,CAAC;CACD,CAAA;AAjJY,gEAA0B;AAShC;IADL,IAAA,gBAAG,EAAC,OAAO,CAAC;;;;4DAUZ;AAIK;IADL,IAAA,gBAAG,EAAC,WAAW,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,QAAQ,EAAE,uCAAuB,EAAE,CAAC;;;;gEAgG5E;qCArHW,0BAA0B;IADtC,IAAA,2BAAc,EAAC,oBAAoB,CAAC;qCAGJ,4BAAY;QAClB,uBAAM;QACC,8BAAa;GAJlC,0BAA0B,CAiJtC"}
|
|
@@ -38,8 +38,8 @@ export declare class UsersController {
|
|
|
38
38
|
count: number;
|
|
39
39
|
items: {
|
|
40
40
|
id: string;
|
|
41
|
-
email?: string | null | undefined;
|
|
42
41
|
role?: import("@n8n/api-types").Role | undefined;
|
|
42
|
+
email?: string | null | undefined;
|
|
43
43
|
settings?: {
|
|
44
44
|
userActivated?: boolean | undefined;
|
|
45
45
|
allowSSOManualLogin?: boolean | undefined;
|
|
@@ -63,9 +63,9 @@ export declare class UsersController {
|
|
|
63
63
|
mfaEnabled?: boolean | undefined;
|
|
64
64
|
isOwner?: boolean | undefined;
|
|
65
65
|
projectRelations?: {
|
|
66
|
+
role: string;
|
|
66
67
|
id: string;
|
|
67
68
|
name: string;
|
|
68
|
-
role: string;
|
|
69
69
|
}[] | null | undefined;
|
|
70
70
|
isPending?: boolean | undefined;
|
|
71
71
|
signInType?: string | undefined;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { Logger } from '@n8n/backend-common';
|
|
2
2
|
import type { CredentialStoreMetadata, IDynamicCredentialStorageProvider } from './dynamic-credential-storage.interface';
|
|
3
|
-
import type { ICredentialContext, ICredentialDataDecryptedObject, IExecutionContext, IWorkflowSettings } from 'n8n-workflow';
|
|
3
|
+
import type { ICredentialContext, ICredentialDataDecryptedObject, IDataObject, IExecutionContext, IWorkflowSettings } from 'n8n-workflow';
|
|
4
4
|
import type { CredentialResolveMetadata, ICredentialResolutionProvider } from './credential-resolution-provider.interface';
|
|
5
5
|
export declare class DynamicCredentialsProxy implements IDynamicCredentialStorageProvider, ICredentialResolutionProvider {
|
|
6
6
|
private readonly logger;
|
|
@@ -11,4 +11,5 @@ export declare class DynamicCredentialsProxy implements IDynamicCredentialStorag
|
|
|
11
11
|
setResolverProvider(provider: ICredentialResolutionProvider): void;
|
|
12
12
|
resolveIfNeeded(credentialsResolveMetadata: CredentialResolveMetadata, staticData: ICredentialDataDecryptedObject, executionContext?: IExecutionContext, workflowSettings?: IWorkflowSettings): Promise<ICredentialDataDecryptedObject>;
|
|
13
13
|
storeIfNeeded(credentialStoreMetadata: CredentialStoreMetadata, dynamicData: ICredentialDataDecryptedObject, credentialContext: ICredentialContext, staticData?: ICredentialDataDecryptedObject, workflowSettings?: IWorkflowSettings): Promise<void>;
|
|
14
|
+
storeOAuthTokenDataIfNeeded(credentialStoreMetadata: CredentialStoreMetadata, oauthTokenData: IDataObject, executionContext: IExecutionContext | undefined, staticData: ICredentialDataDecryptedObject, workflowSettings?: IWorkflowSettings): Promise<void>;
|
|
14
15
|
}
|
|
@@ -11,6 +11,8 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.DynamicCredentialsProxy = void 0;
|
|
13
13
|
const di_1 = require("@n8n/di");
|
|
14
|
+
const n8n_core_1 = require("n8n-core");
|
|
15
|
+
const n8n_workflow_1 = require("n8n-workflow");
|
|
14
16
|
let DynamicCredentialsProxy = class DynamicCredentialsProxy {
|
|
15
17
|
constructor(logger) {
|
|
16
18
|
this.logger = logger;
|
|
@@ -41,6 +43,26 @@ let DynamicCredentialsProxy = class DynamicCredentialsProxy {
|
|
|
41
43
|
}
|
|
42
44
|
return await this.storageProvider.storeIfNeeded(credentialStoreMetadata, dynamicData, credentialContext, staticData, workflowSettings);
|
|
43
45
|
}
|
|
46
|
+
async storeOAuthTokenDataIfNeeded(credentialStoreMetadata, oauthTokenData, executionContext, staticData, workflowSettings) {
|
|
47
|
+
if (!credentialStoreMetadata.isResolvable || !credentialStoreMetadata.resolverId) {
|
|
48
|
+
return;
|
|
49
|
+
}
|
|
50
|
+
const cipher = di_1.Container.get(n8n_core_1.Cipher);
|
|
51
|
+
let credentialContext;
|
|
52
|
+
if (executionContext?.credentials) {
|
|
53
|
+
const decrypted = cipher.decrypt(executionContext.credentials);
|
|
54
|
+
credentialContext = (0, n8n_workflow_1.toCredentialContext)(decrypted);
|
|
55
|
+
}
|
|
56
|
+
if (!credentialContext) {
|
|
57
|
+
throw new n8n_workflow_1.UnexpectedError('No credential context found', {
|
|
58
|
+
extra: {
|
|
59
|
+
credentialId: credentialStoreMetadata.id,
|
|
60
|
+
credentialName: credentialStoreMetadata.name,
|
|
61
|
+
},
|
|
62
|
+
});
|
|
63
|
+
}
|
|
64
|
+
await this.storeIfNeeded(credentialStoreMetadata, { oauthTokenData }, credentialContext, staticData, workflowSettings);
|
|
65
|
+
}
|
|
44
66
|
};
|
|
45
67
|
exports.DynamicCredentialsProxy = DynamicCredentialsProxy;
|
|
46
68
|
exports.DynamicCredentialsProxy = DynamicCredentialsProxy = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dynamic-credentials-proxy.js","sourceRoot":"","sources":["../../src/credentials/dynamic-credentials-proxy.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"dynamic-credentials-proxy.js","sourceRoot":"","sources":["../../src/credentials/dynamic-credentials-proxy.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,gCAA6C;AAC7C,uCAAkC;AAYlC,+CAAoE;AAO7D,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAMnC,YAA6B,MAAc;QAAd,WAAM,GAAN,MAAM,CAAQ;IAAG,CAAC;IAE/C,kBAAkB,CAAC,QAA2C;QAC7D,IAAI,CAAC,eAAe,GAAG,QAAQ,CAAC;IACjC,CAAC;IAED,mBAAmB,CAAC,QAAuC;QAC1D,IAAI,CAAC,iBAAiB,GAAG,QAAQ,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,eAAe,CACpB,0BAAqD,EACrD,UAA0C,EAC1C,gBAAoC,EACpC,gBAAoC;QAEpC,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC7B,IAAI,0BAA0B,CAAC,YAAY,EAAE,CAAC;gBAC7C,IAAI,CAAC,MAAM,CAAC,IAAI,CACf,8FAA8F,0BAA0B,CAAC,IAAI,GAAG,CAChI,CAAC;gBACF,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;YACjE,CAAC;YACD,OAAO,UAAU,CAAC;QACnB,CAAC;QACD,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAClD,0BAA0B,EAC1B,UAAU,EACV,gBAAgB,EAChB,gBAAgB,CAChB,CAAC;IACH,CAAC;IAED,KAAK,CAAC,aAAa,CAClB,uBAAgD,EAChD,WAA2C,EAC3C,iBAAqC,EACrC,UAA2C,EAC3C,gBAAoC;QAEpC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC;YAC3B,IAAI,uBAAuB,CAAC,YAAY,EAAE,CAAC;gBAC1C,IAAI,CAAC,MAAM,CAAC,IAAI,CACf,0FAA0F,uBAAuB,CAAC,IAAI,GAAG,CACzH,CAAC;gBACF,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;YAC/D,CAAC;YACD,OAAO;QACR,CAAC;QACD,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CAC9C,uBAAuB,EACvB,WAAW,EACX,iBAAiB,EACjB,UAAU,EACV,gBAAgB,CAChB,CAAC;IACH,CAAC;IAKD,KAAK,CAAC,2BAA2B,CAChC,uBAAgD,EAChD,cAA2B,EAC3B,gBAA+C,EAC/C,UAA0C,EAC1C,gBAAoC;QAEpC,IAAI,CAAC,uBAAuB,CAAC,YAAY,IAAI,CAAC,uBAAuB,CAAC,UAAU,EAAE,CAAC;YAClF,OAAO;QACR,CAAC;QAED,MAAM,MAAM,GAAG,cAAS,CAAC,GAAG,CAAC,iBAAM,CAAC,CAAC;QAErC,IAAI,iBAA+D,CAAC;QAEpE,IAAI,gBAAgB,EAAE,WAAW,EAAE,CAAC;YACnC,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;YAC/D,iBAAiB,GAAG,IAAA,kCAAmB,EAAC,SAAS,CAAqC,CAAC;QACxF,CAAC;QAED,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACxB,MAAM,IAAI,8BAAe,CAAC,6BAA6B,EAAE;gBACxD,KAAK,EAAE;oBACN,YAAY,EAAE,uBAAuB,CAAC,EAAE;oBACxC,cAAc,EAAE,uBAAuB,CAAC,IAAI;iBAC5C;aACD,CAAC,CAAC;QACJ,CAAC;QAED,MAAM,IAAI,CAAC,aAAa,CACvB,uBAAuB,EACvB,EAAE,cAAc,EAAoC,EACpD,iBAAiB,EACjB,UAAU,EACV,gBAAgB,CAChB,CAAC;IACH,CAAC;CACD,CAAA;AAxGY,0DAAuB;kCAAvB,uBAAuB;IADnC,IAAA,YAAO,GAAE;;GACG,uBAAuB,CAwGnC"}
|
|
@@ -25,7 +25,7 @@ export declare class CredentialsHelper extends ICredentialsHelper {
|
|
|
25
25
|
getDecrypted(additionalData: IWorkflowExecuteAdditionalData, nodeCredentials: INodeCredentialsDetails, type: string, mode: WorkflowExecuteMode, executeData?: IExecuteData, raw?: boolean, expressionResolveValues?: ICredentialsExpressionResolveValues): Promise<ICredentialDataDecryptedObject>;
|
|
26
26
|
applyDefaultsAndOverwrites(additionalData: IWorkflowExecuteAdditionalData, decryptedDataOriginal: ICredentialDataDecryptedObject, credential: INodeCredentialsDetails, type: string, mode: WorkflowExecuteMode, executeData?: IExecuteData, expressionResolveValues?: ICredentialsExpressionResolveValues): Promise<ICredentialDataDecryptedObject>;
|
|
27
27
|
updateCredentials(nodeCredentials: INodeCredentialsDetails, type: string, data: ICredentialDataDecryptedObject): Promise<void>;
|
|
28
|
-
updateCredentialsOauthTokenData(nodeCredentials: INodeCredentialsDetails, type: string, data: ICredentialDataDecryptedObject): Promise<void>;
|
|
28
|
+
updateCredentialsOauthTokenData(nodeCredentials: INodeCredentialsDetails, type: string, data: ICredentialDataDecryptedObject, additionalData: IWorkflowExecuteAdditionalData): Promise<void>;
|
|
29
29
|
credentialCanUseExternalSecrets(nodeCredential: INodeCredentialsDetails): Promise<boolean>;
|
|
30
30
|
}
|
|
31
31
|
export declare function createCredentialsFromCredentialsEntity(credential: ICredentialsDb, encrypt?: boolean): Credentials;
|
|
@@ -190,7 +190,7 @@ let CredentialsHelper = class CredentialsHelper extends n8n_workflow_1.ICredenti
|
|
|
190
190
|
const credentialsEntity = await this.getCredentialsEntity(nodeCredentials, type);
|
|
191
191
|
const credentials = new n8n_core_1.Credentials({ id: credentialsEntity.id, name: credentialsEntity.name }, credentialsEntity.type, credentialsEntity.data);
|
|
192
192
|
let decryptedDataOriginal = credentials.getData();
|
|
193
|
-
if (additionalData.executionContext?.
|
|
193
|
+
if (additionalData.executionContext?.credentials !== undefined) {
|
|
194
194
|
decryptedDataOriginal = await this.dynamicCredentialsProxy.resolveIfNeeded({
|
|
195
195
|
id: credentialsEntity.id,
|
|
196
196
|
name: credentialsEntity.name,
|
|
@@ -263,7 +263,21 @@ let CredentialsHelper = class CredentialsHelper extends n8n_workflow_1.ICredenti
|
|
|
263
263
|
};
|
|
264
264
|
await this.credentialsRepository.update(findQuery, newCredentialsData);
|
|
265
265
|
}
|
|
266
|
-
async updateCredentialsOauthTokenData(nodeCredentials, type, data) {
|
|
266
|
+
async updateCredentialsOauthTokenData(nodeCredentials, type, data, additionalData) {
|
|
267
|
+
const credentialsEntity = await this.getCredentialsEntity(nodeCredentials, type);
|
|
268
|
+
const resolverId = credentialsEntity.resolverId ?? additionalData.workflowSettings?.credentialResolverId;
|
|
269
|
+
if (credentialsEntity.isResolvable && resolverId) {
|
|
270
|
+
const credentials = await this.getCredentials(nodeCredentials, type);
|
|
271
|
+
const staticData = credentials.getData();
|
|
272
|
+
await this.dynamicCredentialsProxy.storeOAuthTokenDataIfNeeded({
|
|
273
|
+
id: credentialsEntity.id,
|
|
274
|
+
name: credentialsEntity.name,
|
|
275
|
+
type: credentialsEntity.type,
|
|
276
|
+
isResolvable: credentialsEntity.isResolvable,
|
|
277
|
+
resolverId,
|
|
278
|
+
}, data.oauthTokenData, additionalData.executionContext, staticData, additionalData.workflowSettings);
|
|
279
|
+
return;
|
|
280
|
+
}
|
|
267
281
|
const credentials = await this.getCredentials(nodeCredentials, type);
|
|
268
282
|
credentials.updateData({ oauthTokenData: data.oauthTokenData });
|
|
269
283
|
const newCredentialsData = credentials.getDataToSave();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credentials-helper.js","sourceRoot":"","sources":["../src/credentials-helper.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"credentials-helper.js","sourceRoot":"","sources":["../src/credentials-helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { SourceControlledFile } from '@n8n/api-types';
|
|
2
2
|
import { Logger } from '@n8n/backend-common';
|
|
3
3
|
import type { TagEntity, User, Variables, WorkflowTagMapping } from '@n8n/db';
|
|
4
|
-
import { CredentialsRepository, FolderRepository, ProjectRepository, SharedCredentialsRepository, SharedWorkflowRepository, TagRepository, UserRepository, VariablesRepository, WorkflowRepository, WorkflowTagMappingRepository, WorkflowPublishHistoryRepository } from '@n8n/db';
|
|
4
|
+
import { CredentialsRepository, FolderRepository, ProjectRelationRepository, ProjectRepository, SharedCredentialsRepository, SharedWorkflowRepository, TagRepository, UserRepository, VariablesRepository, WorkflowRepository, WorkflowTagMappingRepository, WorkflowPublishHistoryRepository } from '@n8n/db';
|
|
5
5
|
import { ErrorReporter, InstanceSettings } from 'n8n-core';
|
|
6
6
|
import { ActiveWorkflowManager } from '../../active-workflow-manager';
|
|
7
7
|
import { CredentialsService } from '../../credentials/credentials.service';
|
|
@@ -24,6 +24,7 @@ export declare class SourceControlImportService {
|
|
|
24
24
|
private readonly activeWorkflowManager;
|
|
25
25
|
private readonly credentialsRepository;
|
|
26
26
|
private readonly projectRepository;
|
|
27
|
+
private readonly projectRelationRepository;
|
|
27
28
|
private readonly tagRepository;
|
|
28
29
|
private readonly sharedWorkflowRepository;
|
|
29
30
|
private readonly sharedCredentialsRepository;
|
|
@@ -42,7 +43,7 @@ export declare class SourceControlImportService {
|
|
|
42
43
|
private workflowExportFolder;
|
|
43
44
|
private credentialExportFolder;
|
|
44
45
|
private projectExportFolder;
|
|
45
|
-
constructor(logger: Logger, errorReporter: ErrorReporter, variablesService: VariablesService, activeWorkflowManager: ActiveWorkflowManager, credentialsRepository: CredentialsRepository, projectRepository: ProjectRepository, tagRepository: TagRepository, sharedWorkflowRepository: SharedWorkflowRepository, sharedCredentialsRepository: SharedCredentialsRepository, userRepository: UserRepository, variablesRepository: VariablesRepository, workflowRepository: WorkflowRepository, workflowTagMappingRepository: WorkflowTagMappingRepository, workflowService: WorkflowService, credentialsService: CredentialsService, tagService: TagService, folderRepository: FolderRepository, instanceSettings: InstanceSettings, sourceControlScopedService: SourceControlScopedService, workflowPublishHistoryRepository: WorkflowPublishHistoryRepository, workflowHistoryService: WorkflowHistoryService);
|
|
46
|
+
constructor(logger: Logger, errorReporter: ErrorReporter, variablesService: VariablesService, activeWorkflowManager: ActiveWorkflowManager, credentialsRepository: CredentialsRepository, projectRepository: ProjectRepository, projectRelationRepository: ProjectRelationRepository, tagRepository: TagRepository, sharedWorkflowRepository: SharedWorkflowRepository, sharedCredentialsRepository: SharedCredentialsRepository, userRepository: UserRepository, variablesRepository: VariablesRepository, workflowRepository: WorkflowRepository, workflowTagMappingRepository: WorkflowTagMappingRepository, workflowService: WorkflowService, credentialsService: CredentialsService, tagService: TagService, folderRepository: FolderRepository, instanceSettings: InstanceSettings, sourceControlScopedService: SourceControlScopedService, workflowPublishHistoryRepository: WorkflowPublishHistoryRepository, workflowHistoryService: WorkflowHistoryService);
|
|
46
47
|
getRemoteVersionIdsFromFiles(context: SourceControlContext): Promise<SourceControlWorkflowVersionId[]>;
|
|
47
48
|
getAllLocalVersionIdsFromDb(): Promise<SourceControlWorkflowVersionId[]>;
|
|
48
49
|
getLocalVersionIdsFromDb(context: SourceControlContext): Promise<SourceControlWorkflowVersionId[]>;
|
|
@@ -92,7 +93,7 @@ export declare class SourceControlImportService {
|
|
|
92
93
|
}): Promise<{
|
|
93
94
|
imported: string[];
|
|
94
95
|
} | undefined>;
|
|
95
|
-
importTeamProjectsFromWorkFolder(candidates: SourceControlledFile[]): Promise<{
|
|
96
|
+
importTeamProjectsFromWorkFolder(candidates: SourceControlledFile[], pullingUserId: string): Promise<{
|
|
96
97
|
id: string;
|
|
97
98
|
name: string;
|
|
98
99
|
}[]>;
|
|
@@ -68,13 +68,14 @@ const getOwnerFromProject = (remoteOwnerProject) => {
|
|
|
68
68
|
return owner;
|
|
69
69
|
};
|
|
70
70
|
let SourceControlImportService = class SourceControlImportService {
|
|
71
|
-
constructor(logger, errorReporter, variablesService, activeWorkflowManager, credentialsRepository, projectRepository, tagRepository, sharedWorkflowRepository, sharedCredentialsRepository, userRepository, variablesRepository, workflowRepository, workflowTagMappingRepository, workflowService, credentialsService, tagService, folderRepository, instanceSettings, sourceControlScopedService, workflowPublishHistoryRepository, workflowHistoryService) {
|
|
71
|
+
constructor(logger, errorReporter, variablesService, activeWorkflowManager, credentialsRepository, projectRepository, projectRelationRepository, tagRepository, sharedWorkflowRepository, sharedCredentialsRepository, userRepository, variablesRepository, workflowRepository, workflowTagMappingRepository, workflowService, credentialsService, tagService, folderRepository, instanceSettings, sourceControlScopedService, workflowPublishHistoryRepository, workflowHistoryService) {
|
|
72
72
|
this.logger = logger;
|
|
73
73
|
this.errorReporter = errorReporter;
|
|
74
74
|
this.variablesService = variablesService;
|
|
75
75
|
this.activeWorkflowManager = activeWorkflowManager;
|
|
76
76
|
this.credentialsRepository = credentialsRepository;
|
|
77
77
|
this.projectRepository = projectRepository;
|
|
78
|
+
this.projectRelationRepository = projectRelationRepository;
|
|
78
79
|
this.tagRepository = tagRepository;
|
|
79
80
|
this.sharedWorkflowRepository = sharedWorkflowRepository;
|
|
80
81
|
this.sharedCredentialsRepository = sharedCredentialsRepository;
|
|
@@ -471,7 +472,7 @@ let SourceControlImportService = class SourceControlImportService {
|
|
|
471
472
|
});
|
|
472
473
|
const importWorkflowsResult = [];
|
|
473
474
|
for (const candidate of candidates) {
|
|
474
|
-
this.logger.debug(`
|
|
475
|
+
this.logger.debug(`Importing workflow file ${candidate.file}`);
|
|
475
476
|
const importedWorkflow = await this.parseWorkflowFromFile(candidate.file);
|
|
476
477
|
if (!importedWorkflow?.id) {
|
|
477
478
|
continue;
|
|
@@ -757,7 +758,7 @@ let SourceControlImportService = class SourceControlImportService {
|
|
|
757
758
|
}
|
|
758
759
|
return await this.importVariables(importedVariables, valueOverrides);
|
|
759
760
|
}
|
|
760
|
-
async importTeamProjectsFromWorkFolder(candidates) {
|
|
761
|
+
async importTeamProjectsFromWorkFolder(candidates, pullingUserId) {
|
|
761
762
|
const importResults = [];
|
|
762
763
|
const existingProjectVariables = (await this.variablesService.getAllCached()).filter((v) => v.project);
|
|
763
764
|
for (const candidate of candidates) {
|
|
@@ -777,6 +778,21 @@ let SourceControlImportService = class SourceControlImportService {
|
|
|
777
778
|
description: project.description,
|
|
778
779
|
type: 'team',
|
|
779
780
|
}, ['id']);
|
|
781
|
+
const existingProject = await this.projectRepository.findOne({
|
|
782
|
+
where: { id: project.id },
|
|
783
|
+
});
|
|
784
|
+
const hasExistingAdmin = existingProject &&
|
|
785
|
+
(await this.projectRelationRepository.findOne({
|
|
786
|
+
where: { projectId: project.id, role: { slug: permissions_1.PROJECT_ADMIN_ROLE_SLUG } },
|
|
787
|
+
}));
|
|
788
|
+
if (!hasExistingAdmin) {
|
|
789
|
+
await this.projectRelationRepository.save({
|
|
790
|
+
projectId: project.id,
|
|
791
|
+
userId: pullingUserId,
|
|
792
|
+
role: { slug: permissions_1.PROJECT_ADMIN_ROLE_SLUG },
|
|
793
|
+
});
|
|
794
|
+
this.logger.debug(`Assigned user ${pullingUserId} as admin for project ${project.name}`);
|
|
795
|
+
}
|
|
780
796
|
await this.importVariables(project.variableStubs?.map((v) => ({ ...v, projectId: project.id })) ?? []);
|
|
781
797
|
const deletedVariables = existingProjectVariables.filter((v) => v.project.id === project.id && !project.variableStubs?.some((vs) => vs.id === v.id));
|
|
782
798
|
await this.variablesService.deleteByIds(deletedVariables.map((v) => v.id));
|
|
@@ -931,6 +947,7 @@ exports.SourceControlImportService = SourceControlImportService = __decorate([
|
|
|
931
947
|
active_workflow_manager_1.ActiveWorkflowManager,
|
|
932
948
|
db_1.CredentialsRepository,
|
|
933
949
|
db_1.ProjectRepository,
|
|
950
|
+
db_1.ProjectRelationRepository,
|
|
934
951
|
db_1.TagRepository,
|
|
935
952
|
db_1.SharedWorkflowRepository,
|
|
936
953
|
db_1.SharedCredentialsRepository,
|