n8n 2.3.2 → 2.4.0

package/dist/modules/chat-hub/stream-capturer.js

@@ -5,22 +5,55 @@ exports.createStructuredChunkAggregator = createStructuredChunkAggregator;
 const uuid_1 = require("uuid");
 function interceptResponseWrites(res, transform) {
     const originalWrite = res.write.bind(res);
+    const originalEnd = res.end.bind(res);
     const defaultEncoding = 'utf8';
+    let writeChain = Promise.resolve();
     const toText = (data, enc) => Buffer.isBuffer(data) ? data.toString(enc ?? defaultEncoding) : String(data);
     function write(chunk, encodingOrCallback, callbackFn) {
         const inputText = toText(chunk, typeof encodingOrCallback === 'string' ? encodingOrCallback : undefined);
-        const outputText = transform(inputText);
-        if (!encodingOrCallback) {
-            return originalWrite(outputText);
-        }
-        else if (typeof encodingOrCallback === 'function') {
-            return originalWrite(outputText, encodingOrCallback);
-        }
-        else {
-            return originalWrite(outputText, encodingOrCallback, callbackFn);
-        }
+        writeChain = writeChain
+            .then(async () => await transform(inputText))
+            .then((outputText) => {
+            if (!encodingOrCallback) {
+                originalWrite(outputText);
+            }
+            else if (typeof encodingOrCallback === 'function') {
+                originalWrite(outputText, encodingOrCallback);
+            }
+            else {
+                originalWrite(outputText, encodingOrCallback, callbackFn);
+            }
+        })
+            .catch((error) => {
+            const originalCb = typeof encodingOrCallback === 'function' ? encodingOrCallback : callbackFn;
+            if (originalCb) {
+                originalCb(error);
+            }
+        });
+        return true;
+    }
+    function end(chunkOrCallback, encodingOrCallback, callbackFn) {
+        void writeChain.then(() => {
+            if (!chunkOrCallback) {
+                originalEnd();
+            }
+            else if (typeof chunkOrCallback === 'function') {
+                originalEnd(chunkOrCallback);
+            }
+            else if (!encodingOrCallback) {
+                originalEnd(chunkOrCallback);
+            }
+            else if (typeof encodingOrCallback === 'function') {
+                originalEnd(chunkOrCallback, encodingOrCallback);
+            }
+            else {
+                originalEnd(chunkOrCallback, encodingOrCallback, callbackFn);
+            }
+        });
+        return res;
     }
     res.write = write;
+    res.end = end;
     return res;
 }
 const keyOf = (m) => `${m.nodeId}|${m.runIndex}|${m.itemIndex}`;
