n8n 1.77.3 → 1.79.0

package/dist/controllers/api-keys.controller.js

@@ -8,10 +8,17 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApiKeysController = exports.isApiEnabledMiddleware = void 0;
+const api_types_1 = require("@n8n/api-types");
+const api_key_repository_1 = require("../databases/repositories/api-key.repository");
 const decorators_1 = require("../decorators");
+const bad_request_error_1 = require("../errors/response-errors/bad-request.error");
 const event_service_1 = require("../events/event.service");
+const license_1 = require("../license");
 const public_api_1 = require("../public-api");
 const public_api_key_service_1 = require("../services/public-api-key.service");
 const isApiEnabledMiddleware = (_, res, next) => {
@@ -24,30 +31,52 @@ const isApiEnabledMiddleware = (_, res, next) => {
 };
 exports.isApiEnabledMiddleware = isApiEnabledMiddleware;
 let ApiKeysController = class ApiKeysController {
-    constructor(eventService, publicApiKeyService) {
+    constructor(eventService, publicApiKeyService, apiKeysRepository, license) {
         this.eventService = eventService;
         this.publicApiKeyService = publicApiKeyService;
+        this.apiKeysRepository = apiKeysRepository;
+        this.license = license;
     }
-    async createAPIKey(req) {
-        const newApiKey = await this.publicApiKeyService.createPublicApiKeyForUser(req.user);
+    async createAPIKey(req, _res, { label, expiresAt }) {
+        const currentNumberOfApiKeys = await this.apiKeysRepository.countBy({ userId: req.user.id });
+        if (currentNumberOfApiKeys >= this.license.getApiKeysPerUserLimit()) {
+            throw new bad_request_error_1.BadRequestError('You have reached the maximum number of API keys allowed.');
+        }
+        const newApiKey = await this.publicApiKeyService.createPublicApiKeyForUser(req.user, {
+            label,
+            expiresAt,
+        });
         this.eventService.emit('public-api-key-created', { user: req.user, publicApi: false });
-        return newApiKey;
+        return {
+            ...newApiKey,
+            apiKey: this.publicApiKeyService.redactApiKey(newApiKey.apiKey),
+            rawApiKey: newApiKey.apiKey,
+            expiresAt,
+        };
     }
     async getAPIKeys(req) {
         const apiKeys = await this.publicApiKeyService.getRedactedApiKeysForUser(req.user);
         return apiKeys;
     }
-    async deleteAPIKey(req) {
-        await this.publicApiKeyService.deleteApiKeyForUser(req.user, req.params.id);
+    async deleteAPIKey(req, _res, apiKeyId) {
+        await this.publicApiKeyService.deleteApiKeyForUser(req.user, apiKeyId);
         this.eventService.emit('public-api-key-deleted', { user: req.user, publicApi: false });
         return { success: true };
     }
+    async updateAPIKey(req, _res, apiKeyId, { label }) {
+        await this.publicApiKeyService.updateApiKeyForUser(req.user, apiKeyId, {
+            label,
+        });
+        return { success: true };
+    }
 };
 exports.ApiKeysController = ApiKeysController;
 __decorate([
     (0, decorators_1.Post)('/', { middlewares: [exports.isApiEnabledMiddleware] }),
+    __param(2, decorators_1.Body),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
+    __metadata("design:paramtypes", [Object, Response,
+        api_types_1.CreateApiKeyRequestDto]),
     __metadata("design:returntype", Promise)
 ], ApiKeysController.prototype, "createAPIKey", null);
 __decorate([
@@ -58,13 +87,24 @@ __decorate([
 ], ApiKeysController.prototype, "getAPIKeys", null);
 __decorate([
     (0, decorators_1.Delete)('/:id', { middlewares: [exports.isApiEnabledMiddleware] }),
+    __param(2, (0, decorators_1.Param)('id')),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
+    __metadata("design:paramtypes", [Object, Response, String]),
     __metadata("design:returntype", Promise)
 ], ApiKeysController.prototype, "deleteAPIKey", null);
+__decorate([
+    (0, decorators_1.Patch)('/:id', { middlewares: [exports.isApiEnabledMiddleware] }),
+    __param(2, (0, decorators_1.Param)('id')),
+    __param(3, decorators_1.Body),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Response, String, api_types_1.UpdateApiKeyRequestDto]),
+    __metadata("design:returntype", Promise)
+], ApiKeysController.prototype, "updateAPIKey", null);
 exports.ApiKeysController = ApiKeysController = __decorate([
     (0, decorators_1.RestController)('/api-keys'),
     __metadata("design:paramtypes", [event_service_1.EventService,
-        public_api_key_service_1.PublicApiKeyService])
+        public_api_key_service_1.PublicApiKeyService,
+        api_key_repository_1.ApiKeyRepository,
+        license_1.License])
 ], ApiKeysController);
 //# sourceMappingURL=api-keys.controller.js.map

package/dist/controllers/api-keys.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"api-keys.controller.js","sourceRoot":"","sources":["../../src/controllers/api-keys.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,6CAAiE;AACjE,0DAAsD;AACtD,6CAA4C;AAE5C,8EAAwE;AAEjE,MAAM,sBAAsB,GAAmB,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;IACtE,IAAI,IAAA,yBAAY,GAAE,EAAE,CAAC;QACpB,IAAI,EAAE,CAAC;IACR,CAAC;SAAM,CAAC;QACP,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;IACvB,CAAC;AACF,CAAC,CAAC;AANW,QAAA,sBAAsB,0BAMjC;AAGK,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAC7B,YACkB,YAA0B,EAC1B,mBAAwC;QADxC,iBAAY,GAAZ,YAAY,CAAc;QAC1B,wBAAmB,GAAnB,mBAAmB,CAAqB;IACvD,CAAC;IAME,AAAN,KAAK,CAAC,YAAY,CAAC,GAAyB;QAC3C,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,yBAAyB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAErF,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,wBAAwB,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;QAEvF,OAAO,SAAS,CAAC;IAClB,CAAC;IAMK,AAAN,KAAK,CAAC,UAAU,CAAC,GAAyB;QACzC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,yBAAyB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACnF,OAAO,OAAO,CAAC;IAChB,CAAC;IAMK,AAAN,KAAK,CAAC,YAAY,CAAC,GAAgC;QAClD,MAAM,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE5E,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,wBAAwB,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;QAEvF,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC1B,CAAC;CACD,CAAA;AAtCY,8CAAiB;AAUvB;IADL,IAAA,iBAAI,EAAC,GAAG,EAAE,EAAE,WAAW,EAAE,CAAC,8BAAsB,CAAC,EAAE,CAAC;;;;qDAOpD;AAMK;IADL,IAAA,gBAAG,EAAC,GAAG,EAAE,EAAE,WAAW,EAAE,CAAC,8BAAsB,CAAC,EAAE,CAAC;;;;mDAInD;AAMK;IADL,IAAA,mBAAM,EAAC,MAAM,EAAE,EAAE,WAAW,EAAE,CAAC,8BAAsB,CAAC,EAAE,CAAC;;;;qDAOzD;4BArCW,iBAAiB;IAD7B,IAAA,2BAAc,EAAC,WAAW,CAAC;qCAGK,4BAAY;QACL,4CAAmB;GAH9C,iBAAiB,CAsC7B"}
+{"version":3,"file":"api-keys.controller.js","sourceRoot":"","sources":["../../src/controllers/api-keys.controller.ts"],"names":[],"mappings":"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"}

package/dist/controllers/oauth/abstract-oauth.controller.d.ts

@@ -30,9 +30,11 @@ export declare abstract class AbstractOAuthController {
     get baseUrl(): string;
     protected getCredential(req: OAuthRequest.OAuth2Credential.Auth): Promise<CredentialsEntity>;
     protected getAdditionalData(): Promise<IWorkflowExecuteAdditionalData>;
-    protected getDecryptedData(credential: ICredentialsDb, additionalData: IWorkflowExecuteAdditionalData): Promise<ICredentialDataDecryptedObject>;
+    protected getDecryptedDataForAuthUri(credential: ICredentialsDb, additionalData: IWorkflowExecuteAdditionalData): Promise<ICredentialDataDecryptedObject>;
+    protected getDecryptedDataForCallback(credential: ICredentialsDb, additionalData: IWorkflowExecuteAdditionalData): Promise<ICredentialDataDecryptedObject>;
+    private getDecryptedData;
     protected applyDefaultsAndOverwrites<T>(credential: ICredentialsDb, decryptedData: ICredentialDataDecryptedObject, additionalData: IWorkflowExecuteAdditionalData): T;
-    protected encryptAndSaveData(credential: ICredentialsDb, decryptedData: ICredentialDataDecryptedObject): Promise<void>;
+    protected encryptAndSaveData(credential: ICredentialsDb, toUpdate: ICredentialDataDecryptedObject, toDelete?: string[]): Promise<void>;
     protected getCredentialWithoutUser(credentialId: string): Promise<ICredentialsDb | null>;
     createCsrfState(credentialsId: string, userId?: string): [string, string];
     protected decodeCsrfState(encodedState: string, req: AuthenticatedRequest): CsrfStateParam;

package/dist/controllers/oauth/abstract-oauth.controller.js

@@ -92,15 +92,21 @@ let AbstractOAuthController = class AbstractOAuthController {
     async getAdditionalData() {
         return await WorkflowExecuteAdditionalData.getBase();
     }
-    async getDecryptedData(credential, additionalData) {
-        return await this.credentialsHelper.getDecrypted(additionalData, credential, credential.type, 'internal', undefined, true);
+    async getDecryptedDataForAuthUri(credential, additionalData) {
+        return await this.getDecryptedData(credential, additionalData, false);
+    }
+    async getDecryptedDataForCallback(credential, additionalData) {
+        return await this.getDecryptedData(credential, additionalData, true);
+    }
+    async getDecryptedData(credential, additionalData, raw) {
+        return await this.credentialsHelper.getDecrypted(additionalData, credential, credential.type, 'internal', undefined, raw);
     }
     applyDefaultsAndOverwrites(credential, decryptedData, additionalData) {
         return this.credentialsHelper.applyDefaultsAndOverwrites(additionalData, decryptedData, credential.type, 'internal');
     }
-    async encryptAndSaveData(credential, decryptedData) {
-        const credentials = new n8n_core_1.Credentials(credential, credential.type);
-        credentials.setData(decryptedData);
+    async encryptAndSaveData(credential, toUpdate, toDelete = []) {
+        const credentials = new n8n_core_1.Credentials(credential, credential.type, credential.data);
+        credentials.updateData(toUpdate, toDelete);
         await this.credentialsRepository.update(credential.id, {
             ...credentials.getDataToSave(),
             updatedAt: new Date(),
@@ -147,7 +153,7 @@ let AbstractOAuthController = class AbstractOAuthController {
             throw new n8n_workflow_1.ApplicationError('OAuth callback failed because of insufficient permissions');
         }
         const additionalData = await this.getAdditionalData();
-        const decryptedDataOriginal = await this.getDecryptedData(credential, additionalData);
+        const decryptedDataOriginal = await this.getDecryptedDataForCallback(credential, additionalData);
         const oauthCredentials = this.applyDefaultsAndOverwrites(credential, decryptedDataOriginal, additionalData);
         if (!this.verifyCsrfState(decryptedDataOriginal, state)) {
             throw new n8n_workflow_1.ApplicationError('The OAuth callback state is invalid!');

package/dist/controllers/oauth/abstract-oauth.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"abstract-oauth.controller.js","sourceRoot":"","sources":["../../../src/controllers/oauth/abstract-oauth.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"abstract-oauth.controller.js","sourceRoot":"","sources":["../../../src/controllers/oauth/abstract-oauth.controller.ts"],"names":[],"mappings":"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"}

package/dist/controllers/oauth/oauth1-credential.controller.js

@@ -32,7 +32,7 @@ let OAuth1CredentialController = class OAuth1CredentialController extends abstra
     async getAuthUri(req) {
         const credential = await this.getCredential(req);
         const additionalData = await this.getAdditionalData();
-        const decryptedDataOriginal = await this.getDecryptedData(credential, additionalData);
+        const decryptedDataOriginal = await this.getDecryptedDataForAuthUri(credential, additionalData);
         const oauthCredentials = this.applyDefaultsAndOverwrites(credential, decryptedDataOriginal, additionalData);
         const [csrfSecret, state] = this.createCsrfState(credential.id, abstract_oauth_controller_1.skipAuthOnOAuthCallback ? undefined : req.user.id);
         const signatureMethod = oauthCredentials.signatureMethod;
@@ -63,8 +63,7 @@ let OAuth1CredentialController = class OAuth1CredentialController extends abstra
         const paramsParser = new URLSearchParams(response);
         const responseJson = Object.fromEntries(paramsParser.entries());
         const returnUri = `${oauthCredentials.authUrl}?oauth_token=${responseJson.oauth_token}`;
-        decryptedDataOriginal.csrfSecret = csrfSecret;
-        await this.encryptAndSaveData(credential, decryptedDataOriginal);
+        await this.encryptAndSaveData(credential, { csrfSecret });
         this.logger.debug('OAuth1 authorization successful for new credential', {
             userId: req.user.id,
             credentialId: credential.id,
@@ -77,16 +76,14 @@ let OAuth1CredentialController = class OAuth1CredentialController extends abstra
             if (!oauth_verifier || !oauth_token || !encodedState) {
                 return this.renderCallbackError(res, 'Insufficient parameters for OAuth1 callback.', `Received following query parameters: ${JSON.stringify(req.query)}`);
             }
-            const [credential, decryptedDataOriginal, oauthCredentials] = await this.resolveCredential(req);
+            const [credential, _, oauthCredentials] = await this.resolveCredential(req);
             const oauthToken = await axios_1.default.post(oauthCredentials.accessTokenUrl, {
                 oauth_token,
                 oauth_verifier,
             });
             const paramParser = new URLSearchParams(oauthToken.data);
-            const oauthTokenJson = Object.fromEntries(paramParser.entries());
-            delete decryptedDataOriginal.csrfSecret;
-            decryptedDataOriginal.oauthTokenData = oauthTokenJson;
-            await this.encryptAndSaveData(credential, decryptedDataOriginal);
+            const oauthTokenData = Object.fromEntries(paramParser.entries());
+            await this.encryptAndSaveData(credential, { oauthTokenData }, ['csrfSecret']);
             this.logger.debug('OAuth1 callback successful for new credential', {
                 credentialId: credential.id,
             });

package/dist/controllers/oauth/oauth1-credential.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"oauth1-credential.controller.js","sourceRoot":"","sources":["../../../src/controllers/oauth/oauth1-credential.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"oauth1-credential.controller.js","sourceRoot":"","sources":["../../../src/controllers/oauth/oauth1-credential.controller.ts"],"names":[],"mappings":"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"}

package/dist/controllers/oauth/oauth2-credential.controller.js

@@ -64,7 +64,7 @@ let OAuth2CredentialController = class OAuth2CredentialController extends abstra
     async getAuthUri(req) {
         const credential = await this.getCredential(req);
         const additionalData = await this.getAdditionalData();
-        const decryptedDataOriginal = await this.getDecryptedData(credential, additionalData);
+        const decryptedDataOriginal = await this.getDecryptedDataForAuthUri(credential, additionalData);
         if (decryptedDataOriginal?.scope &&
             credential.type.includes('OAuth2') &&
             !constants_1.GENERIC_OAUTH2_CREDENTIALS_WITH_EDITABLE_SCOPE.includes(credential.type)) {
@@ -80,7 +80,7 @@ let OAuth2CredentialController = class OAuth2CredentialController extends abstra
             oAuthOptions.query = qs.parse(oauthCredentials.authQueryParameters);
         }
         await this.externalHooks.run('oauth2.authenticate', [oAuthOptions]);
-        decryptedDataOriginal.csrfSecret = csrfSecret;
+        const toUpdate = { csrfSecret };
         if (oauthCredentials.grantType === 'pkce') {
             const { code_verifier, code_challenge } = (0, pkce_challenge_1.default)();
             oAuthOptions.query = {
@@ -88,9 +88,9 @@ let OAuth2CredentialController = class OAuth2CredentialController extends abstra
                 code_challenge,
                 code_challenge_method: 'S256',
             };
-            decryptedDataOriginal.codeVerifier = code_verifier;
+            toUpdate.codeVerifier = code_verifier;
         }
-        await this.encryptAndSaveData(credential, decryptedDataOriginal);
+        await this.encryptAndSaveData(credential, toUpdate);
         const oAuthObj = new client_oauth2_1.ClientOAuth2(oAuthOptions);
         const returnUri = oAuthObj.code.getUri();
         this.logger.debug('OAuth2 authorization url created for credential', {
@@ -129,14 +129,12 @@ let OAuth2CredentialController = class OAuth2CredentialController extends abstra
             if (Object.keys(req.query).length > 2) {
                 (0, set_1.default)(oauthToken.data, 'callbackQueryString', (0, omit_1.default)(req.query, 'state', 'code'));
             }
-            if (typeof decryptedDataOriginal.oauthTokenData === 'object') {
-                Object.assign(decryptedDataOriginal.oauthTokenData, oauthToken.data);
-            }
-            else {
-                decryptedDataOriginal.oauthTokenData = oauthToken.data;
-            }
-            delete decryptedDataOriginal.csrfSecret;
-            await this.encryptAndSaveData(credential, decryptedDataOriginal);
+            let { oauthTokenData } = decryptedDataOriginal;
+            oauthTokenData = {
+                ...(typeof oauthTokenData === 'object' ? oauthTokenData : {}),
+                ...oauthToken.data,
+            };
+            await this.encryptAndSaveData(credential, { oauthTokenData }, ['csrfSecret']);
             this.logger.debug('OAuth2 callback successful for credential', {
                 credentialId: credential.id,
             });

package/dist/controllers/oauth/oauth2-credential.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"oauth2-credential.controller.js","sourceRoot":"","sources":["../../../src/controllers/oauth/oauth2-credential.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"oauth2-credential.controller.js","sourceRoot":"","sources":["../../../src/controllers/oauth/oauth2-credential.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,sDAAkD;AAElD,uDAA+B;AAC/B,qDAA6B;AAC7B,yDAAiC;AACjC,+CAAkF;AAClF,oEAA2C;AAC3C,gDAAkC;AAElC,2CAA+H;AAC/H,6CAAmD;AAGnD,2EAA+F;AAGxF,IAAM,0BAA0B,GAAhC,MAAM,0BAA2B,SAAQ,mDAAuB;IAAhE;;QACG,iBAAY,GAAG,CAAC,CAAC;IA2J3B,CAAC;IAvJM,AAAN,KAAK,CAAC,UAAU,CAAC,GAAuC;QACvD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;QACjD,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACtD,MAAM,qBAAqB,GAAG,MAAM,IAAI,CAAC,0BAA0B,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;QAMhG,IACC,qBAAqB,EAAE,KAAK;YAC5B,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;YAClC,CAAC,0DAA8C,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,EACxE,CAAC;YACF,OAAO,qBAAqB,CAAC,KAAK,CAAC;QACpC,CAAC;QAED,MAAM,gBAAgB,GAAG,IAAI,CAAC,0BAA0B,CACvD,UAAU,EACV,qBAAqB,EACrB,cAAc,CACd,CAAC;QAGF,MAAM,CAAC,UAAU,EAAE,KAAK,CAAC,GAAG,IAAI,CAAC,eAAe,CAC/C,UAAU,CAAC,EAAE,EACb,mDAAuB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CACjD,CAAC;QAEF,MAAM,YAAY,GAAG;YACpB,GAAG,IAAI,CAAC,0BAA0B,CAAC,gBAAgB,CAAC;YACpD,KAAK;SACL,CAAC;QAEF,IAAI,gBAAgB,CAAC,mBAAmB,EAAE,CAAC;YAC1C,YAAY,CAAC,KAAK,GAAG,EAAE,CAAC,KAAK,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,CAAC;QACrE,CAAC;QAED,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,qBAAqB,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;QAEpE,MAAM,QAAQ,GAAmC,EAAE,UAAU,EAAE,CAAC;QAChE,IAAI,gBAAgB,CAAC,SAAS,KAAK,MAAM,EAAE,CAAC;YAC3C,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,GAAG,IAAA,wBAAa,GAAE,CAAC;YAC1D,YAAY,CAAC,KAAK,GAAG;gBACpB,GAAG,YAAY,CAAC,KAAK;gBACrB,cAAc;gBACd,qBAAqB,EAAE,MAAM;aAC7B,CAAC;YACF,QAAQ,CAAC,YAAY,GAAG,aAAa,CAAC;QACvC,CAAC;QAED,MAAM,IAAI,CAAC,kBAAkB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QAEpD,MAAM,QAAQ,GAAG,IAAI,4BAAY,CAAC,YAAY,CAAC,CAAC;QAChD,MAAM,SAAS,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QAEzC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iDAAiD,EAAE;YACpE,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE;YACnB,YAAY,EAAE,UAAU,CAAC,EAAE;SAC3B,CAAC,CAAC;QAEH,OAAO,SAAS,CAAC,QAAQ,EAAE,CAAC;IAC7B,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,mBAAmB,CAC9B,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,CAAC,GAC1D,MAAM,IAAI,CAAC,iBAAiB,CAAuB,GAAG,CAAC,CAAC;YAEzD,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,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,IAAI,EAAE,cAAc,EAAE,GAAG,qBAAqB,CAAC;YAC/C,cAAc,GAAG;gBAChB,GAAG,CAAC,OAAO,cAAc,KAAK,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC7D,GAAG,UAAU,CAAC,IAAI;aAClB,CAAC;YAEF,MAAM,IAAI,CAAC,kBAAkB,CAAC,UAAU,EAAE,EAAE,cAAc,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;YAE9E,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,2CAA2C,EAAE;gBAC9D,YAAY,EAAE,UAAU,CAAC,EAAE;aAC3B,CAAC,CAAC;YAEH,OAAO,GAAG,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;QACrC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,OAAO,IAAI,CAAC,mBAAmB,CAC9B,GAAG,EACF,KAAe,CAAC,OAAO,EAExB,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,OAAO;YACN,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,OAAO,WAAW;YACvC,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;IACH,CAAC;CACD,CAAA;AA5JY,gEAA0B;AAKhC;IADL,IAAA,gBAAG,EAAC,OAAO,CAAC;;;;4DA+DZ;AAIK;IADL,IAAA,gBAAG,EAAC,WAAW,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,QAAQ,EAAE,mDAAuB,EAAE,CAAC;;;;gEAuE5E;qCA7IW,0BAA0B;IADtC,IAAA,2BAAc,EAAC,oBAAoB,CAAC;GACxB,0BAA0B,CA4JtC"}

package/dist/credentials/credentials.service.d.ts

@@ -1,6 +1,6 @@
 import type { Scope } from '@n8n/permissions';
 import { type EntityManager, type FindOptionsRelations } from '@n8n/typeorm';
-import { Logger } from 'n8n-core';
+import { ErrorReporter, Logger } from 'n8n-core';
 import type { ICredentialDataDecryptedObject, ICredentialsDecrypted } from 'n8n-workflow';
 import { CredentialTypes } from '../credential-types';
 import { CredentialsEntity } from '../databases/entities/credentials-entity';
@@ -28,6 +28,7 @@ export declare class CredentialsService {
     private readonly sharedCredentialsRepository;
     private readonly ownershipService;
     private readonly logger;
+    private readonly errorReporter;
     private readonly credentialsTester;
     private readonly externalHooks;
     private readonly credentialTypes;
@@ -35,7 +36,7 @@ export declare class CredentialsService {
     private readonly projectService;
     private readonly roleService;
     private readonly userRepository;
-    constructor(credentialsRepository: CredentialsRepository, sharedCredentialsRepository: SharedCredentialsRepository, ownershipService: OwnershipService, logger: Logger, credentialsTester: CredentialsTester, externalHooks: ExternalHooks, credentialTypes: CredentialTypes, projectRepository: ProjectRepository, projectService: ProjectService, roleService: RoleService, userRepository: UserRepository);
+    constructor(credentialsRepository: CredentialsRepository, sharedCredentialsRepository: SharedCredentialsRepository, ownershipService: OwnershipService, logger: Logger, errorReporter: ErrorReporter, credentialsTester: CredentialsTester, externalHooks: ExternalHooks, credentialTypes: CredentialTypes, projectRepository: ProjectRepository, projectService: ProjectService, roleService: RoleService, userRepository: UserRepository);
     getMany(user: User, { listQueryOptions, includeScopes, includeData, }?: {
         listQueryOptions?: ListQuery.Options & {
             includeData?: boolean;

package/dist/credentials/credentials.service.js

@@ -67,11 +67,12 @@ const ownership_service_1 = require("../services/ownership.service");
 const project_service_ee_1 = require("../services/project.service.ee");
 const role_service_1 = require("../services/role.service");
 let CredentialsService = class CredentialsService {
-    constructor(credentialsRepository, sharedCredentialsRepository, ownershipService, logger, credentialsTester, externalHooks, credentialTypes, projectRepository, projectService, roleService, userRepository) {
+    constructor(credentialsRepository, sharedCredentialsRepository, ownershipService, logger, errorReporter, credentialsTester, externalHooks, credentialTypes, projectRepository, projectService, roleService, userRepository) {
         this.credentialsRepository = credentialsRepository;
         this.sharedCredentialsRepository = sharedCredentialsRepository;
         this.ownershipService = ownershipService;
         this.logger = logger;
+        this.errorReporter = errorReporter;
         this.credentialsTester = credentialsTester;
         this.externalHooks = externalHooks;
         this.credentialTypes = credentialTypes;
@@ -225,11 +226,24 @@ let CredentialsService = class CredentialsService {
     }
     decrypt(credential, includeRawData = false) {
         const coreCredential = (0, credentials_helper_1.createCredentialsFromCredentialsEntity)(credential);
-        const data = coreCredential.getData();
-        if (includeRawData) {
-            return data;
+        try {
+            const data = coreCredential.getData();
+            if (includeRawData) {
+                return data;
+            }
+            return this.redact(data, credential);
+        }
+        catch (error) {
+            if (error instanceof n8n_core_1.CredentialDataError) {
+                this.errorReporter.error(error, {
+                    level: 'error',
+                    extra: { credentialId: credential.id },
+                    tags: { credentialType: credential.type },
+                });
+                return {};
+            }
+            throw error;
         }
-        return this.redact(data, credential);
     }
     async update(credentialId, newCredentialData) {
         await this.externalHooks.run('credentials.update', [newCredentialData]);
@@ -419,6 +433,7 @@ exports.CredentialsService = CredentialsService = __decorate([
         shared_credentials_repository_1.SharedCredentialsRepository,
         ownership_service_1.OwnershipService,
         n8n_core_1.Logger,
+        n8n_core_1.ErrorReporter,
         credentials_tester_service_1.CredentialsTester,
         external_hooks_1.ExternalHooks,
         credential_types_1.CredentialTypes,

package/dist/credentials/credentials.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"credentials.service.js","sourceRoot":"","sources":["../../src/credentials/credentials.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"credentials.service.js","sourceRoot":"","sources":["../../src/credentials/credentials.service.ts"],"names":[],"mappings":"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"}

package/dist/databases/entities/folder.d.ts

@@ -0,0 +1,11 @@
+import { WithTimestampsAndStringId } from './abstract-entity';
+import { Project } from './project';
+import { TagEntity } from './tag-entity';
+import { type WorkflowEntity } from './workflow-entity';
+export declare class Folder extends WithTimestampsAndStringId {
+    name: string;
+    parentFolder: Folder | null;
+    project: Project;
+    workflows: WorkflowEntity[];
+    tags: TagEntity[];
+}

package/dist/databases/entities/folder.js

@@ -0,0 +1,56 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    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;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Folder = void 0;
+const typeorm_1 = require("@n8n/typeorm");
+const abstract_entity_1 = require("./abstract-entity");
+const project_1 = require("./project");
+const tag_entity_1 = require("./tag-entity");
+let Folder = class Folder extends abstract_entity_1.WithTimestampsAndStringId {
+};
+exports.Folder = Folder;
+__decorate([
+    (0, typeorm_1.Column)(),
+    __metadata("design:type", String)
+], Folder.prototype, "name", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(() => Folder, { nullable: true }),
+    (0, typeorm_1.JoinColumn)({ name: 'parentFolderId' }),
+    __metadata("design:type", Object)
+], Folder.prototype, "parentFolder", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(() => project_1.Project),
+    (0, typeorm_1.JoinColumn)({ name: 'projectId' }),
+    __metadata("design:type", project_1.Project)
+], Folder.prototype, "project", void 0);
+__decorate([
+    (0, typeorm_1.OneToMany)('WorkflowEntity', 'parentFolder'),
+    __metadata("design:type", Array)
+], Folder.prototype, "workflows", void 0);
+__decorate([
+    (0, typeorm_1.ManyToMany)(() => tag_entity_1.TagEntity),
+    (0, typeorm_1.JoinTable)({
+        name: 'folder_tag',
+        joinColumn: {
+            name: 'folderId',
+            referencedColumnName: 'id',
+        },
+        inverseJoinColumn: {
+            name: 'tagId',
+            referencedColumnName: 'id',
+        },
+    }),
+    __metadata("design:type", Array)
+], Folder.prototype, "tags", void 0);
+exports.Folder = Folder = __decorate([
+    (0, typeorm_1.Entity)()
+], Folder);
+//# sourceMappingURL=folder.js.map

package/dist/databases/entities/folder.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"folder.js","sourceRoot":"","sources":["../../../src/databases/entities/folder.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0CAQsB;AAEtB,uDAA8D;AAC9D,uCAAoC;AACpC,6CAAyC;AAIlC,IAAM,MAAM,GAAZ,MAAM,MAAO,SAAQ,2CAAyB;CA4BpD,CAAA;AA5BY,wBAAM;AAElB;IADC,IAAA,gBAAM,GAAE;;oCACI;AAIb;IAFC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC3C,IAAA,oBAAU,EAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,CAAC;;4CACX;AAI5B;IAFC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,iBAAO,CAAC;IACxB,IAAA,oBAAU,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;8BACzB,iBAAO;uCAAC;AAGjB;IADC,IAAA,mBAAS,EAAC,gBAAgB,EAAE,cAAc,CAAC;;yCAChB;AAc5B;IAZC,IAAA,oBAAU,EAAC,GAAG,EAAE,CAAC,sBAAS,CAAC;IAC3B,IAAA,mBAAS,EAAC;QACV,IAAI,EAAE,YAAY;QAClB,UAAU,EAAE;YACX,IAAI,EAAE,UAAU;YAChB,oBAAoB,EAAE,IAAI;SAC1B;QACD,iBAAiB,EAAE;YAClB,IAAI,EAAE,OAAO;YACb,oBAAoB,EAAE,IAAI;SAC1B;KACD,CAAC;;oCACgB;iBA3BN,MAAM;IADlB,IAAA,gBAAM,GAAE;GACI,MAAM,CA4BlB"}

package/dist/databases/entities/index.d.ts

@@ -10,6 +10,7 @@ import { ExecutionAnnotation } from './execution-annotation.ee';
 import { ExecutionData } from './execution-data';
 import { ExecutionEntity } from './execution-entity';
 import { ExecutionMetadata } from './execution-metadata';
+import { Folder } from './folder';
 import { InstalledNodes } from './installed-nodes';
 import { InstalledPackages } from './installed-packages';
 import { InvalidAuthToken } from './invalid-auth-token';
@@ -20,6 +21,7 @@ import { Settings } from './settings';
 import { SharedCredentials } from './shared-credentials';
 import { SharedWorkflow } from './shared-workflow';
 import { TagEntity } from './tag-entity';
+import { TestCaseExecution } from './test-case-execution.ee';
 import { TestDefinition } from './test-definition.ee';
 import { TestMetric } from './test-metric.ee';
 import { TestRun } from './test-run.ee';
@@ -63,4 +65,6 @@ export declare const entities: {
     TestDefinition: typeof TestDefinition;
     TestMetric: typeof TestMetric;
     TestRun: typeof TestRun;
+    TestCaseExecution: typeof TestCaseExecution;
+    Folder: typeof Folder;
 };

package/dist/databases/entities/index.js

@@ -13,6 +13,7 @@ const execution_annotation_ee_1 = require("./execution-annotation.ee");
 const execution_data_1 = require("./execution-data");
 const execution_entity_1 = require("./execution-entity");
 const execution_metadata_1 = require("./execution-metadata");
+const folder_1 = require("./folder");
 const installed_nodes_1 = require("./installed-nodes");
 const installed_packages_1 = require("./installed-packages");
 const invalid_auth_token_1 = require("./invalid-auth-token");
@@ -23,6 +24,7 @@ const settings_1 = require("./settings");
 const shared_credentials_1 = require("./shared-credentials");
 const shared_workflow_1 = require("./shared-workflow");
 const tag_entity_1 = require("./tag-entity");
+const test_case_execution_ee_1 = require("./test-case-execution.ee");
 const test_definition_ee_1 = require("./test-definition.ee");
 const test_metric_ee_1 = require("./test-metric.ee");
 const test_run_ee_1 = require("./test-run.ee");
@@ -66,5 +68,7 @@ exports.entities = {
     TestDefinition: test_definition_ee_1.TestDefinition,
     TestMetric: test_metric_ee_1.TestMetric,
     TestRun: test_run_ee_1.TestRun,
+    TestCaseExecution: test_case_execution_ee_1.TestCaseExecution,
+    Folder: folder_1.Folder,
 };
 //# sourceMappingURL=index.js.map