n8n 2.2.2 → 2.3.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/commands/import/workflow.js +21 -14
- package/dist/commands/import/workflow.js.map +1 -1
- package/dist/commands/start.js +4 -2
- package/dist/commands/start.js.map +1 -1
- package/dist/commands/webhook.js +2 -1
- package/dist/commands/webhook.js.map +1 -1
- package/dist/commands/worker.js +2 -1
- package/dist/commands/worker.js.map +1 -1
- package/dist/controllers/e2e.controller.d.ts +1 -0
- package/dist/controllers/e2e.controller.js +10 -2
- package/dist/controllers/e2e.controller.js.map +1 -1
- package/dist/credentials/credentials.service.d.ts +1 -1
- package/dist/credentials/credentials.service.js +2 -2
- package/dist/credentials/credentials.service.js.map +1 -1
- package/dist/executions/execution.service.d.ts +1 -0
- package/dist/executions/execution.service.js +18 -1
- package/dist/executions/execution.service.js.map +1 -1
- package/dist/executions/execution.types.d.ts +4 -0
- package/dist/executions/executions.controller.d.ts +3 -0
- package/dist/executions/executions.controller.js +13 -0
- package/dist/executions/executions.controller.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub-agent.repository.js +16 -21
- 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-credentials.service.d.ts +11 -15
- package/dist/modules/chat-hub/chat-hub-credentials.service.js +26 -27
- package/dist/modules/chat-hub/chat-hub-credentials.service.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub.service.js +64 -36
- package/dist/modules/chat-hub/chat-hub.service.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub.types.d.ts +2 -0
- package/dist/modules/chat-hub/chat-hub.types.js.map +1 -1
- package/dist/modules/chat-hub/chat-message.repository.js +14 -18
- package/dist/modules/chat-hub/chat-message.repository.js.map +1 -1
- package/dist/modules/chat-hub/chat-session.repository.js +26 -33
- package/dist/modules/chat-hub/chat-session.repository.js.map +1 -1
- package/dist/modules/data-table/data-table-column.repository.js +7 -8
- package/dist/modules/data-table/data-table-column.repository.js.map +1 -1
- package/dist/modules/data-table/data-table-rows.repository.js +21 -25
- package/dist/modules/data-table/data-table-rows.repository.js.map +1 -1
- package/dist/modules/external-secrets.ee/external-secrets.service.ee.js +9 -2
- package/dist/modules/external-secrets.ee/external-secrets.service.ee.js.map +1 -1
- package/dist/modules/insights/insights-compaction.service.js +2 -1
- package/dist/modules/insights/insights-compaction.service.js.map +1 -1
- package/dist/oauth/oauth.service.d.ts +8 -4
- package/dist/oauth/oauth.service.js +20 -17
- package/dist/oauth/oauth.service.js.map +1 -1
- package/dist/oauth/types.d.ts +2 -1
- package/dist/oauth/types.js.map +1 -1
- package/dist/public-api/types.d.ts +10 -0
- package/dist/public-api/v1/handlers/credentials/credentials.handler.d.ts +3 -0
- package/dist/public-api/v1/handlers/credentials/credentials.handler.js +36 -0
- package/dist/public-api/v1/handlers/credentials/credentials.handler.js.map +1 -1
- package/dist/public-api/v1/handlers/credentials/credentials.middleware.d.ts +2 -0
- package/dist/public-api/v1/handlers/credentials/credentials.middleware.js +60 -10
- package/dist/public-api/v1/handlers/credentials/credentials.middleware.js.map +1 -1
- package/dist/public-api/v1/handlers/credentials/credentials.service.d.ts +11 -1
- package/dist/public-api/v1/handlers/credentials/credentials.service.js +62 -0
- package/dist/public-api/v1/handlers/credentials/credentials.service.js.map +1 -1
- package/dist/public-api/v1/openapi.yml +65 -0
- package/dist/scaling/pubsub/publisher.service.d.ts +5 -2
- package/dist/scaling/pubsub/publisher.service.js +10 -5
- package/dist/scaling/pubsub/publisher.service.js.map +1 -1
- package/dist/scaling/pubsub/subscriber.service.d.ts +8 -4
- package/dist/scaling/pubsub/subscriber.service.js +14 -2
- package/dist/scaling/pubsub/subscriber.service.js.map +1 -1
- package/dist/services/ai-workflow-builder.service.js +1 -0
- package/dist/services/ai-workflow-builder.service.js.map +1 -1
- package/dist/services/ai.service.d.ts +3 -1
- package/dist/services/ai.service.js +6 -2
- package/dist/services/ai.service.js.map +1 -1
- package/dist/services/frontend.service.d.ts +1 -0
- package/dist/services/frontend.service.js +2 -3
- package/dist/services/frontend.service.js.map +1 -1
- package/dist/services/pruning/executions-pruning.service.js +3 -3
- package/dist/services/pruning/executions-pruning.service.js.map +1 -1
- package/dist/services/pruning/workflow-history-compaction.service.d.ts +21 -0
- package/dist/services/pruning/workflow-history-compaction.service.js +144 -0
- package/dist/services/pruning/workflow-history-compaction.service.js.map +1 -0
- package/dist/task-runners/task-runner-module.js +13 -15
- package/dist/task-runners/task-runner-module.js.map +1 -1
- package/dist/utils/cors.util.d.ts +2 -0
- package/dist/utils/cors.util.js +18 -0
- package/dist/utils/cors.util.js.map +1 -0
- package/dist/webhooks/waiting-forms.js +3 -3
- package/dist/webhooks/waiting-forms.js.map +1 -1
- package/dist/webhooks/waiting-webhooks.js +2 -0
- package/dist/webhooks/waiting-webhooks.js.map +1 -1
- package/dist/workflows/workflow.service.ee.js +6 -5
- package/dist/workflows/workflow.service.ee.js.map +1 -1
- package/dist/workflows/workflows.controller.d.ts +1 -1
- package/dist/workflows/workflows.controller.js +1 -4
- package/dist/workflows/workflows.controller.js.map +1 -1
- package/package.json +18 -18
|
@@ -15,6 +15,7 @@ const di_1 = require("@n8n/di");
|
|
|
15
15
|
const insights_by_period_repository_1 = require("./database/repositories/insights-by-period.repository");
|
|
16
16
|
const insights_raw_repository_1 = require("./database/repositories/insights-raw.repository");
|
|
17
17
|
const insights_config_1 = require("./insights.config");
|
|
18
|
+
const constants_1 = require("@n8n/constants");
|
|
18
19
|
let InsightsCompactionService = class InsightsCompactionService {
|
|
19
20
|
constructor(insightsByPeriodRepository, insightsRawRepository, insightsConfig, logger) {
|
|
20
21
|
this.insightsByPeriodRepository = insightsByPeriodRepository;
|
|
@@ -25,7 +26,7 @@ let InsightsCompactionService = class InsightsCompactionService {
|
|
|
25
26
|
}
|
|
26
27
|
startCompactionTimer() {
|
|
27
28
|
this.stopCompactionTimer();
|
|
28
|
-
this.compactInsightsTimer = setInterval(async () => await this.compactInsights(), this.insightsConfig.compactionIntervalMinutes *
|
|
29
|
+
this.compactInsightsTimer = setInterval(async () => await this.compactInsights(), this.insightsConfig.compactionIntervalMinutes * constants_1.Time.minutes.toMilliseconds);
|
|
29
30
|
this.logger.debug('Started compaction timer');
|
|
30
31
|
}
|
|
31
32
|
stopCompactionTimer() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"insights-compaction.service.js","sourceRoot":"","sources":["../../../src/modules/insights/insights-compaction.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAA6C;AAC7C,gCAAkC;AAElC,yGAAmG;AACnG,6FAAwF;AACxF,uDAAmD;
|
|
1
|
+
{"version":3,"file":"insights-compaction.service.js","sourceRoot":"","sources":["../../../src/modules/insights/insights-compaction.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,13 +35,17 @@ export declare class OauthService {
|
|
|
35
35
|
protected applyDefaultsAndOverwrites<T>(credential: ICredentialsDb, decryptedData: ICredentialDataDecryptedObject, additionalData: IWorkflowExecuteAdditionalData): Promise<T>;
|
|
36
36
|
encryptAndSaveData(credential: ICredentialsDb, toUpdate: ICredentialDataDecryptedObject, toDelete?: string[]): Promise<void>;
|
|
37
37
|
protected getCredentialWithoutUser(credentialId: string): Promise<CredentialsEntity | null>;
|
|
38
|
-
createCsrfState(data: CreateCsrfStateData): [string, string
|
|
39
|
-
|
|
40
|
-
protected decodeCsrfState(encodedState: string, req: AuthenticatedRequest): CsrfState;
|
|
38
|
+
createCsrfState(data: CreateCsrfStateData): [string, string];
|
|
39
|
+
protected decodeCsrfState(encodedState: string, req: AuthenticatedRequest): CsrfState & CreateCsrfStateData;
|
|
41
40
|
protected verifyCsrfState(decrypted: ICredentialDataDecryptedObject & {
|
|
42
41
|
csrfSecret?: string;
|
|
43
42
|
}, state: CsrfState): boolean;
|
|
44
|
-
resolveCredential<T>(req: OAuthRequest.OAuth1Credential.Callback | OAuthRequest.OAuth2Credential.Callback): Promise<[
|
|
43
|
+
resolveCredential<T>(req: OAuthRequest.OAuth1Credential.Callback | OAuthRequest.OAuth2Credential.Callback): Promise<[
|
|
44
|
+
CredentialsEntity,
|
|
45
|
+
ICredentialDataDecryptedObject,
|
|
46
|
+
T,
|
|
47
|
+
CsrfState & CreateCsrfStateData
|
|
48
|
+
]>;
|
|
45
49
|
renderCallbackError(res: Response, message: string, reason?: string): void;
|
|
46
50
|
getOAuthCredentials<T>(credential: CredentialsEntity): Promise<T>;
|
|
47
51
|
generateAOauth2AuthUri(credential: CredentialsEntity, csrfData: CreateCsrfStateData): Promise<string>;
|
|
@@ -139,32 +139,36 @@ let OauthService = class OauthService {
|
|
|
139
139
|
const state = {
|
|
140
140
|
token: token.create(csrfSecret),
|
|
141
141
|
createdAt: Date.now(),
|
|
142
|
-
|
|
142
|
+
data: this.cipher.encrypt(JSON.stringify(data)),
|
|
143
143
|
};
|
|
144
144
|
const base64State = Buffer.from(JSON.stringify(state)).toString('base64');
|
|
145
|
-
|
|
146
|
-
return [csrfSecret, encryptedState, base64State];
|
|
147
|
-
}
|
|
148
|
-
encryptBase64EncodedState(base64EncodedState) {
|
|
149
|
-
const state = Buffer.from(base64EncodedState, 'base64').toString();
|
|
150
|
-
return this.cipher.encrypt(state);
|
|
145
|
+
return [csrfSecret, base64State];
|
|
151
146
|
}
|
|
152
147
|
decodeCsrfState(encodedState, req) {
|
|
153
148
|
const errorMessage = 'Invalid state format';
|
|
154
|
-
const
|
|
155
|
-
const decoded = (0, n8n_workflow_1.jsonParse)(
|
|
149
|
+
const decodedState = Buffer.from(encodedState, 'base64').toString();
|
|
150
|
+
const decoded = (0, n8n_workflow_1.jsonParse)(decodedState, {
|
|
151
|
+
errorMessage,
|
|
152
|
+
});
|
|
153
|
+
const decryptedState = (0, n8n_workflow_1.jsonParse)(this.cipher.decrypt(decoded.data), {
|
|
156
154
|
errorMessage,
|
|
157
155
|
});
|
|
158
|
-
if (typeof
|
|
156
|
+
if (typeof decryptedState.cid !== 'string' || typeof decoded.token !== 'string') {
|
|
159
157
|
throw new n8n_workflow_1.UnexpectedError(errorMessage);
|
|
160
158
|
}
|
|
161
|
-
if (
|
|
162
|
-
return
|
|
159
|
+
if (decryptedState.origin === 'dynamic-credential') {
|
|
160
|
+
return {
|
|
161
|
+
...decoded,
|
|
162
|
+
...decryptedState,
|
|
163
|
+
};
|
|
163
164
|
}
|
|
164
|
-
if (!exports.skipAuthOnOAuthCallback &&
|
|
165
|
+
if (!exports.skipAuthOnOAuthCallback && decryptedState.userId !== req.user?.id) {
|
|
165
166
|
throw new auth_error_1.AuthError('Unauthorized');
|
|
166
167
|
}
|
|
167
|
-
return
|
|
168
|
+
return {
|
|
169
|
+
...decoded,
|
|
170
|
+
...decryptedState,
|
|
171
|
+
};
|
|
168
172
|
}
|
|
169
173
|
verifyCsrfState(decrypted, state) {
|
|
170
174
|
const token = new csrf_1.default();
|
|
@@ -252,16 +256,15 @@ let OauthService = class OauthService {
|
|
|
252
256
|
toUpdate.clientSecret = client_secret;
|
|
253
257
|
}
|
|
254
258
|
}
|
|
255
|
-
const [csrfSecret,
|
|
259
|
+
const [csrfSecret, state] = this.createCsrfState(csrfData);
|
|
256
260
|
const oAuthOptions = {
|
|
257
261
|
...this.convertCredentialToOptions(oauthCredentials),
|
|
258
|
-
state
|
|
262
|
+
state,
|
|
259
263
|
};
|
|
260
264
|
if (oauthCredentials.authQueryParameters) {
|
|
261
265
|
oAuthOptions.query = qs.parse(oauthCredentials.authQueryParameters);
|
|
262
266
|
}
|
|
263
267
|
await this.externalHooks.run('oauth2.authenticate', [oAuthOptions]);
|
|
264
|
-
oAuthOptions.state = this.encryptBase64EncodedState(oAuthOptions.state);
|
|
265
268
|
toUpdate.csrfSecret = csrfSecret;
|
|
266
269
|
if (oauthCredentials.grantType === 'pkce') {
|
|
267
270
|
const { code_verifier, code_challenge } = await (0, pkce_challenge_1.default)();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth.service.js","sourceRoot":"","sources":["../../src/oauth/oauth.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"oauth.service.js","sourceRoot":"","sources":["../../src/oauth/oauth.service.ts"],"names":[],"mappings":"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"}
|
package/dist/oauth/types.d.ts
CHANGED
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
export type CsrfStateRequired = {
|
|
2
2
|
token: string;
|
|
3
3
|
createdAt: number;
|
|
4
|
+
data: string;
|
|
4
5
|
};
|
|
5
6
|
export type CreateCsrfStateData = {
|
|
6
7
|
cid: string;
|
|
7
8
|
origin: 'static-credential' | 'dynamic-credential';
|
|
8
9
|
[key: string]: unknown;
|
|
9
10
|
};
|
|
10
|
-
export type CsrfState = CsrfStateRequired
|
|
11
|
+
export type CsrfState = CsrfStateRequired;
|
|
11
12
|
export declare const MAX_CSRF_AGE: number;
|
|
12
13
|
export declare const enum OauthVersion {
|
|
13
14
|
V1 = 1,
|
package/dist/oauth/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/oauth/types.ts"],"names":[],"mappings":";;;AAAA,8CAAsC;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/oauth/types.ts"],"names":[],"mappings":";;;AAAA,8CAAsC;AAmBzB,QAAA,YAAY,GAAG,CAAC,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,CAAC;AAE5D,IAAkB,YAGjB;AAHD,WAAkB,YAAY;IAC7B,2CAAM,CAAA;IACN,2CAAM,CAAA;AACP,CAAC,EAHiB,YAAY,4BAAZ,YAAY,QAG7B;AAWY,QAAA,YAAY,GAAG;IAC3B,aAAa,EAAE,QAAQ;IACvB,aAAa,EAAE,QAAQ;IACvB,WAAW,EAAE,MAAM;CACV,CAAC"}
|
|
@@ -143,6 +143,16 @@ export declare namespace CredentialRequest {
|
|
|
143
143
|
name: string;
|
|
144
144
|
data: ICredentialDataDecryptedObject;
|
|
145
145
|
}, {}>;
|
|
146
|
+
type Update = AuthenticatedRequest<{
|
|
147
|
+
id: string;
|
|
148
|
+
}, {}, {
|
|
149
|
+
type?: string;
|
|
150
|
+
name?: string;
|
|
151
|
+
data?: ICredentialDataDecryptedObject;
|
|
152
|
+
isGlobal?: boolean;
|
|
153
|
+
isResolvable?: boolean;
|
|
154
|
+
isPartialData?: boolean;
|
|
155
|
+
}, {}>;
|
|
146
156
|
type Delete = AuthenticatedRequest<{
|
|
147
157
|
id: string;
|
|
148
158
|
}, {}, {}, Record<string, string>>;
|
|
@@ -3,6 +3,9 @@ import type express from 'express';
|
|
|
3
3
|
import type { CredentialTypeRequest, CredentialRequest } from '../../../types';
|
|
4
4
|
declare const _default: {
|
|
5
5
|
createCredential: (((_req: Request, _res: Response, next: express.NextFunction) => void) | ((req: express.Request, res: express.Response, next: express.NextFunction) => Promise<void>) | ((req: CredentialRequest.Create, res: express.Response, next: express.NextFunction) => express.Response | void) | ((req: CredentialRequest.Create, res: express.Response) => Promise<express.Response<Partial<CredentialsEntity>>>))[];
|
|
6
|
+
updateCredential: (((_req: Request, _res: Response, next: express.NextFunction) => void) | ((req: import("@n8n/db").AuthenticatedRequest<{
|
|
7
|
+
id?: string;
|
|
8
|
+
}>, res: express.Response, next: express.NextFunction) => Promise<express.Response | void>) | ((req: express.Request, res: express.Response, next: express.NextFunction) => Promise<void>) | ((req: CredentialRequest.Update, res: express.Response, next: express.NextFunction) => express.Response | void))[];
|
|
6
9
|
transferCredential: (((_req: Request, _res: Response, next: express.NextFunction) => void) | ((req: import("@n8n/db").AuthenticatedRequest<{
|
|
7
10
|
id?: string;
|
|
8
11
|
}>, res: express.Response, next: express.NextFunction) => Promise<express.Response | void>) | ((req: express.Request, res: express.Response, next: express.NextFunction) => Promise<void>))[];
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
const backend_common_1 = require("@n8n/backend-common");
|
|
2
3
|
const di_1 = require("@n8n/di");
|
|
4
|
+
const permissions_1 = require("@n8n/permissions");
|
|
3
5
|
const zod_1 = require("zod");
|
|
4
6
|
const credential_types_1 = require("../../../../credential-types");
|
|
5
7
|
const credentials_service_ee_1 = require("../../../../credentials/credentials.service.ee");
|
|
@@ -25,6 +27,40 @@ module.exports = {
|
|
|
25
27
|
}
|
|
26
28
|
},
|
|
27
29
|
],
|
|
30
|
+
updateCredential: [
|
|
31
|
+
credentials_middleware_1.validCredentialTypeForUpdate,
|
|
32
|
+
credentials_middleware_1.validCredentialsPropertiesForUpdate,
|
|
33
|
+
(0, global_middleware_1.apiKeyHasScope)('credential:update'),
|
|
34
|
+
(0, global_middleware_1.projectScope)('credential:update', 'credential'),
|
|
35
|
+
async (req, res) => {
|
|
36
|
+
const { id: credentialId } = req.params;
|
|
37
|
+
if (req.body.isGlobal !== undefined) {
|
|
38
|
+
if (!di_1.Container.get(backend_common_1.LicenseState).isSharingLicensed()) {
|
|
39
|
+
return res.status(403).json({ message: 'You are not licensed for sharing credentials' });
|
|
40
|
+
}
|
|
41
|
+
const canShareGlobally = (0, permissions_1.hasGlobalScope)(req.user, 'credential:shareGlobally');
|
|
42
|
+
if (!canShareGlobally) {
|
|
43
|
+
return res.status(403).json({
|
|
44
|
+
message: 'You do not have permission to change global sharing for credentials',
|
|
45
|
+
});
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
try {
|
|
49
|
+
const updatedCredential = await (0, credentials_service_1.updateCredential)(credentialId, req.body);
|
|
50
|
+
if (!updatedCredential) {
|
|
51
|
+
return res.status(404).json({ message: 'Credential not found' });
|
|
52
|
+
}
|
|
53
|
+
return res.json((0, credentials_service_1.sanitizeCredentials)(updatedCredential));
|
|
54
|
+
}
|
|
55
|
+
catch (error) {
|
|
56
|
+
if (error instanceof credentials_service_1.CredentialsIsNotUpdatableError) {
|
|
57
|
+
return res.status(400).json({ message: error.message });
|
|
58
|
+
}
|
|
59
|
+
const message = error instanceof Error ? error.message : 'Unknown error';
|
|
60
|
+
return res.status(500).json({ message });
|
|
61
|
+
}
|
|
62
|
+
},
|
|
63
|
+
],
|
|
28
64
|
transferCredential: [
|
|
29
65
|
(0, global_middleware_1.apiKeyHasScope)('credential:move'),
|
|
30
66
|
(0, global_middleware_1.projectScope)('credential:move', 'credential'),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credentials.handler.js","sourceRoot":"","sources":["../../../../../src/public-api/v1/handlers/credentials/credentials.handler.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"credentials.handler.js","sourceRoot":"","sources":["../../../../../src/public-api/v1/handlers/credentials/credentials.handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,3 +2,5 @@ import type express from 'express';
|
|
|
2
2
|
import type { CredentialRequest } from '../../../types';
|
|
3
3
|
export declare const validCredentialType: (req: CredentialRequest.Create, res: express.Response, next: express.NextFunction) => express.Response | void;
|
|
4
4
|
export declare const validCredentialsProperties: (req: CredentialRequest.Create, res: express.Response, next: express.NextFunction) => express.Response | void;
|
|
5
|
+
export declare const validCredentialTypeForUpdate: (req: CredentialRequest.Update, res: express.Response, next: express.NextFunction) => express.Response | void;
|
|
6
|
+
export declare const validCredentialsPropertiesForUpdate: (req: CredentialRequest.Update, res: express.Response, next: express.NextFunction) => Promise<express.Response | void>;
|
|
@@ -1,11 +1,23 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.validCredentialsProperties = exports.validCredentialType = void 0;
|
|
3
|
+
exports.validCredentialsPropertiesForUpdate = exports.validCredentialTypeForUpdate = exports.validCredentialsProperties = exports.validCredentialType = void 0;
|
|
4
4
|
const di_1 = require("@n8n/di");
|
|
5
5
|
const jsonschema_1 = require("jsonschema");
|
|
6
6
|
const credential_types_1 = require("../../../../credential-types");
|
|
7
7
|
const credentials_helper_1 = require("../../../../credentials-helper");
|
|
8
8
|
const credentials_service_1 = require("./credentials.service");
|
|
9
|
+
function validateCredentialData(credentialType, data, res) {
|
|
10
|
+
const properties = di_1.Container.get(credentials_helper_1.CredentialsHelper)
|
|
11
|
+
.getCredentialsProperties(credentialType)
|
|
12
|
+
.filter((property) => property.type !== 'hidden');
|
|
13
|
+
const schema = (0, credentials_service_1.toJsonSchema)(properties);
|
|
14
|
+
const { valid, errors } = (0, jsonschema_1.validate)(data, schema, { nestedErrors: true });
|
|
15
|
+
if (!valid) {
|
|
16
|
+
return res.status(400).json({
|
|
17
|
+
message: errors.map((error) => `request.body.data ${error.message}`).join(','),
|
|
18
|
+
});
|
|
19
|
+
}
|
|
20
|
+
}
|
|
9
21
|
const validCredentialType = (req, res, next) => {
|
|
10
22
|
try {
|
|
11
23
|
di_1.Container.get(credential_types_1.CredentialTypes).getByName(req.body.type);
|
|
@@ -18,17 +30,55 @@ const validCredentialType = (req, res, next) => {
|
|
|
18
30
|
exports.validCredentialType = validCredentialType;
|
|
19
31
|
const validCredentialsProperties = (req, res, next) => {
|
|
20
32
|
const { type, data } = req.body;
|
|
21
|
-
const
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
const schema = (0, credentials_service_1.toJsonSchema)(properties);
|
|
25
|
-
const { valid, errors } = (0, jsonschema_1.validate)(data, schema, { nestedErrors: true });
|
|
26
|
-
if (!valid) {
|
|
27
|
-
return res.status(400).json({
|
|
28
|
-
message: errors.map((error) => `request.body.data ${error.message}`).join(','),
|
|
29
|
-
});
|
|
33
|
+
const validationResult = validateCredentialData(type, data, res);
|
|
34
|
+
if (validationResult) {
|
|
35
|
+
return validationResult;
|
|
30
36
|
}
|
|
31
37
|
return next();
|
|
32
38
|
};
|
|
33
39
|
exports.validCredentialsProperties = validCredentialsProperties;
|
|
40
|
+
const validCredentialTypeForUpdate = (req, res, next) => {
|
|
41
|
+
const { type } = req.body;
|
|
42
|
+
if (type !== undefined) {
|
|
43
|
+
try {
|
|
44
|
+
di_1.Container.get(credential_types_1.CredentialTypes).getByName(type);
|
|
45
|
+
}
|
|
46
|
+
catch {
|
|
47
|
+
return res.status(400).json({ message: 'req.body.type is not a known type' });
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
return next();
|
|
51
|
+
};
|
|
52
|
+
exports.validCredentialTypeForUpdate = validCredentialTypeForUpdate;
|
|
53
|
+
const validCredentialsPropertiesForUpdate = async (req, res, next) => {
|
|
54
|
+
let { type } = req.body;
|
|
55
|
+
const { data } = req.body;
|
|
56
|
+
const { id: credentialId } = req.params;
|
|
57
|
+
if (data !== undefined) {
|
|
58
|
+
if (type === undefined) {
|
|
59
|
+
const existingCredential = await (0, credentials_service_1.getCredentials)(credentialId);
|
|
60
|
+
if (!existingCredential) {
|
|
61
|
+
return res.status(404).json({ message: 'Credential not found' });
|
|
62
|
+
}
|
|
63
|
+
type = existingCredential.type;
|
|
64
|
+
}
|
|
65
|
+
const validationResult = validateCredentialData(type, data, res);
|
|
66
|
+
if (validationResult) {
|
|
67
|
+
return validationResult;
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
if (type !== undefined && data === undefined) {
|
|
71
|
+
const existingCredential = await (0, credentials_service_1.getCredentials)(credentialId);
|
|
72
|
+
if (!existingCredential) {
|
|
73
|
+
return res.status(404).json({ message: 'Credential not found' });
|
|
74
|
+
}
|
|
75
|
+
if (existingCredential.type !== type) {
|
|
76
|
+
return res.status(400).json({
|
|
77
|
+
message: 'req.body.data is required when changing credential type. The existing data cannot be used with the new type.',
|
|
78
|
+
});
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
return next();
|
|
82
|
+
};
|
|
83
|
+
exports.validCredentialsPropertiesForUpdate = validCredentialsPropertiesForUpdate;
|
|
34
84
|
//# sourceMappingURL=credentials.middleware.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credentials.middleware.js","sourceRoot":"","sources":["../../../../../src/public-api/v1/handlers/credentials/credentials.middleware.ts"],"names":[],"mappings":";;;AAEA,gCAAoC;AAEpC,2CAAsC;
|
|
1
|
+
{"version":3,"file":"credentials.middleware.js","sourceRoot":"","sources":["../../../../../src/public-api/v1/handlers/credentials/credentials.middleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,21 @@
|
|
|
1
1
|
import type { User, ICredentialsDb } from '@n8n/db';
|
|
2
2
|
import { CredentialsEntity, SharedCredentials } from '@n8n/db';
|
|
3
|
-
import type
|
|
3
|
+
import { BaseError, type ICredentialDataDecryptedObject, type IDataObject, type INodeProperties } from 'n8n-workflow';
|
|
4
4
|
import type { CredentialRequest } from '../../../../requests';
|
|
5
|
+
export declare class CredentialsIsNotUpdatableError extends BaseError {
|
|
6
|
+
}
|
|
5
7
|
export declare function getCredentials(credentialId: string): Promise<ICredentialsDb | null>;
|
|
6
8
|
export declare function getSharedCredentials(userId: string, credentialId: string): Promise<SharedCredentials | null>;
|
|
7
9
|
export declare function createCredential(properties: CredentialRequest.CredentialProperties): Promise<CredentialsEntity>;
|
|
8
10
|
export declare function saveCredential(credential: CredentialsEntity, user: User, encryptedData: ICredentialsDb): Promise<CredentialsEntity>;
|
|
11
|
+
export declare function updateCredential(credentialId: string, updateData: {
|
|
12
|
+
type?: string;
|
|
13
|
+
name?: string;
|
|
14
|
+
data?: ICredentialDataDecryptedObject;
|
|
15
|
+
isGlobal?: boolean;
|
|
16
|
+
isResolvable?: boolean;
|
|
17
|
+
isPartialData?: boolean;
|
|
18
|
+
}): Promise<ICredentialsDb | null>;
|
|
9
19
|
export declare function removeCredential(user: User, credentials: CredentialsEntity): Promise<ICredentialsDb>;
|
|
10
20
|
export declare function encryptCredential(credential: CredentialsEntity): Promise<ICredentialsDb>;
|
|
11
21
|
export declare function sanitizeCredentials(credentials: CredentialsEntity): Partial<CredentialsEntity>;
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.CredentialsIsNotUpdatableError = void 0;
|
|
3
4
|
exports.getCredentials = getCredentials;
|
|
4
5
|
exports.getSharedCredentials = getSharedCredentials;
|
|
5
6
|
exports.createCredential = createCredential;
|
|
6
7
|
exports.saveCredential = saveCredential;
|
|
8
|
+
exports.updateCredential = updateCredential;
|
|
7
9
|
exports.removeCredential = removeCredential;
|
|
8
10
|
exports.encryptCredential = encryptCredential;
|
|
9
11
|
exports.sanitizeCredentials = sanitizeCredentials;
|
|
@@ -11,8 +13,13 @@ exports.toJsonSchema = toJsonSchema;
|
|
|
11
13
|
const db_1 = require("@n8n/db");
|
|
12
14
|
const di_1 = require("@n8n/di");
|
|
13
15
|
const n8n_core_1 = require("n8n-core");
|
|
16
|
+
const n8n_workflow_1 = require("n8n-workflow");
|
|
17
|
+
const credentials_service_1 = require("../../../../credentials/credentials.service");
|
|
14
18
|
const event_service_1 = require("../../../../events/event.service");
|
|
15
19
|
const external_hooks_1 = require("../../../../external-hooks");
|
|
20
|
+
class CredentialsIsNotUpdatableError extends n8n_workflow_1.BaseError {
|
|
21
|
+
}
|
|
22
|
+
exports.CredentialsIsNotUpdatableError = CredentialsIsNotUpdatableError;
|
|
16
23
|
async function getCredentials(credentialId) {
|
|
17
24
|
return await di_1.Container.get(db_1.CredentialsRepository).findOneBy({ id: credentialId });
|
|
18
25
|
}
|
|
@@ -58,6 +65,61 @@ async function saveCredential(credential, user, encryptedData) {
|
|
|
58
65
|
});
|
|
59
66
|
return result;
|
|
60
67
|
}
|
|
68
|
+
async function updateCredential(credentialId, updateData) {
|
|
69
|
+
const existingCredential = await getCredentials(credentialId);
|
|
70
|
+
if (!existingCredential) {
|
|
71
|
+
return null;
|
|
72
|
+
}
|
|
73
|
+
if (existingCredential.isManaged) {
|
|
74
|
+
throw new CredentialsIsNotUpdatableError('Managed credentials cannot be updated.');
|
|
75
|
+
}
|
|
76
|
+
const credentialData = {};
|
|
77
|
+
if (updateData.name !== undefined) {
|
|
78
|
+
credentialData.name = updateData.name;
|
|
79
|
+
}
|
|
80
|
+
if (updateData.type !== undefined) {
|
|
81
|
+
credentialData.type = updateData.type;
|
|
82
|
+
}
|
|
83
|
+
if (updateData.data !== undefined) {
|
|
84
|
+
if (updateData.data?.oauthTokenData) {
|
|
85
|
+
delete updateData.data.oauthTokenData;
|
|
86
|
+
}
|
|
87
|
+
const credentialsService = di_1.Container.get(credentials_service_1.CredentialsService);
|
|
88
|
+
const decryptedData = credentialsService.decrypt(existingCredential, true);
|
|
89
|
+
let dataToEncrypt;
|
|
90
|
+
if (updateData.isPartialData === true) {
|
|
91
|
+
const mergedData = {
|
|
92
|
+
...decryptedData,
|
|
93
|
+
...updateData.data,
|
|
94
|
+
};
|
|
95
|
+
dataToEncrypt = credentialsService.unredact(mergedData, decryptedData);
|
|
96
|
+
}
|
|
97
|
+
else {
|
|
98
|
+
dataToEncrypt = updateData.data;
|
|
99
|
+
}
|
|
100
|
+
if (decryptedData.oauthTokenData) {
|
|
101
|
+
dataToEncrypt.oauthTokenData = decryptedData.oauthTokenData;
|
|
102
|
+
}
|
|
103
|
+
const newCredential = new db_1.CredentialsEntity();
|
|
104
|
+
Object.assign(newCredential, {
|
|
105
|
+
id: credentialId,
|
|
106
|
+
name: updateData.name ?? existingCredential.name,
|
|
107
|
+
type: updateData.type ?? existingCredential.type,
|
|
108
|
+
data: dataToEncrypt,
|
|
109
|
+
});
|
|
110
|
+
const encryptedData = await encryptCredential(newCredential);
|
|
111
|
+
Object.assign(credentialData, encryptedData);
|
|
112
|
+
}
|
|
113
|
+
if (updateData.isResolvable !== undefined) {
|
|
114
|
+
credentialData.isResolvable = updateData.isResolvable;
|
|
115
|
+
}
|
|
116
|
+
if (updateData.isGlobal !== undefined) {
|
|
117
|
+
credentialData.isGlobal = updateData.isGlobal;
|
|
118
|
+
}
|
|
119
|
+
credentialData.updatedAt = new Date();
|
|
120
|
+
await di_1.Container.get(db_1.CredentialsRepository).update(credentialId, credentialData);
|
|
121
|
+
return await getCredentials(credentialId);
|
|
122
|
+
}
|
|
61
123
|
async function removeCredential(user, credentials) {
|
|
62
124
|
await di_1.Container.get(external_hooks_1.ExternalHooks).run('credentials.delete', [credentials.id]);
|
|
63
125
|
di_1.Container.get(event_service_1.EventService).emit('credentials-deleted', {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credentials.service.js","sourceRoot":"","sources":["../../../../../src/public-api/v1/handlers/credentials/credentials.service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"credentials.service.js","sourceRoot":"","sources":["../../../../../src/public-api/v1/handlers/credentials/credentials.service.ts"],"names":[],"mappings":"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"}
|