@@ -29,7 +62,7 @@ function createStructuredChunkAggregator(initialPreviousMessageId, retryOfMessag
     const active = new Map();
     const activeByKey = new Map();
     let previousMessageId = initialPreviousMessageId;
-    const startNew = () => {
+    const startNew = async () => {
         const message = {
             id: (0, uuid_1.v4)(),
             previousMessageId,
@@ -42,52 +75,52 @@ function createStructuredChunkAggregator(initialPreviousMessageId, retryOfMessag
             status: 'running',
         };
         previousMessageId = message.id;
-        onBegin?.(message);
+        await onBegin?.(message);
         return message;
     };
-    const ensureMessage = (key) => {
+    const ensureMessage = async (key) => {
         let message = activeByKey.get(key);
         if (!message) {
-            message = startNew();
+            message = await startNew();
             activeByKey.set(key, message);
         }
         return message;
     };
-    const ingest = (chunk) => {
+    const ingest = async (chunk) => {
         const { type, content, metadata } = chunk;
         const key = keyOf(metadata);
         if (type === 'begin') {
             if (activeByKey.has(key)) {
                 throw new Error(`Duplicate begin for key ${key}`);
             }
-            const message = startNew();
+            const message = await startNew();
             activeByKey.set(key, message);
             return message;
         }
         if (type === 'item') {
-            const message = ensureMessage(key);
+            const message = await ensureMessage(key);
             if (typeof content === 'string' && content.length) {
                 message.content += content;
-                onItem?.(message, content);
+                await onItem?.(message, content);
             }
             return message;
         }
         if (type === 'end') {
-            const message = ensureMessage(key);
+            const message = await ensureMessage(key);
             message.status = 'success';
             message.updatedAt = new Date();
             activeByKey.delete(key);
-            onEnd?.(message);
+            await onEnd?.(message);
             return message;
         }
-        const message = ensureMessage(key);
+        const message = await ensureMessage(key);
         message.status = 'error';
         message.updatedAt = new Date();
         if (typeof content === 'string') {
             message.content = (message.content ? message.content + '\n\n' : '') + content;
         }
         activeByKey.delete(key);
-        onError?.(message, content);
+        await onError?.(message, content);
         return message;
     };
     const finalizeAll = () => {

package/dist/modules/chat-hub/stream-capturer.js.map

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

package/dist/modules/dynamic-credentials.ee/credential-resolvers/oauth-credential-resolver.d.ts

@@ -96,6 +96,7 @@ export declare class OAuthCredentialResolver implements ICredentialResolver {
     getSecret(credentialId: string, context: ICredentialContext, handle: CredentialResolverHandle): Promise<ICredentialDataDecryptedObject>;
     setSecret(credentialId: string, context: ICredentialContext, data: ICredentialDataDecryptedObject, handle: CredentialResolverHandle): Promise<void>;
     deleteSecret(credentialId: string, context: ICredentialContext, handle: CredentialResolverHandle): Promise<void>;
+    deleteAllSecrets(handle: CredentialResolverHandle): Promise<void>;
     private parseOptions;
     validateOptions(options: CredentialResolverConfiguration): Promise<void>;
     private getIdentifier;

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

@@ -134,6 +134,9 @@ let OAuthCredentialResolver = class OAuthCredentialResolver {
         const key = await this.resolveIdentifier(context, parsedOptions);
         await this.storage.deleteCredentialData(credentialId, key, handle.resolverId, parsedOptions);
     }
+    async deleteAllSecrets(handle) {
+        await this.storage.deleteAllCredentialData(handle);
+    }
     async parseOptions(options) {
         const result = await OAuthCredentialResolverOptionsSchema.safeParseAsync(options);
         if (result.error) {

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/credential-resolvers/storage/dynamic-credential-entry-storage.d.ts

@@ -1,9 +1,11 @@
 import { ICredentialEntriesStorage } from './storage-interface';
 import { DynamicCredentialEntryRepository } from '../../database/repositories/dynamic-credential-entry.repository';
+import { CredentialResolverHandle } from '@n8n/decorators';
 export declare class DynamicCredentialEntryStorage implements ICredentialEntriesStorage {
     private readonly dynamicCredentialEntryRepository;
     constructor(dynamicCredentialEntryRepository: DynamicCredentialEntryRepository);
     getCredentialData(credentialId: string, subjectId: string, resolverId: string, _: Record<string, unknown>): Promise<string | null>;
     setCredentialData(credentialId: string, subjectId: string, resolverId: string, data: string, _: Record<string, unknown>): Promise<void>;
     deleteCredentialData(credentialId: string, subjectId: string, resolverId: string, _: Record<string, unknown>): Promise<void>;
+    deleteAllCredentialData(handle: CredentialResolverHandle): Promise<void>;
 }

package/dist/modules/dynamic-credentials.ee/credential-resolvers/storage/dynamic-credential-entry-storage.js

@@ -47,6 +47,9 @@ let DynamicCredentialEntryStorage = class DynamicCredentialEntryStorage {
             resolverId,
         });
     }
+    async deleteAllCredentialData(handle) {
+        await this.dynamicCredentialEntryRepository.delete({ resolverId: handle.resolverId });
+    }
 };
 exports.DynamicCredentialEntryStorage = DynamicCredentialEntryStorage;
 exports.DynamicCredentialEntryStorage = DynamicCredentialEntryStorage = __decorate([

package/dist/modules/dynamic-credentials.ee/credential-resolvers/storage/dynamic-credential-entry-storage.js.map

@@ -1 +1 @@
-{"version":3,"file":"dynamic-credential-entry-storage.js","sourceRoot":"","sources":["../../../../../src/modules/dynamic-credentials.ee/credential-resolvers/storage/dynamic-credential-entry-storage.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAAkC;AAGlC,+FAA0F;AAC1F,yHAAmH;AAG5G,IAAM,6BAA6B,GAAnC,MAAM,6BAA6B;IACzC,YACkB,gCAAkE;QAAlE,qCAAgC,GAAhC,gCAAgC,CAAkC;IACjF,CAAC;IAEJ,KAAK,CAAC,iBAAiB,CACtB,YAAoB,EACpB,SAAiB,EACjB,UAAkB,EAClB,CAA0B;QAE1B,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,gCAAgC,CAAC,OAAO,CAAC;YACjE,KAAK,EAAE;gBACN,YAAY;gBACZ,SAAS;gBACT,UAAU;aACV;SACD,CAAC,CAAC;QAEH,OAAO,KAAK,EAAE,IAAI,IAAI,IAAI,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,iBAAiB,CACtB,YAAoB,EACpB,SAAiB,EACjB,UAAkB,EAClB,IAAY,EACZ,CAA0B;QAE1B,IAAI,KAAK,GAAG,MAAM,IAAI,CAAC,gCAAgC,CAAC,OAAO,CAAC;YAC/D,KAAK,EAAE,EAAE,YAAY,EAAE,SAAS,EAAE,UAAU,EAAE;SAC9C,CAAC,CAAC;QAEH,IAAI,CAAC,KAAK,EAAE,CAAC;YACZ,KAAK,GAAG,IAAI,iDAAsB,EAAE,CAAC;YACrC,KAAK,CAAC,YAAY,GAAG,YAAY,CAAC;YAClC,KAAK,CAAC,SAAS,GAAG,SAAS,CAAC;YAC5B,KAAK,CAAC,UAAU,GAAG,UAAU,CAAC;QAC/B,CAAC;QAED,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC;QAClB,MAAM,IAAI,CAAC,gCAAgC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,oBAAoB,CACzB,YAAoB,EACpB,SAAiB,EACjB,UAAkB,EAClB,CAA0B;QAE1B,MAAM,IAAI,CAAC,gCAAgC,CAAC,MAAM,CAAC;YAClD,YAAY;YACZ,SAAS;YACT,UAAU;SACV,CAAC,CAAC;IACJ,CAAC;CACD,CAAA;AAxDY,sEAA6B;wCAA7B,6BAA6B;IADzC,IAAA,YAAO,GAAE;qCAG2C,sEAAgC;GAFxE,6BAA6B,CAwDzC"}
+{"version":3,"file":"dynamic-credential-entry-storage.js","sourceRoot":"","sources":["../../../../../src/modules/dynamic-credentials.ee/credential-resolvers/storage/dynamic-credential-entry-storage.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAAkC;AAGlC,+FAA0F;AAC1F,yHAAmH;AAI5G,IAAM,6BAA6B,GAAnC,MAAM,6BAA6B;IACzC,YACkB,gCAAkE;QAAlE,qCAAgC,GAAhC,gCAAgC,CAAkC;IACjF,CAAC;IAEJ,KAAK,CAAC,iBAAiB,CACtB,YAAoB,EACpB,SAAiB,EACjB,UAAkB,EAClB,CAA0B;QAE1B,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,gCAAgC,CAAC,OAAO,CAAC;YACjE,KAAK,EAAE;gBACN,YAAY;gBACZ,SAAS;gBACT,UAAU;aACV;SACD,CAAC,CAAC;QAEH,OAAO,KAAK,EAAE,IAAI,IAAI,IAAI,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,iBAAiB,CACtB,YAAoB,EACpB,SAAiB,EACjB,UAAkB,EAClB,IAAY,EACZ,CAA0B;QAE1B,IAAI,KAAK,GAAG,MAAM,IAAI,CAAC,gCAAgC,CAAC,OAAO,CAAC;YAC/D,KAAK,EAAE,EAAE,YAAY,EAAE,SAAS,EAAE,UAAU,EAAE;SAC9C,CAAC,CAAC;QAEH,IAAI,CAAC,KAAK,EAAE,CAAC;YACZ,KAAK,GAAG,IAAI,iDAAsB,EAAE,CAAC;YACrC,KAAK,CAAC,YAAY,GAAG,YAAY,CAAC;YAClC,KAAK,CAAC,SAAS,GAAG,SAAS,CAAC;YAC5B,KAAK,CAAC,UAAU,GAAG,UAAU,CAAC;QAC/B,CAAC;QAED,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC;QAClB,MAAM,IAAI,CAAC,gCAAgC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,oBAAoB,CACzB,YAAoB,EACpB,SAAiB,EACjB,UAAkB,EAClB,CAA0B;QAE1B,MAAM,IAAI,CAAC,gCAAgC,CAAC,MAAM,CAAC;YAClD,YAAY;YACZ,SAAS;YACT,UAAU;SACV,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,MAAgC;QAC7D,MAAM,IAAI,CAAC,gCAAgC,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC;IACvF,CAAC;CACD,CAAA;AA5DY,sEAA6B;wCAA7B,6BAA6B;IADzC,IAAA,YAAO,GAAE;qCAG2C,sEAAgC;GAFxE,6BAA6B,CA4DzC"}

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

@@ -7,9 +7,9 @@ export declare class CredentialResolversController {
     constructor(service: DynamicCredentialResolverService);
     listResolvers(_req: AuthenticatedRequest, _res: Response): Promise<CredentialResolver[]>;
     listResolverTypes(_req: AuthenticatedRequest, _res: Response): CredentialResolverType[];
-    createResolver(_req: AuthenticatedRequest, _res: Response, dto: CreateCredentialResolverDto): Promise<CredentialResolver>;
+    createResolver(req: AuthenticatedRequest, _res: Response, dto: CreateCredentialResolverDto): Promise<CredentialResolver>;
     getResolver(_req: AuthenticatedRequest, _res: Response, id: string): Promise<CredentialResolver>;
-    updateResolver(_req: AuthenticatedRequest, _res: Response, id: string, dto: UpdateCredentialResolverDto): Promise<CredentialResolver>;
+    updateResolver(req: AuthenticatedRequest, _res: Response, id: string, dto: UpdateCredentialResolverDto): Promise<CredentialResolver>;
     deleteResolver(_req: AuthenticatedRequest, _res: Response, id: string): Promise<{
         success: true;
     }>;

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

@@ -15,11 +15,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CredentialResolversController = void 0;
 const api_types_1 = require("@n8n/api-types");
 const decorators_1 = require("@n8n/decorators");
+const credential_resolver_not_found_error_1 = require("./errors/credential-resolver-not-found.error");
+const credential_resolver_service_1 = require("./services/credential-resolver.service");
 const bad_request_error_1 = require("../../errors/response-errors/bad-request.error");
 const internal_server_error_1 = require("../../errors/response-errors/internal-server.error");
 const not_found_error_1 = require("../../errors/response-errors/not-found.error");
-const credential_resolver_not_found_error_1 = require("./errors/credential-resolver-not-found.error");
-const credential_resolver_service_1 = require("./services/credential-resolver.service");
 let CredentialResolversController = class CredentialResolversController {
     constructor(service) {
         this.service = service;
@@ -47,12 +47,13 @@ let CredentialResolversController = class CredentialResolversController {
             throw e;
         }
     }
-    async createResolver(_req, _res, dto) {
+    async createResolver(req, _res, dto) {
         try {
             const createdResolver = await this.service.create({
                 name: dto.name,
                 type: dto.type,
                 config: dto.config,
+                user: req.user,
             });
             return api_types_1.credentialResolverSchema.parse(createdResolver);
         }
@@ -80,12 +81,14 @@ let CredentialResolversController = class CredentialResolversController {
             throw e;
         }
     }
-    async updateResolver(_req, _res, id, dto) {
+    async updateResolver(req, _res, id, dto) {
         try {
             return api_types_1.credentialResolverSchema.parse(await this.service.update(id, {
                 type: dto.type,
                 name: dto.name,
                 config: dto.config,
+                clearCredentials: dto.clearCredentials,
+                user: req.user,
             }));
         }
         catch (e) {

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

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

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

@@ -1,25 +1,31 @@
 import { Logger } from '@n8n/backend-common';
+import { User } from '@n8n/db';
 import { CredentialResolverConfiguration, ICredentialResolver } from '@n8n/decorators';
 import { Cipher } from 'n8n-core';
 import { DynamicCredentialResolverRegistry } from './credential-resolver-registry.service';
+import { ResolverConfigExpressionService } from './resolver-config-expression.service';
 import { DynamicCredentialResolver } from '../database/entities/credential-resolver';
 import { DynamicCredentialResolverRepository } from '../database/repositories/credential-resolver.repository';
 export interface CreateResolverParams {
     name: string;
     type: string;
     config: CredentialResolverConfiguration;
+    user: User;
 }
 export interface UpdateResolverParams {
     name?: string;
     type?: string;
     config?: CredentialResolverConfiguration;
+    clearCredentials?: boolean;
+    user: User;
 }
 export declare class DynamicCredentialResolverService {
     private readonly logger;
     private readonly repository;
     private readonly registry;
     private readonly cipher;
-    constructor(logger: Logger, repository: DynamicCredentialResolverRepository, registry: DynamicCredentialResolverRegistry, cipher: Cipher);
+    private readonly expressionService;
+    constructor(logger: Logger, repository: DynamicCredentialResolverRepository, registry: DynamicCredentialResolverRegistry, cipher: Cipher, expressionService: ResolverConfigExpressionService);
     create(params: CreateResolverParams): Promise<DynamicCredentialResolver>;
     findAll(): Promise<DynamicCredentialResolver[]>;
     getAvailableTypes(): ICredentialResolver[];

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

@@ -13,21 +13,25 @@ exports.DynamicCredentialResolverService = void 0;
 const backend_common_1 = require("@n8n/backend-common");
 const decorators_1 = require("@n8n/decorators");
 const di_1 = require("@n8n/di");
+const permissions_1 = require("@n8n/permissions");
 const n8n_core_1 = require("n8n-core");
 const n8n_workflow_1 = require("n8n-workflow");
 const credential_resolver_registry_service_1 = require("./credential-resolver-registry.service");
+const resolver_config_expression_service_1 = require("./resolver-config-expression.service");
 const credential_resolver_repository_1 = require("../database/repositories/credential-resolver.repository");
 const credential_resolver_not_found_error_1 = require("../errors/credential-resolver-not-found.error");
 let DynamicCredentialResolverService = class DynamicCredentialResolverService {
-    constructor(logger, repository, registry, cipher) {
+    constructor(logger, repository, registry, cipher, expressionService) {
         this.logger = logger;
         this.repository = repository;
         this.registry = registry;
         this.cipher = cipher;
+        this.expressionService = expressionService;
         this.logger = this.logger.scoped('dynamic-credentials');
     }
     async create(params) {
-        await this.validateConfig(params.type, params.config);
+        const canUseExternalSecrets = (0, permissions_1.hasGlobalScope)(params.user, 'externalSecret:list');
+        await this.validateConfig(params.type, params.config, canUseExternalSecrets);
         const encryptedConfig = this.encryptConfig(params.config);
         const resolver = this.repository.create({
             name: params.name,
@@ -57,20 +61,34 @@ let DynamicCredentialResolverService = class DynamicCredentialResolverService {
         if (!existing) {
             throw new credential_resolver_not_found_error_1.DynamicCredentialResolverNotFoundError(id);
         }
+        const canUseExternalSecrets = (0, permissions_1.hasGlobalScope)(params.user, 'externalSecret:list');
         if (params.type !== undefined) {
             existing.type = params.type;
             if (params.config === undefined) {
                 const existingConfig = this.decryptConfig(existing.config);
-                await this.validateConfig(existing.type, existingConfig);
+                await this.validateConfig(existing.type, existingConfig, canUseExternalSecrets);
             }
         }
         if (params.config !== undefined) {
-            await this.validateConfig(existing.type, params.config);
+            await this.validateConfig(existing.type, params.config, canUseExternalSecrets);
             existing.config = this.encryptConfig(params.config);
         }
         if (params.name !== undefined) {
             existing.name = params.name;
         }
+        if (params.clearCredentials === true) {
+            const resolver = this.registry.getResolverByTypename(existing.type);
+            if (!resolver) {
+                throw new decorators_1.CredentialResolverValidationError(`Unknown resolver type: ${existing.type}`);
+            }
+            if ('deleteAllSecrets' in resolver && typeof resolver.deleteAllSecrets === 'function') {
+                await resolver.deleteAllSecrets({
+                    resolverId: id,
+                    resolverName: resolver.metadata.name,
+                    configuration: this.decryptConfig(existing.config),
+                });
+            }
+        }
         const saved = await this.repository.save(existing);
         this.logger.debug(`Updated credential resolver "${saved.name}" (${saved.id})`);
         return this.withDecryptedConfig(saved);
@@ -83,12 +101,19 @@ let DynamicCredentialResolverService = class DynamicCredentialResolverService {
         await this.repository.remove(existing);
         this.logger.debug(`Deleted credential resolver "${existing.name}" (${id})`);
     }
-    async validateConfig(type, config) {
+    async validateConfig(type, config, canUseExternalSecrets = false) {
         const resolverImplementation = this.registry.getResolverByTypename(type);
         if (!resolverImplementation) {
             throw new decorators_1.CredentialResolverValidationError(`Unknown resolver type: ${type}`);
         }
-        await resolverImplementation.validateOptions(config);
+        let resolvedConfig = config;
+        try {
+            resolvedConfig = await this.expressionService.resolve(config, canUseExternalSecrets ?? false);
+        }
+        catch (error) {
+            throw new decorators_1.CredentialResolverValidationError(`Invalid expression in resolver config: ${error instanceof Error ? error.message : String(error)}`);
+        }
+        await resolverImplementation.validateOptions(resolvedConfig);
     }
     encryptConfig(config) {
         return this.cipher.encrypt(config);
@@ -113,6 +138,7 @@ exports.DynamicCredentialResolverService = DynamicCredentialResolverService = __
     __metadata("design:paramtypes", [backend_common_1.Logger,
         credential_resolver_repository_1.DynamicCredentialResolverRepository,
         credential_resolver_registry_service_1.DynamicCredentialResolverRegistry,
-        n8n_core_1.Cipher])
+        n8n_core_1.Cipher,
+        resolver_config_expression_service_1.ResolverConfigExpressionService])
 ], DynamicCredentialResolverService);
 //# sourceMappingURL=credential-resolver.service.js.map

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

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

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

@@ -1,10 +1,10 @@
-import type { CredentialStoreMetadata, IDynamicCredentialStorageProvider } from '../../../credentials/dynamic-credential-storage.interface';
+import { Logger } from '@n8n/backend-common';
+import { Cipher } from 'n8n-core';
 import { type ICredentialContext, type ICredentialDataDecryptedObject, type IWorkflowSettings } from 'n8n-workflow';
 import { DynamicCredentialResolverRegistry } from './credential-resolver-registry.service';
 import { DynamicCredentialResolverRepository } from '../database/repositories/credential-resolver.repository';
-import { Cipher } from 'n8n-core';
+import type { CredentialStoreMetadata, IDynamicCredentialStorageProvider } from '../../../credentials/dynamic-credential-storage.interface';
 import { LoadNodesAndCredentials } from '../../../load-nodes-and-credentials';
-import { Logger } from '@n8n/backend-common';
 export declare class DynamicCredentialStorageService implements IDynamicCredentialStorageProvider {
     private readonly resolverRegistry;
     private readonly resolverRepository;

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

@@ -10,15 +10,15 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DynamicCredentialStorageService = void 0;
+const backend_common_1 = require("@n8n/backend-common");
+const di_1 = require("@n8n/di");
+const n8n_core_1 = require("n8n-core");
 const n8n_workflow_1 = require("n8n-workflow");
 const credential_resolver_registry_service_1 = require("./credential-resolver-registry.service");
+const shared_fields_1 = require("./shared-fields");
 const credential_resolver_repository_1 = require("../database/repositories/credential-resolver.repository");
-const n8n_core_1 = require("n8n-core");
 const credential_storage_error_1 = require("../errors/credential-storage.error");
 const load_nodes_and_credentials_1 = require("../../../load-nodes-and-credentials");
-const backend_common_1 = require("@n8n/backend-common");
-const di_1 = require("@n8n/di");
-const shared_fields_1 = require("./shared-fields");
 let DynamicCredentialStorageService = class DynamicCredentialStorageService {
     constructor(resolverRegistry, resolverRepository, loadNodesAndCredentials, cipher, logger) {
         this.resolverRegistry = resolverRegistry;

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

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

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

@@ -3,6 +3,7 @@ import { Cipher } from 'n8n-core';
 import type { ICredentialDataDecryptedObject, IExecutionContext, IWorkflowSettings } from 'n8n-workflow';
 import { LoadNodesAndCredentials } from '../../../load-nodes-and-credentials';
 import { DynamicCredentialResolverRegistry } from './credential-resolver-registry.service';
+import { ResolverConfigExpressionService } from './resolver-config-expression.service';
 import type { CredentialResolveMetadata, ICredentialResolutionProvider } from '../../../credentials/credential-resolution-provider.interface';
 import { DynamicCredentialResolverRepository } from '../database/repositories/credential-resolver.repository';
 export declare class DynamicCredentialService implements ICredentialResolutionProvider {
@@ -11,8 +12,9 @@ export declare class DynamicCredentialService implements ICredentialResolutionPr
     private readonly loadNodesAndCredentials;
     private readonly cipher;
     private readonly logger;
-    constructor(resolverRegistry: DynamicCredentialResolverRegistry, resolverRepository: DynamicCredentialResolverRepository, loadNodesAndCredentials: LoadNodesAndCredentials, cipher: Cipher, logger: Logger);
-    resolveIfNeeded(credentialsResolveMetadata: CredentialResolveMetadata, staticData: ICredentialDataDecryptedObject, executionContext?: IExecutionContext, workflowSettings?: IWorkflowSettings): Promise<ICredentialDataDecryptedObject>;
+    private readonly expressionService;
+    constructor(resolverRegistry: DynamicCredentialResolverRegistry, resolverRepository: DynamicCredentialResolverRepository, loadNodesAndCredentials: LoadNodesAndCredentials, cipher: Cipher, logger: Logger, expressionService: ResolverConfigExpressionService);
+    resolveIfNeeded(credentialsResolveMetadata: CredentialResolveMetadata, staticData: ICredentialDataDecryptedObject, executionContext?: IExecutionContext, workflowSettings?: IWorkflowSettings, canUseExternalSecrets?: boolean): Promise<ICredentialDataDecryptedObject>;
     private buildCredentialContext;
     private handleResolutionError;
     private handleMissingResolver;

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

@@ -17,18 +17,20 @@ const n8n_core_1 = require("n8n-core");
 const n8n_workflow_1 = require("n8n-workflow");
 const load_nodes_and_credentials_1 = require("../../../load-nodes-and-credentials");
 const credential_resolver_registry_service_1 = require("./credential-resolver-registry.service");
+const resolver_config_expression_service_1 = require("./resolver-config-expression.service");
 const shared_fields_1 = require("./shared-fields");
 const credential_resolver_repository_1 = require("../database/repositories/credential-resolver.repository");
 const credential_resolution_error_1 = require("../errors/credential-resolution.error");
 let DynamicCredentialService = class DynamicCredentialService {
-    constructor(resolverRegistry, resolverRepository, loadNodesAndCredentials, cipher, logger) {
+    constructor(resolverRegistry, resolverRepository, loadNodesAndCredentials, cipher, logger, expressionService) {
         this.resolverRegistry = resolverRegistry;
         this.resolverRepository = resolverRepository;
         this.loadNodesAndCredentials = loadNodesAndCredentials;
         this.cipher = cipher;
         this.logger = logger;
+        this.expressionService = expressionService;
     }
-    async resolveIfNeeded(credentialsResolveMetadata, staticData, executionContext, workflowSettings) {
+    async resolveIfNeeded(credentialsResolveMetadata, staticData, executionContext, workflowSettings, canUseExternalSecrets) {
         const resolverId = credentialsResolveMetadata.resolverId ?? workflowSettings?.credentialResolverId;
         if (!credentialsResolveMetadata.isResolvable || !resolverId) {
             return staticData;
@@ -51,7 +53,8 @@ let DynamicCredentialService = class DynamicCredentialService {
             const credentialType = this.loadNodesAndCredentials.getCredential(credentialsResolveMetadata.type);
             const sharedFields = (0, shared_fields_1.extractSharedFields)(credentialType.type);
             const decryptedConfig = this.cipher.decrypt(resolverEntity.config);
-            const resolverConfig = (0, n8n_workflow_1.jsonParse)(decryptedConfig);
+            const parsedConfig = (0, n8n_workflow_1.jsonParse)(decryptedConfig);
+            const resolverConfig = await this.expressionService.resolve(parsedConfig, canUseExternalSecrets ?? false);
             const dynamicData = await resolver.getSecret(credentialsResolveMetadata.id, credentialContext, {
                 resolverId: resolverEntity.id,
                 resolverName: resolverEntity.type,
@@ -141,6 +144,7 @@ exports.DynamicCredentialService = DynamicCredentialService = __decorate([
         credential_resolver_repository_1.DynamicCredentialResolverRepository,
         load_nodes_and_credentials_1.LoadNodesAndCredentials,
         n8n_core_1.Cipher,
-        backend_common_1.Logger])
+        backend_common_1.Logger,
+        resolver_config_expression_service_1.ResolverConfigExpressionService])
 ], DynamicCredentialService);
 //# sourceMappingURL=dynamic-credential.service.js.map