n8n 2.46.0 → 2.46.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/auth/auth.service.js +1 -1
- package/dist/auth/auth.service.js.map +1 -1
- package/dist/build.tsbuildinfo +1 -1
- package/dist/credentials-helper.js +14 -8
- package/dist/credentials-helper.js.map +1 -1
- package/dist/errors/uninspectable-subworkflow-source.error.js +1 -1
- package/dist/errors/uninspectable-subworkflow-source.error.js.map +1 -1
- package/dist/modules/breaking-changes/rules/v3/edit-image-version.rule.js +8 -12
- package/dist/modules/breaking-changes/rules/v3/edit-image-version.rule.js.map +1 -1
- package/dist/modules/breaking-changes/rules/v3/node-replacement-rule.d.ts +19 -0
- package/dist/modules/breaking-changes/rules/v3/node-replacement-rule.js +53 -0
- package/dist/modules/breaking-changes/rules/v3/node-replacement-rule.js.map +1 -0
- package/dist/modules/breaking-changes/rules/v3/removed-nodes-with-replacements.rule.d.ts +87 -91
- package/dist/modules/breaking-changes/rules/v3/removed-nodes-with-replacements.rule.js +31 -79
- package/dist/modules/breaking-changes/rules/v3/removed-nodes-with-replacements.rule.js.map +1 -1
- package/dist/modules/breaking-changes/rules/v3/removed-nodes.rule.d.ts +75 -11
- package/dist/modules/breaking-changes/rules/v3/removed-nodes.rule.js +96 -59
- package/dist/modules/breaking-changes/rules/v3/removed-nodes.rule.js.map +1 -1
- package/dist/modules/ldap.ee/constants.d.ts +3 -0
- package/dist/modules/ldap.ee/constants.js +4 -0
- package/dist/modules/ldap.ee/constants.js.map +1 -1
- package/dist/modules/ldap.ee/helpers.ee.d.ts +1 -1
- package/dist/modules/ldap.ee/helpers.ee.js +6 -3
- package/dist/modules/ldap.ee/helpers.ee.js.map +1 -1
- package/dist/modules/ldap.ee/ldap.service.ee.d.ts +4 -1
- package/dist/modules/ldap.ee/ldap.service.ee.js +50 -9
- package/dist/modules/ldap.ee/ldap.service.ee.js.map +1 -1
- package/dist/modules/mcp/mcp.constants.d.ts +1 -0
- package/dist/modules/mcp/mcp.constants.js +2 -1
- package/dist/modules/mcp/mcp.constants.js.map +1 -1
- package/dist/modules/mcp/mcp.service.d.ts +3 -2
- package/dist/modules/mcp/mcp.service.js +16 -3
- package/dist/modules/mcp/mcp.service.js.map +1 -1
- package/dist/modules/oauth-server/database/repositories/oauth-authorization-code.repository.d.ts +6 -3
- package/dist/modules/oauth-server/database/repositories/oauth-authorization-code.repository.js +12 -4
- package/dist/modules/oauth-server/database/repositories/oauth-authorization-code.repository.js.map +1 -1
- package/dist/modules/oauth-server/database/repositories/oauth-grant.repository.d.ts +9 -0
- package/dist/modules/oauth-server/database/repositories/oauth-grant.repository.js +75 -0
- package/dist/modules/oauth-server/database/repositories/oauth-grant.repository.js.map +1 -0
- package/dist/modules/oauth-server/database/repositories/oauth-user-consent.repository.d.ts +6 -3
- package/dist/modules/oauth-server/database/repositories/oauth-user-consent.repository.js +11 -4
- package/dist/modules/oauth-server/database/repositories/oauth-user-consent.repository.js.map +1 -1
- package/dist/modules/oauth-server/oauth-authorization-code.service.d.ts +3 -2
- package/dist/modules/oauth-server/oauth-authorization-code.service.js +5 -7
- package/dist/modules/oauth-server/oauth-authorization-code.service.js.map +1 -1
- package/dist/modules/oauth-server/oauth-consent.service.d.ts +3 -1
- package/dist/modules/oauth-server/oauth-consent.service.js +25 -21
- package/dist/modules/oauth-server/oauth-consent.service.js.map +1 -1
- package/dist/modules/oauth-server/oauth-grant.service.d.ts +8 -0
- package/dist/modules/oauth-server/oauth-grant.service.js +36 -0
- package/dist/modules/oauth-server/oauth-grant.service.js.map +1 -0
- package/dist/modules/oauth-server/oauth-server.module.js +12 -0
- package/dist/modules/oauth-server/oauth-server.module.js.map +1 -1
- package/dist/modules/oauth-server/oauth-server.service.d.ts +3 -1
- package/dist/modules/oauth-server/oauth-server.service.js +18 -13
- package/dist/modules/oauth-server/oauth-server.service.js.map +1 -1
- package/dist/modules/oauth-server/oauth-token.service.d.ts +5 -4
- package/dist/modules/oauth-server/oauth-token.service.js +24 -20
- package/dist/modules/oauth-server/oauth-token.service.js.map +1 -1
- package/dist/modules/oauth-server/oauth.controller.js +20 -1
- package/dist/modules/oauth-server/oauth.controller.js.map +1 -1
- package/dist/oauth/oauth.service.js +1 -3
- package/dist/oauth/oauth.service.js.map +1 -1
- package/dist/public-api/v1/openapi.yml +9 -0
- package/dist/services/ai-workflow-builder.service.js.map +1 -1
- package/dist/services/user-deactivation-hooks.service.d.ts +8 -0
- package/dist/services/user-deactivation-hooks.service.js +28 -0
- package/dist/services/user-deactivation-hooks.service.js.map +1 -0
- package/dist/utils/ai-proxy-fetch.js +0 -1
- package/dist/utils/ai-proxy-fetch.js.map +1 -1
- package/dist/workflows/workflow.service.ee.js +8 -1
- package/dist/workflows/workflow.service.ee.js.map +1 -1
- package/package.json +40 -40
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"removed-nodes-with-replacements.rule.js","sourceRoot":"","sources":["../../../../../src/modules/breaking-changes/rules/v3/removed-nodes-with-replacements.rule.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"removed-nodes-with-replacements.rule.js","sourceRoot":"","sources":["../../../../../src/modules/breaking-changes/rules/v3/removed-nodes-with-replacements.rule.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,75 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
import
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
1
|
+
export declare const GithubDocumentLoaderRemovedRule: {
|
|
2
|
+
new (): {
|
|
3
|
+
id: string;
|
|
4
|
+
getMetadata(): import("../../types").BreakingChangeRuleMetadata;
|
|
5
|
+
getRecommendations(_workflowResults: import("@n8n/api-types").BreakingChangeAffectedWorkflow[]): Promise<import("@n8n/api-types").BreakingChangeRecommendation[]>;
|
|
6
|
+
detectWorkflow(_workflow: import("@n8n/db").WorkflowEntity, nodesGroupedByType: Map<string, import("n8n-workflow").INode[]>): Promise<import("../../types").WorkflowDetectionReport>;
|
|
7
|
+
};
|
|
8
|
+
};
|
|
9
|
+
export declare const MotorheadRemovedRule: {
|
|
10
|
+
new (): {
|
|
11
|
+
id: string;
|
|
12
|
+
getMetadata(): import("../../types").BreakingChangeRuleMetadata;
|
|
13
|
+
getRecommendations(_workflowResults: import("@n8n/api-types").BreakingChangeAffectedWorkflow[]): Promise<import("@n8n/api-types").BreakingChangeRecommendation[]>;
|
|
14
|
+
detectWorkflow(_workflow: import("@n8n/db").WorkflowEntity, nodesGroupedByType: Map<string, import("n8n-workflow").INode[]>): Promise<import("../../types").WorkflowDetectionReport>;
|
|
15
|
+
};
|
|
16
|
+
};
|
|
17
|
+
export declare const ZepRemovedRule: {
|
|
18
|
+
new (): {
|
|
19
|
+
id: string;
|
|
20
|
+
getMetadata(): import("../../types").BreakingChangeRuleMetadata;
|
|
21
|
+
getRecommendations(_workflowResults: import("@n8n/api-types").BreakingChangeAffectedWorkflow[]): Promise<import("@n8n/api-types").BreakingChangeRecommendation[]>;
|
|
22
|
+
detectWorkflow(_workflow: import("@n8n/db").WorkflowEntity, nodesGroupedByType: Map<string, import("n8n-workflow").INode[]>): Promise<import("../../types").WorkflowDetectionReport>;
|
|
23
|
+
};
|
|
24
|
+
};
|
|
25
|
+
export declare const ZepVectorStoreRemovedRule: {
|
|
26
|
+
new (): {
|
|
27
|
+
id: string;
|
|
28
|
+
getMetadata(): import("../../types").BreakingChangeRuleMetadata;
|
|
29
|
+
getRecommendations(_workflowResults: import("@n8n/api-types").BreakingChangeAffectedWorkflow[]): Promise<import("@n8n/api-types").BreakingChangeRecommendation[]>;
|
|
30
|
+
detectWorkflow(_workflow: import("@n8n/db").WorkflowEntity, nodesGroupedByType: Map<string, import("n8n-workflow").INode[]>): Promise<import("../../types").WorkflowDetectionReport>;
|
|
31
|
+
};
|
|
32
|
+
};
|
|
33
|
+
export declare const ZepVectorStoreInsertRemovedRule: {
|
|
34
|
+
new (): {
|
|
35
|
+
id: string;
|
|
36
|
+
getMetadata(): import("../../types").BreakingChangeRuleMetadata;
|
|
37
|
+
getRecommendations(_workflowResults: import("@n8n/api-types").BreakingChangeAffectedWorkflow[]): Promise<import("@n8n/api-types").BreakingChangeRecommendation[]>;
|
|
38
|
+
detectWorkflow(_workflow: import("@n8n/db").WorkflowEntity, nodesGroupedByType: Map<string, import("n8n-workflow").INode[]>): Promise<import("../../types").WorkflowDetectionReport>;
|
|
39
|
+
};
|
|
40
|
+
};
|
|
41
|
+
export declare const ZepVectorStoreLoadRemovedRule: {
|
|
42
|
+
new (): {
|
|
43
|
+
id: string;
|
|
44
|
+
getMetadata(): import("../../types").BreakingChangeRuleMetadata;
|
|
45
|
+
getRecommendations(_workflowResults: import("@n8n/api-types").BreakingChangeAffectedWorkflow[]): Promise<import("@n8n/api-types").BreakingChangeRecommendation[]>;
|
|
46
|
+
detectWorkflow(_workflow: import("@n8n/db").WorkflowEntity, nodesGroupedByType: Map<string, import("n8n-workflow").INode[]>): Promise<import("../../types").WorkflowDetectionReport>;
|
|
47
|
+
};
|
|
48
|
+
};
|
|
49
|
+
export declare const OrbitRemovedRule: {
|
|
50
|
+
new (): {
|
|
51
|
+
id: string;
|
|
52
|
+
getMetadata(): import("../../types").BreakingChangeRuleMetadata;
|
|
53
|
+
getRecommendations(_workflowResults: import("@n8n/api-types").BreakingChangeAffectedWorkflow[]): Promise<import("@n8n/api-types").BreakingChangeRecommendation[]>;
|
|
54
|
+
detectWorkflow(_workflow: import("@n8n/db").WorkflowEntity, nodesGroupedByType: Map<string, import("n8n-workflow").INode[]>): Promise<import("../../types").WorkflowDetectionReport>;
|
|
55
|
+
};
|
|
56
|
+
};
|
|
57
|
+
export declare const LangChainCodeRemovedRule: {
|
|
58
|
+
new (): {
|
|
59
|
+
id: string;
|
|
60
|
+
getMetadata(): import("../../types").BreakingChangeRuleMetadata;
|
|
61
|
+
getRecommendations(_workflowResults: import("@n8n/api-types").BreakingChangeAffectedWorkflow[]): Promise<import("@n8n/api-types").BreakingChangeRecommendation[]>;
|
|
62
|
+
detectWorkflow(_workflow: import("@n8n/db").WorkflowEntity, nodesGroupedByType: Map<string, import("n8n-workflow").INode[]>): Promise<import("../../types").WorkflowDetectionReport>;
|
|
63
|
+
};
|
|
64
|
+
};
|
|
65
|
+
export declare const removedNodeRules: {
|
|
66
|
+
rule: {
|
|
67
|
+
new (): {
|
|
68
|
+
id: string;
|
|
69
|
+
getMetadata(): import("../../types").BreakingChangeRuleMetadata;
|
|
70
|
+
getRecommendations(_workflowResults: import("@n8n/api-types").BreakingChangeAffectedWorkflow[]): Promise<import("@n8n/api-types").BreakingChangeRecommendation[]>;
|
|
71
|
+
detectWorkflow(_workflow: import("@n8n/db").WorkflowEntity, nodesGroupedByType: Map<string, import("n8n-workflow").INode[]>): Promise<import("../../types").WorkflowDetectionReport>;
|
|
72
|
+
};
|
|
73
|
+
};
|
|
74
|
+
removedNodeType: string;
|
|
75
|
+
}[];
|
|
@@ -1,62 +1,99 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
-
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
-
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
-
};
|
|
8
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
-
exports.
|
|
10
|
-
const
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
};
|
|
58
|
-
exports.
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
3
|
+
exports.removedNodeRules = exports.LangChainCodeRemovedRule = exports.OrbitRemovedRule = exports.ZepVectorStoreLoadRemovedRule = exports.ZepVectorStoreInsertRemovedRule = exports.ZepVectorStoreRemovedRule = exports.ZepRemovedRule = exports.MotorheadRemovedRule = exports.GithubDocumentLoaderRemovedRule = void 0;
|
|
4
|
+
const node_replacement_rule_1 = require("./node-replacement-rule");
|
|
5
|
+
const replaceWithAnotherMemoryNode = [
|
|
6
|
+
{
|
|
7
|
+
action: 'Replace with another memory node',
|
|
8
|
+
description: 'Replace this node with another memory node.',
|
|
9
|
+
},
|
|
10
|
+
];
|
|
11
|
+
const replaceWithAnotherVectorStoreNode = [
|
|
12
|
+
{
|
|
13
|
+
action: 'Replace with another vector store node',
|
|
14
|
+
description: 'Replace this node with another vector store node.',
|
|
15
|
+
},
|
|
16
|
+
];
|
|
17
|
+
exports.GithubDocumentLoaderRemovedRule = (0, node_replacement_rule_1.createNodeReplacementRule)({
|
|
18
|
+
id: 'github-document-loader-removed',
|
|
19
|
+
removedNodeName: 'GitHub Document Loader',
|
|
20
|
+
removedNodeType: '@n8n/n8n-nodes-langchain.documentGithubLoader',
|
|
21
|
+
recommendations: [
|
|
22
|
+
{
|
|
23
|
+
action: 'Replace with GitHub and Default Data Loader',
|
|
24
|
+
description: 'Fetch the content with the GitHub node, then load it with Default Data Loader.',
|
|
25
|
+
},
|
|
26
|
+
],
|
|
27
|
+
});
|
|
28
|
+
exports.MotorheadRemovedRule = (0, node_replacement_rule_1.createNodeReplacementRule)({
|
|
29
|
+
id: 'motorhead-removed',
|
|
30
|
+
removedNodeName: 'Motorhead',
|
|
31
|
+
removedNodeType: '@n8n/n8n-nodes-langchain.memoryMotorhead',
|
|
32
|
+
recommendations: replaceWithAnotherMemoryNode,
|
|
33
|
+
});
|
|
34
|
+
exports.ZepRemovedRule = (0, node_replacement_rule_1.createNodeReplacementRule)({
|
|
35
|
+
id: 'zep-removed',
|
|
36
|
+
removedNodeName: 'Zep',
|
|
37
|
+
removedNodeType: '@n8n/n8n-nodes-langchain.memoryZep',
|
|
38
|
+
recommendations: replaceWithAnotherMemoryNode,
|
|
39
|
+
});
|
|
40
|
+
exports.ZepVectorStoreRemovedRule = (0, node_replacement_rule_1.createNodeReplacementRule)({
|
|
41
|
+
id: 'zep-vector-store-removed',
|
|
42
|
+
removedNodeName: 'Zep Vector Store',
|
|
43
|
+
removedNodeType: '@n8n/n8n-nodes-langchain.vectorStoreZep',
|
|
44
|
+
recommendations: replaceWithAnotherVectorStoreNode,
|
|
45
|
+
});
|
|
46
|
+
exports.ZepVectorStoreInsertRemovedRule = (0, node_replacement_rule_1.createNodeReplacementRule)({
|
|
47
|
+
id: 'zep-vector-store-insert-removed',
|
|
48
|
+
removedNodeName: 'Zep Vector Store: Insert',
|
|
49
|
+
removedNodeType: '@n8n/n8n-nodes-langchain.vectorStoreZepInsert',
|
|
50
|
+
recommendations: replaceWithAnotherVectorStoreNode,
|
|
51
|
+
});
|
|
52
|
+
exports.ZepVectorStoreLoadRemovedRule = (0, node_replacement_rule_1.createNodeReplacementRule)({
|
|
53
|
+
id: 'zep-vector-store-load-removed',
|
|
54
|
+
removedNodeName: 'Zep Vector Store: Load',
|
|
55
|
+
removedNodeType: '@n8n/n8n-nodes-langchain.vectorStoreZepLoad',
|
|
56
|
+
recommendations: replaceWithAnotherVectorStoreNode,
|
|
57
|
+
});
|
|
58
|
+
exports.OrbitRemovedRule = (0, node_replacement_rule_1.createNodeReplacementRule)({
|
|
59
|
+
id: 'orbit-removed',
|
|
60
|
+
removedNodeName: 'Orbit',
|
|
61
|
+
removedNodeType: 'n8n-nodes-base.orbit',
|
|
62
|
+
recommendations: [
|
|
63
|
+
{
|
|
64
|
+
action: 'Remove the node',
|
|
65
|
+
description: 'Remove this node. The Orbit service shut down, so this node has no replacement.',
|
|
66
|
+
},
|
|
67
|
+
],
|
|
68
|
+
});
|
|
69
|
+
exports.LangChainCodeRemovedRule = (0, node_replacement_rule_1.createNodeReplacementRule)({
|
|
70
|
+
id: 'langchain-code-removed',
|
|
71
|
+
removedNodeName: 'LangChain Code',
|
|
72
|
+
removedNodeType: '@n8n/n8n-nodes-langchain.code',
|
|
73
|
+
recommendations: [
|
|
74
|
+
{
|
|
75
|
+
action: 'Rebuild the node logic',
|
|
76
|
+
description: 'This node has no direct replacement. Rebuild its logic with other nodes.',
|
|
77
|
+
},
|
|
78
|
+
],
|
|
79
|
+
});
|
|
80
|
+
exports.removedNodeRules = [
|
|
81
|
+
{
|
|
82
|
+
rule: exports.GithubDocumentLoaderRemovedRule,
|
|
83
|
+
removedNodeType: '@n8n/n8n-nodes-langchain.documentGithubLoader',
|
|
84
|
+
},
|
|
85
|
+
{ rule: exports.MotorheadRemovedRule, removedNodeType: '@n8n/n8n-nodes-langchain.memoryMotorhead' },
|
|
86
|
+
{ rule: exports.ZepRemovedRule, removedNodeType: '@n8n/n8n-nodes-langchain.memoryZep' },
|
|
87
|
+
{ rule: exports.ZepVectorStoreRemovedRule, removedNodeType: '@n8n/n8n-nodes-langchain.vectorStoreZep' },
|
|
88
|
+
{
|
|
89
|
+
rule: exports.ZepVectorStoreInsertRemovedRule,
|
|
90
|
+
removedNodeType: '@n8n/n8n-nodes-langchain.vectorStoreZepInsert',
|
|
91
|
+
},
|
|
92
|
+
{
|
|
93
|
+
rule: exports.ZepVectorStoreLoadRemovedRule,
|
|
94
|
+
removedNodeType: '@n8n/n8n-nodes-langchain.vectorStoreZepLoad',
|
|
95
|
+
},
|
|
96
|
+
{ rule: exports.OrbitRemovedRule, removedNodeType: 'n8n-nodes-base.orbit' },
|
|
97
|
+
{ rule: exports.LangChainCodeRemovedRule, removedNodeType: '@n8n/n8n-nodes-langchain.code' },
|
|
98
|
+
];
|
|
62
99
|
//# sourceMappingURL=removed-nodes.rule.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"removed-nodes.rule.js","sourceRoot":"","sources":["../../../../../src/modules/breaking-changes/rules/v3/removed-nodes.rule.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"removed-nodes.rule.js","sourceRoot":"","sources":["../../../../../src/modules/breaking-changes/rules/v3/removed-nodes.rule.ts"],"names":[],"mappings":"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"}
|
|
@@ -68,6 +68,9 @@ exports.LDAP_CONFIG_SCHEMA = {
|
|
|
68
68
|
enforceEmailUniqueness: {
|
|
69
69
|
type: 'boolean',
|
|
70
70
|
},
|
|
71
|
+
linkExistingAccountsByEmail: {
|
|
72
|
+
type: 'boolean',
|
|
73
|
+
},
|
|
71
74
|
},
|
|
72
75
|
required: [
|
|
73
76
|
'loginEnabled',
|
|
@@ -105,5 +108,6 @@ exports.NON_SENSIBLE_LDAP_CONFIG_PROPERTIES = [
|
|
|
105
108
|
'searchTimeout',
|
|
106
109
|
'loginLabel',
|
|
107
110
|
'enforceEmailUniqueness',
|
|
111
|
+
'linkExistingAccountsByEmail',
|
|
108
112
|
];
|
|
109
113
|
//# sourceMappingURL=constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/modules/ldap.ee/constants.ts"],"names":[],"mappings":";;;AAEa,QAAA,gBAAgB,GAAG,qBAAqB,CAAC;AAEzC,QAAA,kBAAkB,GAAG,uBAAuB,CAAC;AAE7C,QAAA,oBAAoB,GAAG,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;AAEnD,QAAA,kBAAkB,GAAG;IACjC,OAAO,EAAE,8CAA8C;IACvD,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACX,cAAc,EAAE;YACf,IAAI,EAAE,QAAQ;SACd;QACD,kBAAkB,EAAE;YACnB,IAAI,EAAE,QAAQ;SACd;QACD,iBAAiB,EAAE;YAClB,IAAI,EAAE,QAAQ;SACd;QACD,eAAe,EAAE;YAChB,IAAI,EAAE,QAAQ;SACd;QACD,gBAAgB,EAAE;YACjB,IAAI,EAAE,QAAQ;SACd;QACD,cAAc,EAAE;YACf,IAAI,EAAE,QAAQ;SACd;QACD,oBAAoB,EAAE;YACrB,IAAI,EAAE,QAAQ;SACd;QACD,MAAM,EAAE;YACP,IAAI,EAAE,QAAQ;SACd;QACD,aAAa,EAAE;YACd,IAAI,EAAE,QAAQ;SACd;QACD,kBAAkB,EAAE;YACnB,IAAI,EAAE,QAAQ;SACd;QACD,cAAc,EAAE;YACf,IAAI,EAAE,QAAQ;SACd;QACD,sBAAsB,EAAE;YACvB,IAAI,EAAE,SAAS;SACf;QACD,UAAU,EAAE;YACX,IAAI,EAAE,QAAQ;SACd;QACD,YAAY,EAAE;YACb,IAAI,EAAE,SAAS;SACf;QACD,UAAU,EAAE;YACX,IAAI,EAAE,QAAQ;SACd;QACD,sBAAsB,EAAE;YACvB,IAAI,EAAE,SAAS;SACf;QACD,uBAAuB,EAAE;YACxB,IAAI,EAAE,QAAQ;SACd;QACD,cAAc,EAAE;YACf,IAAI,EAAE,QAAQ;SACd;QACD,aAAa,EAAE;YACd,IAAI,EAAE,QAAQ;SACd;QACD,sBAAsB,EAAE;YACvB,IAAI,EAAE,SAAS;SACf;KACD;IACD,QAAQ,EAAE;QACT,cAAc;QACd,YAAY;QACZ,eAAe;QACf,wBAAwB;QACxB,oBAAoB;QACpB,gBAAgB;QAChB,QAAQ;QACR,gBAAgB;QAChB,sBAAsB;QACtB,oBAAoB;QACpB,mBAAmB;QACnB,gBAAgB;QAChB,kBAAkB;QAClB,iBAAiB;QACjB,YAAY;QACZ,wBAAwB;QACxB,yBAAyB;QACzB,gBAAgB;QAChB,eAAe;KACf;IACD,oBAAoB,EAAE,KAAK;CAC3B,CAAC;AAEW,QAAA,mCAAmC,GAA4B;IAC3E,cAAc;IACd,gBAAgB;IAChB,oBAAoB;IACpB,mBAAmB;IACnB,kBAAkB;IAClB,iBAAiB;IACjB,wBAAwB;IACxB,yBAAyB;IACzB,gBAAgB;IAChB,eAAe;IACf,YAAY;IACZ,wBAAwB;
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/modules/ldap.ee/constants.ts"],"names":[],"mappings":";;;AAEa,QAAA,gBAAgB,GAAG,qBAAqB,CAAC;AAEzC,QAAA,kBAAkB,GAAG,uBAAuB,CAAC;AAE7C,QAAA,oBAAoB,GAAG,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;AAEnD,QAAA,kBAAkB,GAAG;IACjC,OAAO,EAAE,8CAA8C;IACvD,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACX,cAAc,EAAE;YACf,IAAI,EAAE,QAAQ;SACd;QACD,kBAAkB,EAAE;YACnB,IAAI,EAAE,QAAQ;SACd;QACD,iBAAiB,EAAE;YAClB,IAAI,EAAE,QAAQ;SACd;QACD,eAAe,EAAE;YAChB,IAAI,EAAE,QAAQ;SACd;QACD,gBAAgB,EAAE;YACjB,IAAI,EAAE,QAAQ;SACd;QACD,cAAc,EAAE;YACf,IAAI,EAAE,QAAQ;SACd;QACD,oBAAoB,EAAE;YACrB,IAAI,EAAE,QAAQ;SACd;QACD,MAAM,EAAE;YACP,IAAI,EAAE,QAAQ;SACd;QACD,aAAa,EAAE;YACd,IAAI,EAAE,QAAQ;SACd;QACD,kBAAkB,EAAE;YACnB,IAAI,EAAE,QAAQ;SACd;QACD,cAAc,EAAE;YACf,IAAI,EAAE,QAAQ;SACd;QACD,sBAAsB,EAAE;YACvB,IAAI,EAAE,SAAS;SACf;QACD,UAAU,EAAE;YACX,IAAI,EAAE,QAAQ;SACd;QACD,YAAY,EAAE;YACb,IAAI,EAAE,SAAS;SACf;QACD,UAAU,EAAE;YACX,IAAI,EAAE,QAAQ;SACd;QACD,sBAAsB,EAAE;YACvB,IAAI,EAAE,SAAS;SACf;QACD,uBAAuB,EAAE;YACxB,IAAI,EAAE,QAAQ;SACd;QACD,cAAc,EAAE;YACf,IAAI,EAAE,QAAQ;SACd;QACD,aAAa,EAAE;YACd,IAAI,EAAE,QAAQ;SACd;QACD,sBAAsB,EAAE;YACvB,IAAI,EAAE,SAAS;SACf;QACD,2BAA2B,EAAE;YAC5B,IAAI,EAAE,SAAS;SACf;KACD;IACD,QAAQ,EAAE;QACT,cAAc;QACd,YAAY;QACZ,eAAe;QACf,wBAAwB;QACxB,oBAAoB;QACpB,gBAAgB;QAChB,QAAQ;QACR,gBAAgB;QAChB,sBAAsB;QACtB,oBAAoB;QACpB,mBAAmB;QACnB,gBAAgB;QAChB,kBAAkB;QAClB,iBAAiB;QACjB,YAAY;QACZ,wBAAwB;QACxB,yBAAyB;QACzB,gBAAgB;QAChB,eAAe;KACf;IACD,oBAAoB,EAAE,KAAK;CAC3B,CAAC;AAEW,QAAA,mCAAmC,GAA4B;IAC3E,cAAc;IACd,gBAAgB;IAChB,oBAAoB;IACpB,mBAAmB;IACnB,kBAAkB;IAClB,iBAAiB;IACjB,wBAAwB;IACxB,yBAAyB;IACzB,gBAAgB;IAChB,eAAe;IACf,YAAY;IACZ,wBAAwB;IACxB,6BAA6B;CAC7B,CAAC"}
|
|
@@ -17,7 +17,7 @@ export declare const mapLdapAttributesToUser: (ldapUser: LdapUser, ldapConfig: L
|
|
|
17
17
|
export declare const getLdapIds: () => Promise<string[]>;
|
|
18
18
|
export declare const getLdapUsers: () => Promise<User[]>;
|
|
19
19
|
export declare const mapLdapUserToDbUser: (ldapUser: LdapUser, ldapConfig: LdapConfig, toCreate?: boolean) => [string, User];
|
|
20
|
-
export declare const processUsers: (toCreateUsers: Array<[string, User]>, toUpdateUsers: Array<[string, User]>, toDisableUsers: string[]) => Promise<void>;
|
|
20
|
+
export declare const processUsers: (toCreateUsers: Array<[string, User]>, toUpdateUsers: Array<[string, User]>, toDisableUsers: string[], linkExistingAccountsByEmail: boolean) => Promise<void>;
|
|
21
21
|
export declare const saveLdapSynchronization: (data: Omit<AuthProviderSyncHistory, 'id' | 'providerType'>) => Promise<AuthProviderSyncHistory>;
|
|
22
22
|
export declare const getLdapSynchronizations: (page: number, perPage: number) => Promise<AuthProviderSyncHistory[]>;
|
|
23
23
|
export declare const getLdapSynchronizationsWithCount: (offset: number, limit: number) => Promise<[AuthProviderSyncHistory[], number]>;
|
|
@@ -5,6 +5,7 @@ const db_1 = require("@n8n/db");
|
|
|
5
5
|
const di_1 = require("@n8n/di");
|
|
6
6
|
const jsonschema_1 = require("jsonschema");
|
|
7
7
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
8
|
+
const user_deactivation_hooks_service_1 = require("../../services/user-deactivation-hooks.service");
|
|
8
9
|
const constants_1 = require("./constants");
|
|
9
10
|
const validateLdapConfigurationSchema = (ldapConfig) => {
|
|
10
11
|
const { valid, errors } = (0, jsonschema_1.validate)(ldapConfig, constants_1.LDAP_CONFIG_SCHEMA, { nestedErrors: true });
|
|
@@ -119,16 +120,17 @@ const mapLdapUserToDbUser = (ldapUser, ldapConfig, toCreate = false) => {
|
|
|
119
120
|
return [ldapId, user];
|
|
120
121
|
};
|
|
121
122
|
exports.mapLdapUserToDbUser = mapLdapUserToDbUser;
|
|
122
|
-
const processUsers = async (toCreateUsers, toUpdateUsers, toDisableUsers) => {
|
|
123
|
+
const processUsers = async (toCreateUsers, toUpdateUsers, toDisableUsers, linkExistingAccountsByEmail) => {
|
|
123
124
|
const userRepository = di_1.Container.get(db_1.UserRepository);
|
|
124
|
-
|
|
125
|
-
await dbManager.transaction(async (transactionManager) => {
|
|
125
|
+
await userRepository.runInTransaction({}, async (transactionManager, ctx) => {
|
|
126
126
|
return await Promise.all([
|
|
127
127
|
...toCreateUsers.map(async ([ldapId, user]) => {
|
|
128
128
|
const existingUser = await transactionManager.findOne(db_1.User, {
|
|
129
129
|
where: { email: user.email },
|
|
130
130
|
});
|
|
131
131
|
if (existingUser) {
|
|
132
|
+
if (!linkExistingAccountsByEmail)
|
|
133
|
+
return;
|
|
132
134
|
const hasChanges = existingUser.firstName !== user.firstName || existingUser.lastName !== user.lastName;
|
|
133
135
|
if (hasChanges) {
|
|
134
136
|
existingUser.firstName = user.firstName;
|
|
@@ -172,6 +174,7 @@ const processUsers = async (toCreateUsers, toUpdateUsers, toDisableUsers) => {
|
|
|
172
174
|
if (user) {
|
|
173
175
|
user.disabled = true;
|
|
174
176
|
await transactionManager.save(user);
|
|
177
|
+
await di_1.Container.get(user_deactivation_hooks_service_1.UserDeactivationHooks).run(user.id, ctx);
|
|
175
178
|
}
|
|
176
179
|
await transactionManager.delete(db_1.AuthIdentity, { userId: authIdentity?.userId });
|
|
177
180
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.ee.js","sourceRoot":"","sources":["../../../src/modules/ldap.ee/helpers.ee.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"helpers.ee.js","sourceRoot":"","sources":["../../../src/modules/ldap.ee/helpers.ee.ts"],"names":[],"mappings":";;;AAEA,gCAOiB;AACjB,gCAAoC;AACpC,2CAAsC;AAEtC,+CAA4C;AAE5C,gGAAmF;AAEnF,2CAAuE;AAKhE,MAAM,+BAA+B,GAAG,CAC9C,UAAsB,EACgB,EAAE;IACxC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,IAAA,qBAAQ,EAAC,UAAU,EAAE,8BAAkB,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;IAE3F,IAAI,OAAO,GAAG,EAAE,CAAC;IACjB,IAAI,CAAC,KAAK,EAAE,CAAC;QACZ,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,gBAAgB,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC7F,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;AAC3B,CAAC,CAAC;AAVW,QAAA,+BAA+B,GAA/B,+BAA+B,CAU1C;AAEK,MAAM,4BAA4B,GAAG,CAAC,KAAe,EAAY,EAAE;IACzE,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC;SACnB,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,gCAAoB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;SACjD,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE;QAChB,KAAK,CAAC,CAAC,CAAC,GAAI,KAAK,CAAC,CAAC,CAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;IACJ,OAAO,KAAK,CAAC;AACd,CAAC,CAAC;AAPW,QAAA,4BAA4B,GAA5B,4BAA4B,CAOvC;AAEK,MAAM,uBAAuB,GAAG,CAAC,OAAmB,EAAQ,EAAE;IACpE,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,QAAA,4BAA4B,EAAC,KAAK,CAAC,CAAC,CAAC;AACjE,CAAC,CAAC;AAFW,QAAA,uBAAuB,GAAvB,uBAAuB,CAElC;AAEK,MAAM,YAAY,GAAG,CAAC,MAAc,EAAE,UAAkB,EAAE,EAAE;IAClE,IAAI,OAAO,GAAG,8CAA8C,MAAM,GAAG,CAAC;IACtE,IAAI,UAAU,EAAE,CAAC;QAChB,OAAO,GAAG,KAAK,UAAU,GAAG,MAAM,GAAG,CAAC;IACvC,CAAC;IACD,OAAO,OAAO,CAAC;AAChB,CAAC,CAAC;AANW,QAAA,YAAY,GAAZ,YAAY,CAMvB;AAEK,MAAM,YAAY,GAAG,CAAC,MAAc,EAAU,EAAE;IACtD,OAAO,CACN,MAAM;SACJ,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC;SACtB,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC;SACtB,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC;SACtB,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC;SAEtB,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,CAC1B,CAAC;AACH,CAAC,CAAC;AAVW,QAAA,YAAY,GAAZ,YAAY,CAUvB;AAKK,MAAM,uBAAuB,GAAG,KAAK,EAC3C,gBAAwB,EACO,EAAE;IACjC,OAAO,MAAM,cAAS,CAAC,GAAG,CAAC,2BAAsB,CAAC,CAAC,OAAO,CAAC;QAC1D,SAAS,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;QACzB,KAAK,EAAE;YACN,UAAU,EAAE,gBAAgB;YAC5B,YAAY,EAAE,MAAM;SACpB;KACD,CAAC,CAAC;AACJ,CAAC,CAAC;AAVW,QAAA,uBAAuB,GAAvB,uBAAuB,CAUlC;AAMK,MAAM,eAAe,GAAG,KAAK,EAAE,gBAAwB,EAAE,EAAE;IACjE,OAAO,MAAM,cAAS,CAAC,GAAG,CAAC,mBAAc,CAAC,CAAC,OAAO,CAAC;QAClD,SAAS,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;QACzB,KAAK,EAAE;YACN,cAAc,EAAE;gBACf,UAAU,EAAE,gBAAgB;gBAC5B,YAAY,EAAE,MAAM;aACpB;SACD;KACD,CAAC,CAAC;AACJ,CAAC,CAAC;AAVW,QAAA,eAAe,GAAf,eAAe,CAU1B;AAEK,MAAM,cAAc,GAAG,KAAK,EAAE,KAAa,EAAwB,EAAE;IAC3E,OAAO,MAAM,cAAS,CAAC,GAAG,CAAC,mBAAc,CAAC,CAAC,OAAO,CAAC;QAClD,KAAK,EAAE,EAAE,KAAK,EAAE;KAChB,CAAC,CAAC;AACJ,CAAC,CAAC;AAJW,QAAA,cAAc,GAAd,cAAc,CAIzB;AAMK,MAAM,uBAAuB,GAAG,CACtC,QAAkB,EAClB,UAAsB,EACyD,EAAE;IACjF,OAAO;QACN,QAAQ,CAAC,UAAU,CAAC,eAAe,CAAW;QAC9C;YACC,KAAK,EAAE,QAAQ,CAAC,UAAU,CAAC,cAAc,CAAW;YACpD,SAAS,EAAE,QAAQ,CAAC,UAAU,CAAC,kBAAkB,CAAW;YAC5D,QAAQ,EAAE,QAAQ,CAAC,UAAU,CAAC,iBAAiB,CAAW;SAC1D;KACD,CAAC;AACH,CAAC,CAAC;AAZW,QAAA,uBAAuB,GAAvB,uBAAuB,CAYlC;AAKK,MAAM,UAAU,GAAG,KAAK,IAAuB,EAAE;IACvD,MAAM,UAAU,GAAG,MAAM,cAAS,CAAC,GAAG,CAAC,2BAAsB,CAAC,CAAC,IAAI,CAAC;QACnE,MAAM,EAAE,CAAC,YAAY,CAAC;QACtB,KAAK,EAAE;YACN,YAAY,EAAE,MAAM;SACpB;KACD,CAAC,CAAC;IACH,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;AAC5C,CAAC,CAAC;AARW,QAAA,UAAU,GAAV,UAAU,CAQrB;AAEK,MAAM,YAAY,GAAG,KAAK,IAAqB,EAAE;IACvD,MAAM,UAAU,GAAG,MAAM,cAAS,CAAC,GAAG,CAAC,2BAAsB,CAAC,CAAC,IAAI,CAAC;QACnE,SAAS,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;QACzB,KAAK,EAAE;YACN,YAAY,EAAE,MAAM;SACpB;KACD,CAAC,CAAC;IACH,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;AACtC,CAAC,CAAC;AARW,QAAA,YAAY,GAAZ,YAAY,CAQvB;AAKK,MAAM,mBAAmB,GAAG,CAClC,QAAkB,EAClB,UAAsB,EACtB,QAAQ,GAAG,KAAK,EACC,EAAE;IACnB,MAAM,IAAI,GAAG,IAAI,SAAI,EAAE,CAAC;IACxB,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,IAAA,QAAA,uBAAuB,EAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IACrE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC1B,IAAI,QAAQ,EAAE,CAAC;QACd,IAAI,CAAC,IAAI,GAAG,uBAAkB,CAAC;QAC/B,IAAI,CAAC,QAAQ,GAAG,IAAA,2BAAY,EAAC,CAAC,CAAC,CAAC;QAChC,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;IACvB,CAAC;SAAM,CAAC;QACP,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;IACtB,CAAC;IACD,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;AACvB,CAAC,CAAC;AAhBW,QAAA,mBAAmB,GAAnB,mBAAmB,CAgB9B;AAOK,MAAM,YAAY,GAAG,KAAK,EAChC,aAAoC,EACpC,aAAoC,EACpC,cAAwB,EACxB,2BAAoC,EACpB,EAAE;IAClB,MAAM,cAAc,GAAG,cAAS,CAAC,GAAG,CAAC,mBAAc,CAAC,CAAC;IACrD,MAAM,cAAc,CAAC,gBAAgB,CAAC,EAAE,EAAE,KAAK,EAAE,kBAAkB,EAAE,GAAG,EAAE,EAAE;QAC3E,OAAO,MAAM,OAAO,CAAC,GAAG,CAAC;YACxB,GAAG,aAAa,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE;gBAM7C,MAAM,YAAY,GAAG,MAAM,kBAAkB,CAAC,OAAO,CAAC,SAAI,EAAE;oBAC3D,KAAK,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE;iBAC5B,CAAC,CAAC;gBAEH,IAAI,YAAY,EAAE,CAAC;oBAClB,IAAI,CAAC,2BAA2B;wBAAE,OAAO;oBAEzC,MAAM,UAAU,GACf,YAAY,CAAC,SAAS,KAAK,IAAI,CAAC,SAAS,IAAI,YAAY,CAAC,QAAQ,KAAK,IAAI,CAAC,QAAQ,CAAC;oBAEtF,IAAI,UAAU,EAAE,CAAC;wBAChB,YAAY,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;wBACxC,YAAY,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;wBACtC,MAAM,kBAAkB,CAAC,IAAI,CAAC,SAAI,EAAE,YAAY,CAAC,CAAC;oBACnD,CAAC;oBAED,MAAM,YAAY,GAAG,iBAAY,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;oBAC/D,OAAO,MAAM,kBAAkB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBACpD,CAAC;gBAED,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,MAAM,cAAc,CAAC,qBAAqB,CACrE,IAAI,EACJ,kBAAkB,CAClB,CAAC;gBACF,MAAM,YAAY,GAAG,iBAAY,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;gBAC5D,OAAO,MAAM,kBAAkB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YACpD,CAAC,CAAC;YACF,GAAG,aAAa,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE;gBAC7C,MAAM,YAAY,GAAG,MAAM,kBAAkB,CAAC,SAAS,CAAC,iBAAY,EAAE;oBACrE,UAAU,EAAE,MAAM;iBAClB,CAAC,CAAC;gBACH,IAAI,YAAY,EAAE,MAAM,EAAE,CAAC;oBAC1B,MAAM,YAAY,GAAG,MAAM,kBAAkB,CAAC,SAAS,CAAC,SAAI,EAAE;wBAC7D,EAAE,EAAE,YAAY,CAAC,MAAM;qBACvB,CAAC,CAAC;oBACH,IAAI,YAAY,EAAE,CAAC;wBAElB,MAAM,UAAU,GACf,YAAY,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK;4BACjC,YAAY,CAAC,SAAS,KAAK,IAAI,CAAC,SAAS;4BACzC,YAAY,CAAC,QAAQ,KAAK,IAAI,CAAC,QAAQ,CAAC;wBAEzC,IAAI,UAAU,EAAE,CAAC;4BAChB,YAAY,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;4BAChC,YAAY,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;4BACxC,YAAY,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;4BACtC,MAAM,kBAAkB,CAAC,IAAI,CAAC,SAAI,EAAE,YAAY,CAAC,CAAC;wBACnD,CAAC;oBACF,CAAC;gBACF,CAAC;YACF,CAAC,CAAC;YACF,GAAG,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;gBACtC,MAAM,YAAY,GAAG,MAAM,kBAAkB,CAAC,SAAS,CAAC,iBAAY,EAAE;oBACrE,UAAU,EAAE,MAAM;iBAClB,CAAC,CAAC;gBACH,IAAI,YAAY,EAAE,MAAM,EAAE,CAAC;oBAC1B,MAAM,IAAI,GAAG,MAAM,kBAAkB,CAAC,SAAS,CAAC,SAAI,EAAE,EAAE,EAAE,EAAE,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC;oBAEnF,IAAI,IAAI,EAAE,CAAC;wBACV,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;wBACrB,MAAM,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;wBACpC,MAAM,cAAS,CAAC,GAAG,CAAC,uDAAqB,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;oBAC9D,CAAC;oBAED,MAAM,kBAAkB,CAAC,MAAM,CAAC,iBAAY,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC,CAAC;gBACjF,CAAC;YACF,CAAC,CAAC;SACF,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC;AApFW,QAAA,YAAY,GAAZ,YAAY,CAoFvB;AAKK,MAAM,uBAAuB,GAAG,KAAK,EAC3C,IAA0D,EACvB,EAAE;IACrC,OAAO,MAAM,cAAS,CAAC,GAAG,CAAC,sCAAiC,CAAC,CAAC,IAAI,CACjE;QACC,GAAG,IAAI;QACP,YAAY,EAAE,MAAM;KACpB,EACD,EAAE,WAAW,EAAE,KAAK,EAAE,CACtB,CAAC;AACH,CAAC,CAAC;AAVW,QAAA,uBAAuB,GAAvB,uBAAuB,CAUlC;AAKK,MAAM,uBAAuB,GAAG,KAAK,EAC3C,IAAY,EACZ,OAAe,EACsB,EAAE;IACvC,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC7B,OAAO,MAAM,cAAS,CAAC,GAAG,CAAC,sCAAiC,CAAC,CAAC,IAAI,CAAC;QAClE,KAAK,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE;QAC/B,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE;QACrB,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,KAAK,GAAG,OAAO;KACrB,CAAC,CAAC;AACJ,CAAC,CAAC;AAXW,QAAA,uBAAuB,GAAvB,uBAAuB,CAWlC;AAMK,MAAM,gCAAgC,GAAG,KAAK,EACpD,MAAc,EACd,KAAa,EACkC,EAAE;IACjD,OAAO,MAAM,cAAS,CAAC,GAAG,CAAC,sCAAiC,CAAC,CAAC,YAAY,CAAC;QAC1E,KAAK,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE;QAC/B,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE;QACrB,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,KAAK;KACX,CAAC,CAAC;AACJ,CAAC,CAAC;AAVW,QAAA,gCAAgC,GAAhC,gCAAgC,CAU3C;AAKK,MAAM,SAAS,GAAG,CAAC,GAAW,EAAE,IAAY,EAAE,QAA4B,EAAE,EAAE;IACpF,MAAM,QAAQ,GAAG,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;IAC/D,OAAO,GAAG,QAAQ,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;AACvC,CAAC,CAAC;AAHW,QAAA,SAAS,GAAT,SAAS,CAGpB;AAEK,MAAM,oBAAoB,GAAG,CAAC,UAAsB,EAAY,EAAE;IACxE,OAAO;QACN,UAAU,CAAC,cAAc;QACzB,UAAU,CAAC,eAAe;QAC1B,UAAU,CAAC,kBAAkB;QAC7B,UAAU,CAAC,iBAAiB;QAC5B,UAAU,CAAC,cAAc;KACzB,CAAC;AACH,CAAC,CAAC;AARW,QAAA,oBAAoB,GAApB,oBAAoB,CAQ/B;AAEK,MAAM,sBAAsB,GAAG,KAAK,EAAE,IAAU,EAAE,MAAc,EAAE,EAAE;IAC1E,OAAO,MAAM,cAAS,CAAC,GAAG,CAAC,2BAAsB,CAAC,CAAC,IAAI,CAAC,iBAAY,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE;QAC1F,WAAW,EAAE,KAAK;KAClB,CAAC,CAAC;AACJ,CAAC,CAAC;AAJW,QAAA,sBAAsB,GAAtB,sBAAsB,CAIjC;AAEK,MAAM,uBAAuB,GAAG,KAAK,EAAE,IAAmB,EAAE,MAAc,EAAE,EAAE;IACpF,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,cAAS,CAAC,GAAG,CAAC,mBAAc,CAAC,CAAC,qBAAqB,CAAC;QAC1E,QAAQ,EAAE,IAAA,2BAAY,EAAC,CAAC,CAAC;QACzB,IAAI,EAAE,uBAAkB;QACxB,GAAG,IAAI;KACP,CAAC,CAAC;IACH,MAAM,IAAA,QAAA,sBAAsB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC3C,OAAO,IAAI,CAAC;AACb,CAAC,CAAC;AARW,QAAA,uBAAuB,GAAvB,uBAAuB,CAQlC;AAEK,MAAM,uBAAuB,GAAG,KAAK,EAAE,QAAsB,EAAE,IAAmB,EAAE,EAAE;IAC5F,MAAM,MAAM,GAAG,QAAQ,EAAE,IAAI,EAAE,EAAE,CAAC;IAClC,IAAI,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,GAAG,MAAM,cAAS,CAAC,GAAG,CAAC,mBAAc,CAAC,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;QAE3E,IAAI,IAAI,EAAE,CAAC;YACV,MAAM,cAAS,CAAC,GAAG,CAAC,mBAAc,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1F,CAAC;IACF,CAAC;AACF,CAAC,CAAC;AATW,QAAA,uBAAuB,GAAvB,uBAAuB,CASlC;AAEK,MAAM,uBAAuB,GAAG,KAAK,IAAI,EAAE;IACjD,OAAO,MAAM,cAAS,CAAC,GAAG,CAAC,2BAAsB,CAAC,CAAC,MAAM,CAAC,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC,CAAC;AACrF,CAAC,CAAC;AAFW,QAAA,uBAAuB,GAAvB,uBAAuB,CAElC"}
|
|
@@ -7,6 +7,7 @@ import type { IPasswordAuthHandler } from '@n8n/decorators';
|
|
|
7
7
|
import { Constructable } from '@n8n/di';
|
|
8
8
|
import type { Entry as LdapUser } from 'ldapts';
|
|
9
9
|
import { Cipher } from 'n8n-core';
|
|
10
|
+
type LdapConfigUpdate = Omit<LdapConfig, 'linkExistingAccountsByEmail'> & Partial<Pick<LdapConfig, 'linkExistingAccountsByEmail'>>;
|
|
10
11
|
export declare class LdapService implements IPasswordAuthHandler<User> {
|
|
11
12
|
private readonly logger;
|
|
12
13
|
private readonly settingsRepository;
|
|
@@ -24,7 +25,7 @@ export declare class LdapService implements IPasswordAuthHandler<User> {
|
|
|
24
25
|
constructor(logger: Logger, settingsRepository: SettingsRepository, cipher: Cipher, eventService: EventService, licenseState: LicenseState);
|
|
25
26
|
init(): Promise<void>;
|
|
26
27
|
loadConfig(): Promise<LdapConfig>;
|
|
27
|
-
updateConfig(
|
|
28
|
+
updateConfig(submittedConfig: LdapConfigUpdate): Promise<void>;
|
|
28
29
|
setConfig(ldapConfig: LdapConfig): void;
|
|
29
30
|
private setGlobalLdapConfigVariables;
|
|
30
31
|
private setLdapLoginEnabled;
|
|
@@ -40,8 +41,10 @@ export declare class LdapService implements IPasswordAuthHandler<User> {
|
|
|
40
41
|
stopSync(): void;
|
|
41
42
|
private getUsersToProcess;
|
|
42
43
|
private filterEmailDuplicates;
|
|
44
|
+
private filterExistingAccounts;
|
|
43
45
|
private getUsersToCreate;
|
|
44
46
|
private getUsersToUpdate;
|
|
45
47
|
private getUsersToDisable;
|
|
46
48
|
handleLogin(loginId: string, password: string): Promise<User | undefined>;
|
|
47
49
|
}
|
|
50
|
+
export {};
|
|
@@ -68,14 +68,24 @@ let LdapService = class LdapService {
|
|
|
68
68
|
if (ldapConfig.enforceEmailUniqueness === undefined) {
|
|
69
69
|
ldapConfig.enforceEmailUniqueness = true;
|
|
70
70
|
}
|
|
71
|
+
if (ldapConfig.linkExistingAccountsByEmail === undefined) {
|
|
72
|
+
ldapConfig.linkExistingAccountsByEmail = true;
|
|
73
|
+
}
|
|
71
74
|
ldapConfig.bindingAdminPassword = await this.cipher.decryptV2(ldapConfig.bindingAdminPassword);
|
|
72
75
|
return ldapConfig;
|
|
73
76
|
}
|
|
74
|
-
async updateConfig(
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
77
|
+
async updateConfig(submittedConfig) {
|
|
78
|
+
let stored;
|
|
79
|
+
if (submittedConfig.bindingAdminPassword === n8n_workflow_1.CREDENTIAL_BLANKING_VALUE) {
|
|
80
|
+
stored = await this.loadConfig();
|
|
81
|
+
submittedConfig.bindingAdminPassword = stored.bindingAdminPassword;
|
|
82
|
+
}
|
|
83
|
+
let { linkExistingAccountsByEmail } = submittedConfig;
|
|
84
|
+
if (linkExistingAccountsByEmail === undefined) {
|
|
85
|
+
stored ??= await this.loadConfig();
|
|
86
|
+
linkExistingAccountsByEmail = stored.linkExistingAccountsByEmail;
|
|
87
|
+
}
|
|
88
|
+
const ldapConfig = Object.assign(submittedConfig, { linkExistingAccountsByEmail });
|
|
79
89
|
const { valid, message } = (0, helpers_ee_1.validateLdapConfigurationSchema)(ldapConfig);
|
|
80
90
|
if (!valid) {
|
|
81
91
|
throw new errors_1.BadRequestError(message);
|
|
@@ -279,8 +289,11 @@ let LdapService = class LdapService {
|
|
|
279
289
|
}
|
|
280
290
|
return true;
|
|
281
291
|
});
|
|
292
|
+
const processableUsersToCreate = this.config.linkExistingAccountsByEmail
|
|
293
|
+
? filteredUsersToCreate
|
|
294
|
+
: await this.filterExistingAccounts(filteredUsersToCreate);
|
|
282
295
|
this.logger.debug('LDAP - Users to process', {
|
|
283
|
-
created:
|
|
296
|
+
created: processableUsersToCreate.length,
|
|
284
297
|
updated: filteredUsersToUpdate.length,
|
|
285
298
|
disabled: usersToDisable.length,
|
|
286
299
|
});
|
|
@@ -289,7 +302,7 @@ let LdapService = class LdapService {
|
|
|
289
302
|
let errorMessage = '';
|
|
290
303
|
try {
|
|
291
304
|
if (mode === 'live') {
|
|
292
|
-
await (0, helpers_ee_1.processUsers)(
|
|
305
|
+
await (0, helpers_ee_1.processUsers)(processableUsersToCreate, filteredUsersToUpdate, usersToDisable, this.config.linkExistingAccountsByEmail);
|
|
293
306
|
}
|
|
294
307
|
}
|
|
295
308
|
catch (error) {
|
|
@@ -299,7 +312,7 @@ let LdapService = class LdapService {
|
|
|
299
312
|
const syncHistory = await (0, helpers_ee_1.saveLdapSynchronization)({
|
|
300
313
|
startedAt,
|
|
301
314
|
endedAt,
|
|
302
|
-
created:
|
|
315
|
+
created: processableUsersToCreate.length,
|
|
303
316
|
updated: filteredUsersToUpdate.length,
|
|
304
317
|
disabled: usersToDisable.length,
|
|
305
318
|
scanned: adUsers.length,
|
|
@@ -310,7 +323,7 @@ let LdapService = class LdapService {
|
|
|
310
323
|
this.eventService.emit('ldap-general-sync-finished', {
|
|
311
324
|
type: !this.syncTimer ? 'scheduled' : `manual_${mode}`,
|
|
312
325
|
succeeded: status === 'success',
|
|
313
|
-
usersSynced:
|
|
326
|
+
usersSynced: processableUsersToCreate.length + filteredUsersToUpdate.length + usersToDisable.length,
|
|
314
327
|
error: errorMessage,
|
|
315
328
|
});
|
|
316
329
|
if (status === 'success') {
|
|
@@ -352,6 +365,27 @@ let LdapService = class LdapService {
|
|
|
352
365
|
return true;
|
|
353
366
|
});
|
|
354
367
|
}
|
|
368
|
+
async filterExistingAccounts(usersToCreate) {
|
|
369
|
+
if (usersToCreate.length === 0)
|
|
370
|
+
return usersToCreate;
|
|
371
|
+
const userRepository = di_1.Container.get(db_1.UserRepository);
|
|
372
|
+
const existingEmails = new Set();
|
|
373
|
+
for (const emails of (0, db_1.chunkIds)(usersToCreate.map(([, user]) => user.email))) {
|
|
374
|
+
const existingUsers = await userRepository.findManyByEmail(emails);
|
|
375
|
+
for (const user of existingUsers)
|
|
376
|
+
existingEmails.add(user.email);
|
|
377
|
+
}
|
|
378
|
+
return usersToCreate.filter(([ldapId, user]) => {
|
|
379
|
+
if (existingEmails.has(user.email)) {
|
|
380
|
+
this.logger.warn('LDAP sync skipped entry: email matches an existing account', {
|
|
381
|
+
email: user.email,
|
|
382
|
+
ldapId,
|
|
383
|
+
});
|
|
384
|
+
return false;
|
|
385
|
+
}
|
|
386
|
+
return true;
|
|
387
|
+
});
|
|
388
|
+
}
|
|
355
389
|
getUsersToCreate(remoteAdUsers, localLdapIds) {
|
|
356
390
|
return remoteAdUsers
|
|
357
391
|
.filter((adUser) => !localLdapIds.includes(adUser[this.config.ldapIdAttribute]))
|
|
@@ -393,6 +427,13 @@ let LdapService = class LdapService {
|
|
|
393
427
|
}
|
|
394
428
|
const emailUser = await (0, helpers_ee_1.getUserByEmail)(emailAttributeValue);
|
|
395
429
|
if (emailUser && emailUser.email === emailAttributeValue) {
|
|
430
|
+
if (!this.config.linkExistingAccountsByEmail) {
|
|
431
|
+
this.logger.warn('LDAP login blocked: email matches an existing account', {
|
|
432
|
+
email: emailAttributeValue,
|
|
433
|
+
ldapId,
|
|
434
|
+
});
|
|
435
|
+
return undefined;
|
|
436
|
+
}
|
|
396
437
|
const identity = await (0, helpers_ee_1.createLdapAuthIdentity)(emailUser, ldapId);
|
|
397
438
|
await (0, helpers_ee_1.updateLdapUserOnLocalDb)(identity, ldapAttributesValues);
|
|
398
439
|
}
|