n8n 2.1.2 → 2.2.0

package/dist/modules/dynamic-credentials.ee/credential-resolvers/oauth-credential-resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"oauth-credential-resolver.js","sourceRoot":"","sources":["../../../../src/modules/dynamic-credentials.ee/credential-resolvers/oauth-credential-resolver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"oauth-credential-resolver.js","sourceRoot":"","sources":["../../../../src/modules/dynamic-credentials.ee/credential-resolvers/oauth-credential-resolver.ts"],"names":[],"mappings":"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"}

package/dist/modules/dynamic-credentials.ee/dynamic-credentials.controller.d.ts

@@ -1,9 +1,15 @@
 import { Request, Response } from 'express';
 import { EnterpriseCredentialsService } from '../../credentials/credentials.service.ee';
 import { OauthService } from '../../oauth/oauth.service';
+import { DynamicCredentialResolverRepository } from './database/repositories/credential-resolver.repository';
+import { DynamicCredentialResolverRegistry } from './services';
+import { Cipher } from 'n8n-core';
 export declare class DynamicCredentialsController {
     private readonly enterpriseCredentialsService;
     private readonly oauthService;
-    constructor(enterpriseCredentialsService: EnterpriseCredentialsService, oauthService: OauthService);
+    private readonly resolverRepository;
+    private readonly resolverRegistry;
+    private readonly cipher;
+    constructor(enterpriseCredentialsService: EnterpriseCredentialsService, oauthService: OauthService, resolverRepository: DynamicCredentialResolverRepository, resolverRegistry: DynamicCredentialResolverRegistry, cipher: Cipher);
     authorizeCredential(req: Request, _res: Response): Promise<string>;
 }

package/dist/modules/dynamic-credentials.ee/dynamic-credentials.controller.js

@@ -15,19 +15,51 @@ const credentials_service_ee_1 = require("../../credentials/credentials.service.
 const not_found_error_1 = require("../../errors/response-errors/not-found.error");
 const bad_request_error_1 = require("../../errors/response-errors/bad-request.error");
 const oauth_service_1 = require("../../oauth/oauth.service");
+const credential_resolver_repository_1 = require("./database/repositories/credential-resolver.repository");
+const services_1 = require("./services");
+const utils_1 = require("./utils");
+const n8n_core_1 = require("n8n-core");
+const n8n_workflow_1 = require("n8n-workflow");
 let DynamicCredentialsController = class DynamicCredentialsController {
-    constructor(enterpriseCredentialsService, oauthService) {
+    constructor(enterpriseCredentialsService, oauthService, resolverRepository, resolverRegistry, cipher) {
         this.enterpriseCredentialsService = enterpriseCredentialsService;
         this.oauthService = oauthService;
+        this.resolverRepository = resolverRepository;
+        this.resolverRegistry = resolverRegistry;
+        this.cipher = cipher;
     }
     async authorizeCredential(req, _res) {
         const credential = await this.enterpriseCredentialsService.getOne(req.params.id);
+        const token = (0, utils_1.getBearerToken)(req);
         if (!credential) {
             throw new not_found_error_1.NotFoundError('Credential not found');
         }
         if (!credential.type.includes('OAuth2') && !credential.type.includes('OAuth1')) {
             throw new bad_request_error_1.BadRequestError('Credential type not supported');
         }
+        const resolverId = req.query.resolverId;
+        if (!resolverId) {
+            throw new bad_request_error_1.BadRequestError('Missing resolverId query parameter');
+        }
+        const resolverEntity = await this.resolverRepository.findOneBy({
+            id: resolverId,
+        });
+        if (!resolverEntity) {
+            throw new not_found_error_1.NotFoundError('Resolver not found');
+        }
+        const resolver = this.resolverRegistry.getResolverByTypename(resolverEntity.type);
+        if (!resolver) {
+            throw new not_found_error_1.NotFoundError('Resolver type not found');
+        }
+        if (resolver.validateIdentity) {
+            const decryptedConfig = this.cipher.decrypt(resolverEntity.config);
+            const resolverConfig = (0, n8n_workflow_1.jsonParse)(decryptedConfig);
+            await resolver.validateIdentity(token, {
+                resolverId,
+                resolverName: resolverEntity.type,
+                configuration: resolverConfig,
+            });
+        }
         const callerData = [
             credential,
             {
@@ -56,6 +88,9 @@ __decorate([
 exports.DynamicCredentialsController = DynamicCredentialsController = __decorate([
     (0, decorators_1.RestController)('/credentials'),
     __metadata("design:paramtypes", [credentials_service_ee_1.EnterpriseCredentialsService,
-        oauth_service_1.OauthService])
+        oauth_service_1.OauthService,
+        credential_resolver_repository_1.DynamicCredentialResolverRepository,
+        services_1.DynamicCredentialResolverRegistry,
+        n8n_core_1.Cipher])
 ], DynamicCredentialsController);
 //# sourceMappingURL=dynamic-credentials.controller.js.map

package/dist/modules/dynamic-credentials.ee/dynamic-credentials.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"dynamic-credentials.controller.js","sourceRoot":"","sources":["../../../src/modules/dynamic-credentials.ee/dynamic-credentials.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gDAAuD;AAGvD,iFAAoF;AACpF,8EAAyE;AACzE,kFAA6E;AAC7E,yDAA0E;AAInE,IAAM,4BAA4B,GAAlC,MAAM,4BAA4B;IACxC,YACkB,4BAA0D,EAC1D,YAA0B;QAD1B,iCAA4B,GAA5B,4BAA4B,CAA8B;QAC1D,iBAAY,GAAZ,YAAY,CAAc;IACzC,CAAC;IAGE,AAAN,KAAK,CAAC,mBAAmB,CAAC,GAAY,EAAE,IAAc;QACrD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,4BAA4B,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAEjF,IAAI,CAAC,UAAU,EAAE,CAAC;YACjB,MAAM,IAAI,+BAAa,CAAC,sBAAsB,CAAC,CAAC;QACjD,CAAC;QAED,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;YAChF,MAAM,IAAI,mCAAe,CAAC,+BAA+B,CAAC,CAAC;QAC5D,CAAC;QAED,MAAM,UAAU,GAA6C;YAC5D,UAAU;YACV;gBACC,GAAG,EAAE,UAAU,CAAC,EAAE;gBAClB,MAAM,EAAE,oBAAoB;gBAC5B,mBAAmB,EAAE,GAAG,CAAC,OAAO,CAAC,aAAa,IAAI,EAAE;gBACpD,oBAAoB,EAAE,GAAG,CAAC,KAAK,CAAC,UAAU;aAC1C;SACD,CAAC;QAEF,IAAI,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;YACxC,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,sBAAsB,CAAC,GAAG,UAAU,CAAC,CAAC;QACtE,CAAC;QAED,IAAI,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;YACxC,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,sBAAsB,CAAC,GAAG,UAAU,CAAC,CAAC;QACtE,CAAC;QAED,MAAM,IAAI,mCAAe,CAAC,+BAA+B,CAAC,CAAC;IAC5D,CAAC;CACD,CAAA;AAtCY,oEAA4B;AAOlC;IADL,IAAA,iBAAI,EAAC,gBAAgB,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;;;uEA+B1C;uCArCW,4BAA4B;IADxC,IAAA,2BAAc,EAAC,cAAc,CAAC;qCAGkB,qDAA4B;QAC5C,4BAAY;GAHhC,4BAA4B,CAsCxC"}
+{"version":3,"file":"dynamic-credentials.controller.js","sourceRoot":"","sources":["../../../src/modules/dynamic-credentials.ee/dynamic-credentials.controller.ts"],"names":[],"mappings":"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"}

package/dist/modules/dynamic-credentials.ee/services/credential-resolver-workflow.service.d.ts

@@ -4,6 +4,7 @@ import { DynamicCredentialResolverRepository } from '../database/repositories/cr
 import { Cipher } from 'n8n-core';
 type CredentialStatus = {
     credentialId: string;
+    credentialName: string;
     resolverId: string;
     credentialType: string;
     status: 'missing' | 'configured';

package/dist/modules/dynamic-credentials.ee/services/credential-resolver-workflow.service.js

@@ -105,34 +105,37 @@ let CredentialResolverWorkflowService = class CredentialResolverWorkflowService
         let resolverInstance = options.workflowResolverInstance;
         let resolverConfig = options.workflowResolverConfig;
         const credentialResolverId = credential.resolverId ?? options.resolverId;
-        if (credentialResolverId) {
-            if (credentialResolverId !== options.resolverId) {
-                const { resolverInstance: credentialResolverInstance, resolverConfig: credentialResolverConfig, } = await this.getResolver(credentialResolverId);
-                resolverInstance = credentialResolverInstance;
-                resolverConfig = credentialResolverConfig;
+        if (!credentialResolverId) {
+            return null;
+        }
+        if (credentialResolverId !== options.resolverId) {
+            const { resolverInstance: credentialResolverInstance, resolverConfig: credentialResolverConfig, } = await this.getResolver(credentialResolverId);
+            resolverInstance = credentialResolverInstance;
+            resolverConfig = credentialResolverConfig;
+        }
+        if (resolverConfig && resolverInstance) {
+            try {
+                await resolverInstance.getSecret(credential.id, { identity: options.identityToken, version: 1 }, {
+                    configuration: resolverConfig,
+                    resolverName: resolverInstance.metadata.name,
+                    resolverId: credentialResolverId,
+                });
+                return {
+                    credentialId: credential.id,
+                    resolverId: credentialResolverId,
+                    credentialName: credential.name,
+                    status: 'configured',
+                    credentialType: credential.type,
+                };
             }
-            if (resolverConfig && resolverInstance) {
-                try {
-                    await resolverInstance.getSecret(credential.id, { identity: options.identityToken, version: 1 }, {
-                        configuration: resolverConfig,
-                        resolverName: resolverInstance.metadata.name,
-                        resolverId: credentialResolverId,
-                    });
-                    return {
-                        credentialId: credential.id,
-                        resolverId: credentialResolverId,
-                        status: 'configured',
-                        credentialType: credential.type,
-                    };
-                }
-                catch (error) {
-                    return {
-                        credentialId: credential.id,
-                        resolverId: credentialResolverId,
-                        status: 'missing',
-                        credentialType: credential.type,
-                    };
-                }
+            catch (error) {
+                return {
+                    credentialId: credential.id,
+                    resolverId: credentialResolverId,
+                    credentialName: credential.name,
+                    status: 'missing',
+                    credentialType: credential.type,
+                };
             }
         }
         return null;

package/dist/modules/dynamic-credentials.ee/services/credential-resolver-workflow.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"credential-resolver-workflow.service.js","sourceRoot":"","sources":["../../../../src/modules/dynamic-credentials.ee/services/credential-resolver-workflow.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAA2F;AAC3F,iGAA2F;AAC3F,4GAA8G;AAC9G,uCAAkC;AAClC,+CAAyC;AAEzC,gCAAkC;AASlC,SAAS,kBAAkB,CAAC,GAAY;IACvC,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;QAC7C,OAAO,KAAK,CAAC;IACd,CAAC;IACD,OAAO,CACN,cAAc,IAAI,GAAG;QACrB,OAAO,GAAG,CAAC,YAAY,KAAK,QAAQ;QACpC,YAAY,IAAI,GAAG;QACnB,OAAO,GAAG,CAAC,UAAU,KAAK,QAAQ;QAClC,gBAAgB,IAAI,GAAG;QACvB,OAAO,GAAG,CAAC,cAAc,KAAK,QAAQ;QACtC,QAAQ,IAAI,GAAG;QACf,CAAC,GAAG,CAAC,MAAM,KAAK,SAAS,IAAI,GAAG,CAAC,MAAM,KAAK,YAAY,CAAC,CACzD,CAAC;AACH,CAAC;AAGM,IAAM,iCAAiC,GAAvC,MAAM,iCAAiC;IAC7C,YACkB,kBAAsC,EACtC,oBAA2C,EAC3C,gBAAmD,EACnD,kBAAuD,EACvD,MAAc;QAJd,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,yBAAoB,GAApB,oBAAoB,CAAuB;QAC3C,qBAAgB,GAAhB,gBAAgB,CAAmC;QACnD,uBAAkB,GAAlB,kBAAkB,CAAqC;QACvD,WAAM,GAAN,MAAM,CAAQ;IAC7B,CAAC;IAEI,KAAK,CAAC,WAAW,CAAC,UAAkB;QAI3C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;QAC7E,IAAI,CAAC,QAAQ,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;QAClD,CAAC;QACD,MAAM,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACpF,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;QACjE,CAAC;QACD,IAAI,CAAC;YACJ,MAAM,eAAe,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAC7D,MAAM,cAAc,GAAG,IAAA,wBAAS,EAA0B,eAAe,CAAC,CAAC;YAE3E,OAAO;gBACN,gBAAgB;gBAChB,cAAc;aACd,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;QACtE,CAAC;IACF,CAAC;IAWD,KAAK,CAAC,iBAAiB,CAAC,UAAkB,EAAE,aAAqB;QAChE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC;YAClD,EAAE,EAAE,UAAU;SACd,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;QACvC,CAAC;QAED,MAAM,UAAU,GAAG,QAAQ,CAAC,QAAQ,EAAE,oBAAoB,CAAC;QAE3D,IAAI,wBAAwB,GAA+B,IAAI,CAAC;QAChE,IAAI,sBAAsB,GAAmC,IAAI,CAAC;QAElE,IAAI,UAAU,EAAE,CAAC;YAChB,MAAM,EAAE,gBAAgB,EAAE,cAAc,EAAE,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;YAChF,wBAAwB,GAAG,gBAAgB,CAAC;YAC5C,sBAAsB,GAAG,cAAc,CAAC;QACzC,CAAC;QAED,MAAM,kBAAkB,GAAa,EAAE,CAAC;QAExC,KAAK,MAAM,IAAI,IAAI,QAAQ,CAAC,KAAK,IAAI,EAAE,EAAE,CAAC;YACzC,KAAK,MAAM,cAAc,IAAI,IAAI,CAAC,WAAW,IAAI,EAAE,EAAE,CAAC;gBACrD,MAAM,cAAc,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,cAAc,CAAC,CAAC;gBAE1D,IAAI,cAAc,EAAE,EAAE,EAAE,CAAC;oBACxB,kBAAkB,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;gBAC5C,CAAC;YACF,CAAC;QACF,CAAC;QAED,IAAI,kBAAkB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACrC,OAAO,EAAE,CAAC;QACX,CAAC;QAED,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC;YACxD,KAAK,EAAE;gBACN,EAAE,EAAE,IAAA,OAAE,EAAC,kBAAkB,CAAC;gBAC1B,YAAY,EAAE,IAAI;aAClB;SACD,CAAC,CAAC;QAGH,MAAM,wBAAwB,GAAG,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE;YACrE,OAAO,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,EAAE;gBACnD,wBAAwB;gBACxB,sBAAsB;gBACtB,UAAU;gBACV,aAAa;aACb,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;IACjF,CAAC;IAEO,KAAK,CAAC,qBAAqB,CAClC,UAA6B,EAC7B,OAKC;QAED,IAAI,gBAAgB,GAA+B,OAAO,CAAC,wBAAwB,CAAC;QACpF,IAAI,cAAc,GAAmC,OAAO,CAAC,sBAAsB,CAAC;QACpF,MAAM,oBAAoB,GAAG,UAAU,CAAC,UAAU,IAAI,OAAO,CAAC,UAAU,CAAC;QACzE,IAAI,oBAAoB,EAAE,CAAC;YAC1B,IAAI,oBAAoB,KAAK,OAAO,CAAC,UAAU,EAAE,CAAC;gBACjD,MAAM,EACL,gBAAgB,EAAE,0BAA0B,EAC5C,cAAc,EAAE,wBAAwB,GACxC,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,oBAAoB,CAAC,CAAC;gBACjD,gBAAgB,GAAG,0BAA0B,CAAC;gBAC9C,cAAc,GAAG,wBAAwB,CAAC;YAC3C,CAAC;YAED,IAAI,cAAc,IAAI,gBAAgB,EAAE,CAAC;gBACxC,IAAI,CAAC;oBACJ,MAAM,gBAAgB,CAAC,SAAS,CAC/B,UAAU,CAAC,EAAE,EACb,EAAE,QAAQ,EAAE,OAAO,CAAC,aAAa,EAAE,OAAO,EAAE,CAAC,EAAE,EAC/C;wBACC,aAAa,EAAE,cAAc;wBAC7B,YAAY,EAAE,gBAAgB,CAAC,QAAQ,CAAC,IAAI;wBAC5C,UAAU,EAAE,oBAAoB;qBAChC,CACD,CAAC;oBACF,OAAO;wBACN,YAAY,EAAE,UAAU,CAAC,EAAE;wBAC3B,UAAU,EAAE,oBAAoB;wBAChC,MAAM,EAAE,YAAY;wBACpB,cAAc,EAAE,UAAU,CAAC,IAAI;qBAC/B,CAAC;gBACH,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBAEhB,OAAO;wBACN,YAAY,EAAE,UAAU,CAAC,EAAE;wBAC3B,UAAU,EAAE,oBAAoB;wBAChC,MAAM,EAAE,SAAS;wBACjB,cAAc,EAAE,UAAU,CAAC,IAAI;qBAC/B,CAAC;gBACH,CAAC;YACF,CAAC;QACF,CAAC;QACD,OAAO,IAAI,CAAC;IACb,CAAC;CACD,CAAA;AAvJY,8EAAiC;4CAAjC,iCAAiC;IAD7C,IAAA,YAAO,GAAE;qCAG6B,uBAAkB;QAChB,0BAAqB;QACzB,wEAAiC;QAC/B,oEAAmC;QAC/C,iBAAM;GANpB,iCAAiC,CAuJ7C"}
+{"version":3,"file":"credential-resolver-workflow.service.js","sourceRoot":"","sources":["../../../../src/modules/dynamic-credentials.ee/services/credential-resolver-workflow.service.ts"],"names":[],"mappings":"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"}

package/dist/modules/dynamic-credentials.ee/services/shared-fields.d.ts

@@ -1,2 +1,2 @@
-import type { ICredentialType } from 'n8n-workflow';
+import { type ICredentialType } from 'n8n-workflow';
 export declare function extractSharedFields(credentialType: ICredentialType): string[];

package/dist/modules/dynamic-credentials.ee/services/shared-fields.js

@@ -1,9 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractSharedFields = extractSharedFields;
+const di_1 = require("@n8n/di");
+const n8n_workflow_1 = require("n8n-workflow");
+const credential_types_1 = require("../../../credential-types");
+function getExtendedProps(type, credentialTypes) {
+    const props = [];
+    for (const parentTypeName of type.extends ?? []) {
+        const parentType = credentialTypes.getByName(parentTypeName);
+        const parentProps = getExtendedProps(parentType, credentialTypes);
+        n8n_workflow_1.NodeHelpers.mergeNodeProperties(props, parentProps);
+    }
+    n8n_workflow_1.NodeHelpers.mergeNodeProperties(props, type.properties);
+    return props;
+}
 function extractSharedFields(credentialType) {
+    const credentialTypes = di_1.Container.get(credential_types_1.CredentialTypes);
+    const mergedProperties = getExtendedProps(credentialType, credentialTypes);
     const sharedFields = [];
-    for (const property of credentialType.properties) {
+    for (const property of mergedProperties) {
         if (property.resolvableField !== true) {
             sharedFields.push(property.name);
         }

package/dist/modules/dynamic-credentials.ee/services/shared-fields.js.map

@@ -1 +1 @@
-{"version":3,"file":"shared-fields.js","sourceRoot":"","sources":["../../../../src/modules/dynamic-credentials.ee/services/shared-fields.ts"],"names":[],"mappings":";;AAOA,kDAWC;AAXD,SAAgB,mBAAmB,CAAC,cAA+B;IAClE,MAAM,YAAY,GAAa,EAAE,CAAC;IAElC,KAAK,MAAM,QAAQ,IAAI,cAAc,CAAC,UAAU,EAAE,CAAC;QAElD,IAAI,QAAQ,CAAC,eAAe,KAAK,IAAI,EAAE,CAAC;YACvC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAClC,CAAC;IACF,CAAC;IAED,OAAO,YAAY,CAAC;AACrB,CAAC"}
+{"version":3,"file":"shared-fields.js","sourceRoot":"","sources":["../../../../src/modules/dynamic-credentials.ee/services/shared-fields.ts"],"names":[],"mappings":";;AA8BA,kDAeC;AAxCD,gCAAoC;AACpC,+CAAuF;AAEvF,yDAAqD;AAGrD,SAAS,gBAAgB,CACxB,IAAqB,EACrB,eAAgC;IAEhC,MAAM,KAAK,GAAsB,EAAE,CAAC;IAGpC,KAAK,MAAM,cAAc,IAAI,IAAI,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC;QACjD,MAAM,UAAU,GAAG,eAAe,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;QAC7D,MAAM,WAAW,GAAG,gBAAgB,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC;QAClE,0BAAW,CAAC,mBAAmB,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;IACrD,CAAC;IAGD,0BAAW,CAAC,mBAAmB,CAAC,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;IAExD,OAAO,KAAK,CAAC;AACd,CAAC;AAED,SAAgB,mBAAmB,CAAC,cAA+B;IAClE,MAAM,eAAe,GAAG,cAAS,CAAC,GAAG,CAAC,kCAAe,CAAC,CAAC;IAEvD,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;IAE3E,MAAM,YAAY,GAAa,EAAE,CAAC;IAElC,KAAK,MAAM,QAAQ,IAAI,gBAAgB,EAAE,CAAC;QAEzC,IAAI,QAAQ,CAAC,eAAe,KAAK,IAAI,EAAE,CAAC;YACvC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAClC,CAAC;IACF,CAAC;IAED,OAAO,YAAY,CAAC;AACrB,CAAC"}

package/dist/modules/dynamic-credentials.ee/utils.d.ts

@@ -0,0 +1,2 @@
+import type { Request } from 'express';
+export declare function getBearerToken(req: Request): string;

package/dist/modules/dynamic-credentials.ee/utils.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getBearerToken = getBearerToken;
+const bad_request_error_1 = require("../../errors/response-errors/bad-request.error");
+const unauthenticated_error_1 = require("../../errors/response-errors/unauthenticated.error");
+const BEARER_TOKEN_REGEX = /^[Bb][Ee][Aa][Rr][Ee][Rr]\s+(.+)$/;
+function getBearerToken(req) {
+    const headerValue = req.headers['authorization']?.toString();
+    if (!headerValue) {
+        throw new unauthenticated_error_1.UnauthenticatedError();
+    }
+    const result = BEARER_TOKEN_REGEX.exec(headerValue);
+    const token = result ? result[1] : null;
+    if (!token) {
+        throw new bad_request_error_1.BadRequestError('Authorization header is malformed');
+    }
+    return token;
+}
+//# sourceMappingURL=utils.js.map

package/dist/modules/dynamic-credentials.ee/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/modules/dynamic-credentials.ee/utils.ts"],"names":[],"mappings":";;AAMA,wCAeC;AArBD,kFAA6E;AAC7E,0FAAsF;AAGtF,MAAM,kBAAkB,GAAG,mCAAmC,CAAC;AAE/D,SAAgB,cAAc,CAAC,GAAY;IAC1C,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,QAAQ,EAAE,CAAC;IAE7D,IAAI,CAAC,WAAW,EAAE,CAAC;QAClB,MAAM,IAAI,4CAAoB,EAAE,CAAC;IAClC,CAAC;IAED,MAAM,MAAM,GAAG,kBAAkB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACpD,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAExC,IAAI,CAAC,KAAK,EAAE,CAAC;QACZ,MAAM,IAAI,mCAAe,CAAC,mCAAmC,CAAC,CAAC;IAChE,CAAC;IAED,OAAO,KAAK,CAAC;AACd,CAAC"}

package/dist/modules/dynamic-credentials.ee/workflow-status.controller.d.ts

@@ -1,8 +1,12 @@
 import { Request, Response } from 'express';
 import { CredentialResolverWorkflowService } from './services/credential-resolver-workflow.service';
 import { WorkflowExecutionStatus } from '@n8n/api-types';
+import { UrlService } from '../../services/url.service';
+import { GlobalConfig } from '@n8n/config';
 export declare class WorkflowStatusController {
     private readonly credentialResolverWorkflowService;
-    constructor(credentialResolverWorkflowService: CredentialResolverWorkflowService);
+    private readonly urlService;
+    private readonly globalConfig;
+    constructor(credentialResolverWorkflowService: CredentialResolverWorkflowService, urlService: UrlService, globalConfig: GlobalConfig);
     checkWorkflowForExecution(req: Request, _res: Response): Promise<WorkflowExecutionStatus>;
 }

package/dist/modules/dynamic-credentials.ee/workflow-status.controller.js

@@ -13,36 +13,34 @@ exports.WorkflowStatusController = void 0;
 const decorators_1 = require("@n8n/decorators");
 const bad_request_error_1 = require("../../errors/response-errors/bad-request.error");
 const credential_resolver_workflow_service_1 = require("./services/credential-resolver-workflow.service");
-const unauthenticated_error_1 = require("../../errors/response-errors/unauthenticated.error");
-const BEARER_TOKEN_REGEX = /^[Bb][Ee][Aa][Rr][Ee][Rr]\s+(.+)$/;
+const utils_1 = require("./utils");
+const url_service_1 = require("../../services/url.service");
+const config_1 = require("@n8n/config");
 let WorkflowStatusController = class WorkflowStatusController {
-    constructor(credentialResolverWorkflowService) {
+    constructor(credentialResolverWorkflowService, urlService, globalConfig) {
         this.credentialResolverWorkflowService = credentialResolverWorkflowService;
+        this.urlService = urlService;
+        this.globalConfig = globalConfig;
     }
     async checkWorkflowForExecution(req, _res) {
         const workflowId = req.params['workflowId'];
-        const headerValue = req.headers['authorization']?.toString();
-        if (!headerValue) {
-            throw new unauthenticated_error_1.UnauthenticatedError();
-        }
-        const result = BEARER_TOKEN_REGEX.exec(headerValue);
-        const token = result ? result[1] : null;
-        if (!token) {
-            throw new bad_request_error_1.BadRequestError('Authorization header is malformed');
-        }
+        const token = (0, utils_1.getBearerToken)(req);
         if (!workflowId) {
             throw new bad_request_error_1.BadRequestError('Workflow ID is missing');
         }
         const status = await this.credentialResolverWorkflowService.getWorkflowStatus(workflowId, token);
         const isReady = status.every((s) => s.status === 'configured');
+        const basePath = this.urlService.getInstanceBaseUrl();
+        const restPath = this.globalConfig.endpoints.rest;
         const executionStatus = {
             workflowId,
             readyToExecute: isReady,
             credentials: status.map((s) => ({
                 credentialId: s.credentialId,
+                credentialName: s.credentialName,
                 credentialStatus: s.status,
                 credentialType: s.credentialType,
-                authorizationUrl: `/credentials/${s.credentialId}/authorize?resolverId=${encodeURIComponent(s.resolverId)}`,
+                authorizationUrl: `${basePath}/${restPath}/credentials/${s.credentialId}/authorize?resolverId=${encodeURIComponent(s.resolverId)}`,
             })),
         };
         return executionStatus;
@@ -57,6 +55,8 @@ __decorate([
 ], WorkflowStatusController.prototype, "checkWorkflowForExecution", null);
 exports.WorkflowStatusController = WorkflowStatusController = __decorate([
     (0, decorators_1.RestController)('/workflows'),
-    __metadata("design:paramtypes", [credential_resolver_workflow_service_1.CredentialResolverWorkflowService])
+    __metadata("design:paramtypes", [credential_resolver_workflow_service_1.CredentialResolverWorkflowService,
+        url_service_1.UrlService,
+        config_1.GlobalConfig])
 ], WorkflowStatusController);
 //# sourceMappingURL=workflow-status.controller.js.map

package/dist/modules/dynamic-credentials.ee/workflow-status.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"workflow-status.controller.js","sourceRoot":"","sources":["../../../src/modules/dynamic-credentials.ee/workflow-status.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gDAAsD;AAGtD,kFAA6E;AAC7E,0GAAoG;AAEpG,0FAAsF;AAEtF,MAAM,kBAAkB,GAAG,mCAAmC,CAAC;AAGxD,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IACpC,YACkB,iCAAoE;QAApE,sCAAiC,GAAjC,iCAAiC,CAAmC;IACnF,CAAC;IAYE,AAAN,KAAK,CAAC,yBAAyB,CAAC,GAAY,EAAE,IAAc;QAC3D,MAAM,UAAU,GAAG,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QAC5C,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,QAAQ,EAAE,CAAC;QAE7D,IAAI,CAAC,WAAW,EAAE,CAAC;YAClB,MAAM,IAAI,4CAAoB,EAAE,CAAC;QAClC,CAAC;QAED,MAAM,MAAM,GAAG,kBAAkB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACpD,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAExC,IAAI,CAAC,KAAK,EAAE,CAAC;YACZ,MAAM,IAAI,mCAAe,CAAC,mCAAmC,CAAC,CAAC;QAChE,CAAC;QAED,IAAI,CAAC,UAAU,EAAE,CAAC;YACjB,MAAM,IAAI,mCAAe,CAAC,wBAAwB,CAAC,CAAC;QACrD,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,iCAAiC,CAAC,iBAAiB,CAC5E,UAAU,EACV,KAAK,CACL,CAAC;QAEF,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,YAAY,CAAC,CAAC;QAE/D,MAAM,eAAe,GAA4B;YAChD,UAAU;YACV,cAAc,EAAE,OAAO;YACvB,WAAW,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBAC/B,YAAY,EAAE,CAAC,CAAC,YAAY;gBAC5B,gBAAgB,EAAE,CAAC,CAAC,MAAM;gBAC1B,cAAc,EAAE,CAAC,CAAC,cAAc;gBAChC,gBAAgB,EAAE,gBAAgB,CAAC,CAAC,YAAY,yBAAyB,kBAAkB,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE;aAC3G,CAAC,CAAC;SACH,CAAC;QACF,OAAO,eAAe,CAAC;IACxB,CAAC;CACD,CAAA;AArDY,4DAAwB;AAe9B;IADL,IAAA,gBAAG,EAAC,+BAA+B,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;;;yEAsCxD;mCApDW,wBAAwB;IADpC,IAAA,2BAAc,EAAC,YAAY,CAAC;qCAGyB,wEAAiC;GAF1E,wBAAwB,CAqDpC"}
+{"version":3,"file":"workflow-status.controller.js","sourceRoot":"","sources":["../../../src/modules/dynamic-credentials.ee/workflow-status.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gDAAsD;AAGtD,kFAA6E;AAC7E,0GAAoG;AAEpG,mCAAyC;AACzC,wDAAoD;AACpD,wCAA2C;AAGpC,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IACpC,YACkB,iCAAoE,EACpE,UAAsB,EACtB,YAA0B;QAF1B,sCAAiC,GAAjC,iCAAiC,CAAmC;QACpE,eAAU,GAAV,UAAU,CAAY;QACtB,iBAAY,GAAZ,YAAY,CAAc;IACzC,CAAC;IAYE,AAAN,KAAK,CAAC,yBAAyB,CAAC,GAAY,EAAE,IAAc;QAC3D,MAAM,UAAU,GAAG,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QAC5C,MAAM,KAAK,GAAG,IAAA,sBAAc,EAAC,GAAG,CAAC,CAAC;QAElC,IAAI,CAAC,UAAU,EAAE,CAAC;YACjB,MAAM,IAAI,mCAAe,CAAC,wBAAwB,CAAC,CAAC;QACrD,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,iCAAiC,CAAC,iBAAiB,CAC5E,UAAU,EACV,KAAK,CACL,CAAC;QAEF,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,YAAY,CAAC,CAAC;QAE/D,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,kBAAkB,EAAE,CAAC;QACtD,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC;QAElD,MAAM,eAAe,GAA4B;YAChD,UAAU;YACV,cAAc,EAAE,OAAO;YACvB,WAAW,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBAC/B,YAAY,EAAE,CAAC,CAAC,YAAY;gBAC5B,cAAc,EAAE,CAAC,CAAC,cAAc;gBAChC,gBAAgB,EAAE,CAAC,CAAC,MAAM;gBAC1B,cAAc,EAAE,CAAC,CAAC,cAAc;gBAChC,gBAAgB,EAAE,GAAG,QAAQ,IAAI,QAAQ,gBAAgB,CAAC,CAAC,YAAY,yBAAyB,kBAAkB,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE;aAClI,CAAC,CAAC;SACH,CAAC;QACF,OAAO,eAAe,CAAC;IACxB,CAAC;CACD,CAAA;AAhDY,4DAAwB;AAiB9B;IADL,IAAA,gBAAG,EAAC,+BAA+B,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;;;yEA+BxD;mCA/CW,wBAAwB;IADpC,IAAA,2BAAc,EAAC,YAAY,CAAC;qCAGyB,wEAAiC;QACxD,wBAAU;QACR,qBAAY;GAJhC,wBAAwB,CAgDpC"}

package/dist/modules/external-secrets.ee/external-secrets-manager.ee.d.ts

@@ -1,45 +1,36 @@
 import { Logger } from '@n8n/backend-common';
-import { SettingsRepository } from '@n8n/db';
-import { Cipher, type IExternalSecretsManager } from 'n8n-core';
+import { type IExternalSecretsManager } from 'n8n-core';
 import { type IDataObject } from 'n8n-workflow';
-import { ExternalSecretsProviders } from './external-secrets-providers.ee';
-import { ExternalSecretsConfig } from './external-secrets.config';
-import type { ExternalSecretsSettings, SecretsProvider, SecretsProviderSettings } from './types';
 import { EventService } from '../../events/event.service';
-import { License } from '../../license';
 import { Publisher } from '../../scaling/pubsub/publisher.service';
+import { ExternalSecretsProviders } from './external-secrets-providers.ee';
+import { ExternalSecretsConfig } from './external-secrets.config';
+import { ExternalSecretsProviderLifecycle } from './provider-lifecycle.service';
+import { ExternalSecretsProviderRegistry } from './provider-registry.service';
+import { ExternalSecretsRetryManager } from './retry-manager.service';
+import { ExternalSecretsSecretsCache } from './secrets-cache.service';
+import { ExternalSecretsSettingsStore } from './settings-store.service';
+import type { SecretsProvider, SecretsProviderSettings } from './types';
 export declare class ExternalSecretsManager implements IExternalSecretsManager {
     private readonly logger;
     private readonly config;
-    private readonly settingsRepo;
-    private readonly license;
-    private readonly secretsProviders;
-    private readonly cipher;
+    private readonly providersFactory;
     private readonly eventService;
     private readonly publisher;
-    private providers;
-    private initializingPromise?;
-    private cachedSettings;
+    private readonly settingsStore;
+    private readonly providerRegistry;
+    private readonly providerLifecycle;
+    private readonly retryManager;
+    private readonly secretsCache;
     initialized: boolean;
-    updateInterval?: NodeJS.Timeout;
-    initRetryTimeouts: Record<string, NodeJS.Timeout>;
-    constructor(logger: Logger, config: ExternalSecretsConfig, settingsRepo: SettingsRepository, license: License, secretsProviders: ExternalSecretsProviders, cipher: Cipher, eventService: EventService, publisher: Publisher);
+    private refreshInterval?;
+    private initializingPromise?;
+    constructor(logger: Logger, config: ExternalSecretsConfig, providersFactory: ExternalSecretsProviders, eventService: EventService, publisher: Publisher, settingsStore: ExternalSecretsSettingsStore, providerRegistry: ExternalSecretsProviderRegistry, providerLifecycle: ExternalSecretsProviderLifecycle, retryManager: ExternalSecretsRetryManager, secretsCache: ExternalSecretsSecretsCache);
     init(): Promise<void>;
     shutdown(): void;
-    reloadAllProviders(backoff?: number): Promise<void>;
-    private broadcastReloadExternalSecretsProviders;
-    getDecryptedSettings(): Promise<ExternalSecretsSettings | null>;
-    private internalInit;
-    private initProvider;
-    private retryInitWithBackoff;
-    updateSecrets(): Promise<void>;
     getProvider(provider: string): SecretsProvider | undefined;
     hasProvider(provider: string): boolean;
     getProviderNames(): string[];
-    getSecret(provider: string, name: string): unknown;
-    hasSecret(provider: string, name: string): boolean;
-    getSecretNames(provider: string): string[];
-    getAllSecretNames(): Record<string, string[]>;
     getProvidersWithSettings(): Array<{
         provider: SecretsProvider;
         settings: SecretsProviderSettings;
@@ -48,16 +39,30 @@ export declare class ExternalSecretsManager implements IExternalSecretsManager {
         provider: SecretsProvider;
         settings: SecretsProviderSettings;
     };
-    reloadProvider(provider: string, backoff?: number): Promise<void>;
-    setProviderSettings(provider: string, data: IDataObject, userId?: string): Promise<void>;
+    updateProvider(provider: string): Promise<void>;
+    getSecret(provider: string, name: string): unknown;
+    hasSecret(provider: string, name: string): boolean;
+    getSecretNames(provider: string): string[];
+    getAllSecretNames(): Record<string, string[]>;
+    setProviderSettings(provider: string, settings: IDataObject, userId?: string): Promise<void>;
     setProviderConnected(provider: string, connected: boolean): Promise<void>;
-    private trackProviderSave;
-    private encryptSecretsSettings;
-    saveAndSetSettings(settings: ExternalSecretsSettings): Promise<void>;
     testProviderSettings(provider: string, data: IDataObject): Promise<{
         success: boolean;
-        testState: 'connected' | 'tested' | 'error';
-        error?: string;
+        testState: string;
+    } | {
+        success: boolean;
+        testState: "error" | "connected" | "tested";
+        error: string | undefined;
     }>;
-    updateProvider(provider: string): Promise<boolean>;
+    reloadAllProviders(): Promise<void>;
+    private addProvider;
+    private connectProvider;
+    private reloadProvider;
+    updateSecrets(): Promise<void>;
+    private startSecretsRefresh;
+    private stopSecretsRefresh;
+    private broadcastReload;
+    private trackProviderSave;
+    private determineTestState;
+    private getCachedSettings;
 }