n8n 2.32.5 → 2.33.0

package/dist/modules/n8n-packages/spec/serialized/workflow.schema.js

@@ -11,7 +11,7 @@ const nodeSchema = zod_1.z.object({
     id: zod_1.z.string().min(1),
     name: zod_1.z.string().min(1),
     type: zod_1.z.string().min(1),
-    typeVersion: zod_1.z.number(),
+    typeVersion: zod_1.z.number().finite(),
     position: zod_1.z.tuple([zod_1.z.number(), zod_1.z.number()]),
     parameters: zod_1.z.record(zod_1.z.unknown()),
     credentials: zod_1.z.record(credentialReferenceSchema).optional(),

package/dist/modules/n8n-packages/spec/serialized/workflow.schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"workflow.schema.js","sourceRoot":"","sources":["../../../../../src/modules/n8n-packages/spec/serialized/workflow.schema.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AAKxB,MAAM,yBAAyB,GAAG,OAAC,CAAC,MAAM,CAAC;IAC1C,EAAE,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACzB,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE;IAChB,kBAAkB,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;CAC1C,CAAC,CAAC;AAEH,MAAM,UAAU,GAAG,OAAC,CAAC,MAAM,CAAC;IAC3B,EAAE,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACrB,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACvB,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACvB,WAAW,EAAE,OAAC,CAAC,MAAM,EAAE;IACvB,QAAQ,EAAE,OAAC,CAAC,KAAK,CAAC,CAAC,OAAC,CAAC,MAAM,EAAE,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,CAAC;IAC3C,UAAU,EAAE,OAAC,CAAC,MAAM,CAAC,OAAC,CAAC,OAAO,EAAE,CAAC;IACjC,WAAW,EAAE,OAAC,CAAC,MAAM,CAAC,yBAAyB,CAAC,CAAC,QAAQ,EAAE;IAC3D,QAAQ,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IAChC,KAAK,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC5B,WAAW,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IACnC,cAAc,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IACtC,WAAW,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IACnC,QAAQ,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC/B,gBAAgB,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACvC,gBAAgB,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IACxC,WAAW,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IACnC,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC9B,SAAS,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAChC,CAAC,CAAC;AAGH,MAAM,oBAAoB,GAAG,OAAC,CAAC,MAAM,CAAC;IACrC,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE;IAChB,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE;IAChB,KAAK,EAAE,OAAC,CAAC,MAAM,EAAE;CACjB,CAAC,CAAC;AAEH,MAAM,iBAAiB,GAAG,OAAC,CAAC,MAAM,CAAC,OAAC,CAAC,MAAM,CAAC,OAAC,CAAC,KAAK,CAAC,OAAC,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC;AAEnF,QAAA,wBAAwB,GAAG,OAAC,CAAC,MAAM,CAAC;IAChD,EAAE,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACrB,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACvB,KAAK,EAAE,OAAC,CAAC,KAAK,CAAC,UAAU,CAAC;IAC1B,WAAW,EAAE,iBAAiB;IAC9B,QAAQ,EAAE,OAAC,CAAC,MAAM,CAAC,OAAC,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,EAAE;IAC1C,SAAS,EAAE,OAAC,CAAC,MAAM,EAAE;IACrB,cAAc,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACrC,WAAW,EAAE,OAAC,CAAC,OAAO,EAAE;IACxB,UAAU,EAAE,OAAC,CAAC,OAAO,EAAE;CACvB,CAAC,CAAC"}
+{"version":3,"file":"workflow.schema.js","sourceRoot":"","sources":["../../../../../src/modules/n8n-packages/spec/serialized/workflow.schema.ts"],"names":[],"mappings":"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"}

package/dist/modules/oauth-server/database/repositories/oauth-access-token.repository.d.ts

@@ -1,5 +1,13 @@
-import { DataSource, Repository } from '@n8n/typeorm';
+import { BaseRepository, type OperationContext } from '@n8n/db';
+import { DataSource } from '@n8n/typeorm';
 import { AccessToken } from '../entities/oauth-access-token.entity';
-export declare class AccessTokenRepository extends Repository<AccessToken> {
+type NewAccessToken = {
+    token: string;
+    clientId: string;
+    userId: string;
+};
+export declare class AccessTokenRepository extends BaseRepository<AccessToken> {
     constructor(dataSource: DataSource);
+    insertToken(token: NewAccessToken, ctx: OperationContext): Promise<void>;
 }
+export {};

package/dist/modules/oauth-server/database/repositories/oauth-access-token.repository.js

@@ -10,13 +10,17 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AccessTokenRepository = void 0;
+const db_1 = require("@n8n/db");
 const di_1 = require("@n8n/di");
 const typeorm_1 = require("@n8n/typeorm");
 const oauth_access_token_entity_1 = require("../entities/oauth-access-token.entity");
-let AccessTokenRepository = class AccessTokenRepository extends typeorm_1.Repository {
+let AccessTokenRepository = class AccessTokenRepository extends db_1.BaseRepository {
     constructor(dataSource) {
         super(oauth_access_token_entity_1.AccessToken, dataSource.manager);
     }
+    async insertToken(token, ctx) {
+        await this.managerFor(ctx).insert(oauth_access_token_entity_1.AccessToken, token);
+    }
 };
 exports.AccessTokenRepository = AccessTokenRepository;
 exports.AccessTokenRepository = AccessTokenRepository = __decorate([

package/dist/modules/oauth-server/database/repositories/oauth-access-token.repository.js.map

@@ -1 +1 @@
-{"version":3,"file":"oauth-access-token.repository.js","sourceRoot":"","sources":["../../../../../src/modules/oauth-server/database/repositories/oauth-access-token.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAAkC;AAClC,0CAAsD;AAEtD,qFAAoE;AAG7D,IAAM,qBAAqB,GAA3B,MAAM,qBAAsB,SAAQ,oBAAuB;IACjE,YAAY,UAAsB;QACjC,KAAK,CAAC,uCAAW,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;IACxC,CAAC;CACD,CAAA;;gCAJY,qBAAqB;IADjC,IAAA,YAAO,GAAE;qCAEe,oBAAU;GADtB,qBAAqB,CAIjC"}
+{"version":3,"file":"oauth-access-token.repository.js","sourceRoot":"","sources":["../../../../../src/modules/oauth-server/database/repositories/oauth-access-token.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAAgE;AAChE,gCAAkC;AAClC,0CAA0C;AAE1C,qFAAoE;AAS7D,IAAM,qBAAqB,GAA3B,MAAM,qBAAsB,SAAQ,mBAA2B;IACrE,YAAY,UAAsB;QACjC,KAAK,CAAC,uCAAW,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;IACxC,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,KAAqB,EAAE,GAAqB;QAC7D,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,uCAAW,EAAE,KAAK,CAAC,CAAC;IACvD,CAAC;CACD,CAAA;;gCARY,qBAAqB;IADjC,IAAA,YAAO,GAAE;qCAEe,oBAAU;GADtB,qBAAqB,CAQjC"}

package/dist/modules/oauth-server/database/repositories/oauth-refresh-token.repository.d.ts

@@ -1,5 +1,17 @@
-import { DataSource, Repository } from '@n8n/typeorm';
+import { BaseRepository, type OperationContext } from '@n8n/db';
+import { DataSource } from '@n8n/typeorm';
 import { RefreshToken } from '../entities/oauth-refresh-token.entity';
-export declare class RefreshTokenRepository extends Repository<RefreshToken> {
+type NewRefreshToken = {
+    token: string;
+    clientId: string;
+    userId: string;
+    expiresAt: number;
+    scope: string[];
+};
+export declare class RefreshTokenRepository extends BaseRepository<RefreshToken> {
     constructor(dataSource: DataSource);
+    findByToken(token: string, clientId: string, ctx: OperationContext): Promise<RefreshToken | null>;
+    deleteValidByToken(token: string, clientId: string, now: number, ctx: OperationContext): Promise<number>;
+    insertToken(token: NewRefreshToken, ctx: OperationContext): Promise<void>;
 }
+export {};

package/dist/modules/oauth-server/database/repositories/oauth-refresh-token.repository.js

@@ -10,13 +10,28 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RefreshTokenRepository = void 0;
+const db_1 = require("@n8n/db");
 const di_1 = require("@n8n/di");
 const typeorm_1 = require("@n8n/typeorm");
 const oauth_refresh_token_entity_1 = require("../entities/oauth-refresh-token.entity");
-let RefreshTokenRepository = class RefreshTokenRepository extends typeorm_1.Repository {
+let RefreshTokenRepository = class RefreshTokenRepository extends db_1.BaseRepository {
     constructor(dataSource) {
         super(oauth_refresh_token_entity_1.RefreshToken, dataSource.manager);
     }
+    async findByToken(token, clientId, ctx) {
+        return await this.managerFor(ctx).findOne(oauth_refresh_token_entity_1.RefreshToken, { where: { token, clientId } });
+    }
+    async deleteValidByToken(token, clientId, now, ctx) {
+        const result = await this.managerFor(ctx).delete(oauth_refresh_token_entity_1.RefreshToken, {
+            token,
+            clientId,
+            expiresAt: (0, typeorm_1.MoreThanOrEqual)(now),
+        });
+        return result.affected ?? 0;
+    }
+    async insertToken(token, ctx) {
+        await this.managerFor(ctx).insert(oauth_refresh_token_entity_1.RefreshToken, token);
+    }
 };
 exports.RefreshTokenRepository = RefreshTokenRepository;
 exports.RefreshTokenRepository = RefreshTokenRepository = __decorate([

package/dist/modules/oauth-server/database/repositories/oauth-refresh-token.repository.js.map

@@ -1 +1 @@
-{"version":3,"file":"oauth-refresh-token.repository.js","sourceRoot":"","sources":["../../../../../src/modules/oauth-server/database/repositories/oauth-refresh-token.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAAkC;AAClC,0CAAsD;AAEtD,uFAAsE;AAG/D,IAAM,sBAAsB,GAA5B,MAAM,sBAAuB,SAAQ,oBAAwB;IACnE,YAAY,UAAsB;QACjC,KAAK,CAAC,yCAAY,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;IACzC,CAAC;CACD,CAAA;;iCAJY,sBAAsB;IADlC,IAAA,YAAO,GAAE;qCAEe,oBAAU;GADtB,sBAAsB,CAIlC"}
+{"version":3,"file":"oauth-refresh-token.repository.js","sourceRoot":"","sources":["../../../../../src/modules/oauth-server/database/repositories/oauth-refresh-token.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAAgE;AAChE,gCAAkC;AAClC,0CAA2D;AAE3D,uFAAsE;AAW/D,IAAM,sBAAsB,GAA5B,MAAM,sBAAuB,SAAQ,mBAA4B;IACvE,YAAY,UAAsB;QACjC,KAAK,CAAC,yCAAY,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,WAAW,CAChB,KAAa,EACb,QAAgB,EAChB,GAAqB;QAErB,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,yCAAY,EAAE,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;IACzF,CAAC;IAGD,KAAK,CAAC,kBAAkB,CACvB,KAAa,EACb,QAAgB,EAChB,GAAW,EACX,GAAqB;QAErB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,yCAAY,EAAE;YAC9D,KAAK;YACL,QAAQ;YACR,SAAS,EAAE,IAAA,yBAAe,EAAC,GAAG,CAAC;SAC/B,CAAC,CAAC;QACH,OAAO,MAAM,CAAC,QAAQ,IAAI,CAAC,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,KAAsB,EAAE,GAAqB;QAC9D,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,yCAAY,EAAE,KAAK,CAAC,CAAC;IACxD,CAAC;CACD,CAAA;;iCA/BY,sBAAsB;IADlC,IAAA,YAAO,GAAE;qCAEe,oBAAU;GADtB,sBAAsB,CA+BlC"}

package/dist/modules/oauth-server/oauth-token.service.d.ts

@@ -1,7 +1,7 @@
 import { AuthInfo } from '@modelcontextprotocol/sdk/server/auth/types.js';
 import { OAuthTokens } from '@modelcontextprotocol/sdk/shared/auth.js';
 import { Logger } from '@n8n/backend-common';
-import { UserRepository } from '@n8n/db';
+import { TransactionRunner, UserRepository } from '@n8n/db';
 import { JwtService } from '../../services/jwt.service';
 import type { OAuthTokenVerifier, UserWithContext } from '../../services/oauth-token-verifier-proxy.service';
 import { ProtectedResourceRegistry } from '../../services/protected-resource.registry';
@@ -14,9 +14,10 @@ export declare class OAuthTokenService implements OAuthTokenVerifier {
     private readonly accessTokenRepository;
     private readonly refreshTokenRepository;
     private readonly resourceRegistry;
+    private readonly txRunner;
     private readonly ACCESS_TOKEN_EXPIRY_SECONDS;
     private readonly REFRESH_TOKEN_EXPIRY_MS;
-    constructor(logger: Logger, jwtService: JwtService, userRepository: UserRepository, accessTokenRepository: AccessTokenRepository, refreshTokenRepository: RefreshTokenRepository, resourceRegistry: ProtectedResourceRegistry);
+    constructor(logger: Logger, jwtService: JwtService, userRepository: UserRepository, accessTokenRepository: AccessTokenRepository, refreshTokenRepository: RefreshTokenRepository, resourceRegistry: ProtectedResourceRegistry, txRunner: TransactionRunner);
     getAccessTokenExpirySeconds(): number;
     generateTokenPair(userId: string, clientId: string, resource: string | undefined, scopes: string[]): {
         accessToken: string;

package/dist/modules/oauth-server/oauth-token.service.js

@@ -15,25 +15,23 @@ const backend_common_1 = require("@n8n/backend-common");
 const constants_1 = require("@n8n/constants");
 const db_1 = require("@n8n/db");
 const di_1 = require("@n8n/di");
-const typeorm_1 = require("@n8n/typeorm");
 const ensure_error_1 = require("@n8n/utils/errors/ensure-error");
 const n8n_workflow_1 = require("n8n-workflow");
 const node_crypto_1 = require("node:crypto");
 const jwt_service_1 = require("../../services/jwt.service");
 const protected_resource_registry_1 = require("../../services/protected-resource.registry");
-const oauth_access_token_entity_1 = require("./database/entities/oauth-access-token.entity");
-const oauth_refresh_token_entity_1 = require("./database/entities/oauth-refresh-token.entity");
 const oauth_access_token_repository_1 = require("./database/repositories/oauth-access-token.repository");
 const oauth_refresh_token_repository_1 = require("./database/repositories/oauth-refresh-token.repository");
 const oauth_errors_1 = require("./oauth.errors");
 let OAuthTokenService = class OAuthTokenService {
-    constructor(logger, jwtService, userRepository, accessTokenRepository, refreshTokenRepository, resourceRegistry) {
+    constructor(logger, jwtService, userRepository, accessTokenRepository, refreshTokenRepository, resourceRegistry, txRunner) {
         this.logger = logger;
         this.jwtService = jwtService;
         this.userRepository = userRepository;
         this.accessTokenRepository = accessTokenRepository;
         this.refreshTokenRepository = refreshTokenRepository;
         this.resourceRegistry = resourceRegistry;
+        this.txRunner = txRunner;
         this.ACCESS_TOKEN_EXPIRY_SECONDS = 1 * constants_1.Time.hours.toSeconds;
         this.REFRESH_TOKEN_EXPIRY_MS = 30 * constants_1.Time.days.toMilliseconds;
     }
@@ -61,56 +59,38 @@ let OAuthTokenService = class OAuthTokenService {
         return { accessToken, refreshToken };
     }
     async saveTokenPair(accessToken, refreshToken, clientId, userId, scopes) {
-        await this.accessTokenRepository.manager.transaction(async (transactionManager) => {
-            await transactionManager.insert(this.accessTokenRepository.target, {
-                token: accessToken,
-                clientId,
-                userId,
-            });
-            await transactionManager.insert(this.refreshTokenRepository.target, {
+        await this.txRunner.run({}, async (ctx) => {
+            await this.accessTokenRepository.insertToken({ token: accessToken, clientId, userId }, ctx);
+            await this.refreshTokenRepository.insertToken({
                 token: refreshToken,
                 clientId,
                 userId,
                 expiresAt: Date.now() + this.REFRESH_TOKEN_EXPIRY_MS,
                 scope: scopes,
-            });
+            }, ctx);
         });
     }
     async validateAndRotateRefreshToken(refreshToken, clientId, resource) {
-        return await (0, db_1.withTransaction)(this.refreshTokenRepository.manager, undefined, async (trx) => {
+        return await this.txRunner.run({}, async (ctx) => {
             const now = Date.now();
-            const refreshTokenRecord = await trx.findOne(oauth_refresh_token_entity_1.RefreshToken, {
-                where: {
-                    token: refreshToken,
-                    clientId,
-                },
-            });
+            const refreshTokenRecord = await this.refreshTokenRepository.findByToken(refreshToken, clientId, ctx);
             if (!refreshTokenRecord) {
                 throw new errors_js_1.InvalidGrantError('Invalid refresh token');
             }
-            const result = await trx.delete(oauth_refresh_token_entity_1.RefreshToken, {
-                token: refreshToken,
-                clientId,
-                expiresAt: (0, typeorm_1.MoreThanOrEqual)(now),
-            });
-            const numAffected = result.affected ?? 0;
+            const numAffected = await this.refreshTokenRepository.deleteValidByToken(refreshToken, clientId, now, ctx);
             if (numAffected < 1) {
                 throw new errors_js_1.InvalidGrantError('Invalid refresh token');
             }
             const scopes = refreshTokenRecord.scope;
             const { accessToken, refreshToken: newRefreshToken } = this.generateTokenPair(refreshTokenRecord.userId, clientId, resource, scopes);
-            await trx.insert(oauth_access_token_entity_1.AccessToken, {
-                token: accessToken,
-                clientId,
-                userId: refreshTokenRecord.userId,
-            });
-            await trx.insert(oauth_refresh_token_entity_1.RefreshToken, {
+            await this.accessTokenRepository.insertToken({ token: accessToken, clientId, userId: refreshTokenRecord.userId }, ctx);
+            await this.refreshTokenRepository.insertToken({
                 token: newRefreshToken,
                 clientId,
                 userId: refreshTokenRecord.userId,
                 expiresAt: now + this.REFRESH_TOKEN_EXPIRY_MS,
                 scope: scopes,
-            });
+            }, ctx);
             this.logger.info('Refresh token rotated and new access token issued', {
                 clientId,
                 userId: refreshTokenRecord.userId,
@@ -282,6 +262,6 @@ let OAuthTokenService = class OAuthTokenService {
 exports.OAuthTokenService = OAuthTokenService;
 exports.OAuthTokenService = OAuthTokenService = __decorate([
     (0, di_1.Service)(),
-    __metadata("design:paramtypes", [backend_common_1.Logger, jwt_service_1.JwtService, db_1.UserRepository, oauth_access_token_repository_1.AccessTokenRepository, oauth_refresh_token_repository_1.RefreshTokenRepository, protected_resource_registry_1.ProtectedResourceRegistry])
+    __metadata("design:paramtypes", [backend_common_1.Logger, jwt_service_1.JwtService, db_1.UserRepository, oauth_access_token_repository_1.AccessTokenRepository, oauth_refresh_token_repository_1.RefreshTokenRepository, protected_resource_registry_1.ProtectedResourceRegistry, db_1.TransactionRunner])
 ], OAuthTokenService);
 //# sourceMappingURL=oauth-token.service.js.map

package/dist/modules/oauth-server/oauth-token.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"oauth-token.service.js","sourceRoot":"","sources":["../../../src/modules/oauth-server/oauth-token.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+EAAoF;AAGpF,wDAA6C;AAC7C,8CAAsC;AACtC,gCAA0D;AAC1D,gCAAkC;AAClC,0CAA+C;AAC/C,iEAA6D;AAC7D,+CAA+C;AAC/C,6CAAsD;AAEtD,wDAAoD;AAMpD,wFAAmF;AAEnF,6FAA4E;AAC5E,+FAA8E;AAC9E,yGAA8F;AAC9F,2GAAgG;AAChG,iDAAgF;AAWzE,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAI7B,YACkB,MAAc,EACd,UAAsB,EACtB,cAA8B,EAC9B,qBAA4C,EAC5C,sBAA8C,EAC9C,gBAA2C;QAL3C,WAAM,GAAN,MAAM,CAAQ;QACd,eAAU,GAAV,UAAU,CAAY;QACtB,mBAAc,GAAd,cAAc,CAAgB;QAC9B,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,2BAAsB,GAAtB,sBAAsB,CAAwB;QAC9C,qBAAgB,GAAhB,gBAAgB,CAA2B;QAT5C,gCAA2B,GAAG,CAAC,GAAG,gBAAI,CAAC,KAAK,CAAC,SAAS,CAAC;QACvD,4BAAuB,GAAG,EAAE,GAAG,gBAAI,CAAC,IAAI,CAAC,cAAc,CAAC;IAStE,CAAC;IAEJ,2BAA2B;QAC1B,OAAO,IAAI,CAAC,2BAA2B,CAAC;IACzC,CAAC;IAED,iBAAiB,CAChB,MAAc,EACd,QAAgB,EAChB,QAA4B,EAC5B,MAAgB;QAIhB,MAAM,QAAQ,GAAG,QAAQ,IAAI,IAAI,CAAC,gBAAgB,CAAC,kBAAkB,EAAE,EAAE,cAAc,EAAE,CAAC;QAC1F,IAAI,CAAC,QAAQ,EAAE,CAAC;YACf,MAAM,IAAI,8BAAe,CACxB,0GAA0G,CAC1G,CAAC;QACH,CAAC;QAED,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;YACxC,GAAG,EAAE,MAAM;YACX,GAAG,EAAE,QAAQ;YACb,SAAS,EAAE,QAAQ;YACnB,GAAG,EAAE,IAAA,wBAAU,GAAE;YACjB,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;YAClC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC,2BAA2B;YAIrE,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;YACvB,IAAI,EAAE;gBACL,OAAO,EAAE,IAAI;aACb;SACD,CAAC,CAAC;QAEH,MAAM,YAAY,GAAG,IAAA,yBAAW,EAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAErD,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,aAAa,CAClB,WAAmB,EACnB,YAAoB,EACpB,QAAgB,EAChB,MAAc,EACd,MAAgB;QAEhB,MAAM,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,EAAE,kBAAkB,EAAE,EAAE;YACjF,MAAM,kBAAkB,CAAC,MAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC,MAAM,EAAE;gBAClE,KAAK,EAAE,WAAW;gBAClB,QAAQ;gBACR,MAAM;aACN,CAAC,CAAC;YAEH,MAAM,kBAAkB,CAAC,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,MAAM,EAAE;gBACnE,KAAK,EAAE,YAAY;gBACnB,QAAQ;gBACR,MAAM;gBACN,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,uBAAuB;gBACpD,KAAK,EAAE,MAAM;aACb,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,6BAA6B,CAClC,YAAoB,EACpB,QAAgB,EAChB,QAAiB;QAEjB,OAAO,MAAM,IAAA,oBAAe,EAAC,IAAI,CAAC,sBAAsB,CAAC,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;YAC1F,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAEvB,MAAM,kBAAkB,GAAG,MAAM,GAAG,CAAC,OAAO,CAAC,yCAAY,EAAE;gBAC1D,KAAK,EAAE;oBACN,KAAK,EAAE,YAAY;oBACnB,QAAQ;iBACR;aACD,CAAC,CAAC;YAIH,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBACzB,MAAM,IAAI,6BAAiB,CAAC,uBAAuB,CAAC,CAAC;YACtD,CAAC;YAED,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,yCAAY,EAAE;gBAC7C,KAAK,EAAE,YAAY;gBACnB,QAAQ;gBACR,SAAS,EAAE,IAAA,yBAAe,EAAC,GAAG,CAAC;aAC/B,CAAC,CAAC;YAEH,MAAM,WAAW,GAAG,MAAM,CAAC,QAAQ,IAAI,CAAC,CAAC;YACzC,IAAI,WAAW,GAAG,CAAC,EAAE,CAAC;gBACrB,MAAM,IAAI,6BAAiB,CAAC,uBAAuB,CAAC,CAAC;YACtD,CAAC;YAED,MAAM,MAAM,GAAG,kBAAkB,CAAC,KAAK,CAAC;YAExC,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC,iBAAiB,CAC5E,kBAAkB,CAAC,MAAM,EACzB,QAAQ,EACR,QAAQ,EACR,MAAM,CACN,CAAC;YAEF,MAAM,GAAG,CAAC,MAAM,CAAC,uCAAW,EAAE;gBAC7B,KAAK,EAAE,WAAW;gBAClB,QAAQ;gBACR,MAAM,EAAE,kBAAkB,CAAC,MAAM;aACjC,CAAC,CAAC;YAEH,MAAM,GAAG,CAAC,MAAM,CAAC,yCAAY,EAAE;gBAC9B,KAAK,EAAE,eAAe;gBACtB,QAAQ;gBACR,MAAM,EAAE,kBAAkB,CAAC,MAAM;gBACjC,SAAS,EAAE,GAAG,GAAG,IAAI,CAAC,uBAAuB;gBAC7C,KAAK,EAAE,MAAM;aACb,CAAC,CAAC;YAEH,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mDAAmD,EAAE;gBACrE,QAAQ;gBACR,MAAM,EAAE,kBAAkB,CAAC,MAAM;aACjC,CAAC,CAAC;YAEH,OAAO;gBACN,YAAY,EAAE,WAAW;gBACzB,UAAU,EAAE,QAAQ;gBACpB,UAAU,EAAE,IAAI,CAAC,2BAA2B;gBAC5C,aAAa,EAAE,eAAe;gBAC9B,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;aACvB,CAAC;QACH,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,KAAa,EAAE,gBAAyB;QAC/D,OAAO,MAAM,IAAI,CAAC,wBAAwB,CACzC,KAAK,EACL,MAAM,IAAI,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,CAChD,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,wBAAwB,CACrC,KAAa,EACb,gBAA0B;QAE1B,IAAI,OAAgB,CAAC;QAErB,IAAI,CAAC;YACJ,OAAO,GAAG,IAAI,CAAC,6BAA6B,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC;QACvE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,IAAI,mCAAoB,EAAE,CAAC;QAClC,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QAC3D,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QACnD,IAAI,CAAC,QAAQ,IAAI,CAAC,MAAM,EAAE,CAAC;YAC1B,MAAM,IAAI,mCAAoB,EAAE,CAAC;QAClC,CAAC;QAED,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC;YAClE,KAAK,EAAE,EAAE,KAAK,EAAE;SAChB,CAAC,CAAC;QAEH,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACxB,MAAM,IAAI,uCAAwB,EAAE,CAAC;QACtC,CAAC;QAED,OAAO;YACN,KAAK;YACL,QAAQ;YACR,MAAM,EAAE,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC;YACrC,KAAK,EAAE;gBACN,MAAM;aACN;SACD,CAAC;IACH,CAAC;IAMO,eAAe,CAAC,OAAgB;QACvC,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAKzD,IAAI,UAAU,KAAK,IAAI,EAAE,CAAC;YACzB,OAAO,EAAE,CAAC;QACX,CAAC;QAED,OAAO,UAAU,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACvD,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,KAAa,EAAE,gBAAyB;QACpE,IAAI,CAAC;YACJ,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,gBAAgB,CAAC,CAAC;YAKpE,IAAI,gBAAgB,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACnC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,oBAAoB,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,CAAC;YACtF,CAAC;YAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,wBAAwB,CACnD,KAAK,EACL,IAAI,CAAC,oBAAoB,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CACrD,CAAC;YAEF,MAAM,MAAM,GACX,QAAQ,CAAC,KAAK,IAAI,OAAO,QAAQ,CAAC,KAAK,KAAK,QAAQ;gBACnD,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC;gBAC/C,CAAC,CAAC,IAAI,CAAC;YACT,IAAI,CAAC,MAAM,EAAE,CAAC;gBACb,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,0BAA0B,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,CAAC;YAC5F,CAAC;YAED,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;gBAC9C,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE;gBACrB,SAAS,EAAE,CAAC,MAAM,CAAC;aACnB,CAAC,CAAC;YAEH,IAAI,CAAC,IAAI,EAAE,CAAC;gBACX,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,gBAAgB,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,CAAC;YAClF,CAAC;YAED,IAAI,QAAQ,IAAI,CAAC,CAAC,MAAM,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;gBACnD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,+CAA+C,EAAE;oBACjE,MAAM,EAAE,IAAI,CAAC,EAAE;oBACf,gBAAgB;iBAChB,CAAC,CAAC;gBACH,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,oBAAoB,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,CAAC;YACtF,CAAC;YAED,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC;QAC7D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,YAAY,GAAG,IAAA,0BAAW,EAAC,KAAK,CAAC,CAAC;YACxC,MAAM,MAAM,GACX,YAAY,YAAY,mCAAoB;gBAC3C,CAAC,CAAC,eAAe;gBACjB,CAAC,CAAC,YAAY,YAAY,uCAAwB;oBACjD,CAAC,CAAC,uBAAuB;oBACzB,CAAC,CAAC,eAAe,CAAC;YACrB,OAAO;gBACN,IAAI,EAAE,IAAI;gBACV,OAAO,EAAE;oBACR,MAAM;oBACN,SAAS,EAAE,OAAO;oBAClB,aAAa,EAAE,YAAY,CAAC,OAAO;iBACnC;aACD,CAAC;QACH,CAAC;IACF,CAAC;IAGD,KAAK,CAAC,uBAAuB,CAAC,QAAgB,EAAE,MAAc;QAC7D,MAAM,OAAO,CAAC,GAAG,CAAC;YACjB,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;YACvD,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;SACxD,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,KAAa,EAAE,QAAgB;QACtD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC;YACtD,KAAK;YACL,QAAQ;SACR,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,CAAC,MAAM,CAAC,QAAQ,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;QAE3C,IAAI,OAAO,EAAE,CAAC;YACb,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,sBAAsB,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;QACxD,CAAC;QAED,OAAO,OAAO,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,KAAa,EAAE,QAAgB;QACvD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC;YACvD,KAAK;YACL,QAAQ;SACR,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,CAAC,MAAM,CAAC,QAAQ,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;QAE3C,IAAI,OAAO,EAAE,CAAC;YACb,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,uBAAuB,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;QACzD,CAAC;QAED,OAAO,OAAO,CAAC;IAChB,CAAC;IAWO,KAAK,CAAC,mBAAmB,CAAC,gBAAyB;QAC1D,MAAM,QAAQ,GAAG,gBAAgB;YAChC,CAAC,CAAC,MAAM,IAAI,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,gBAAgB,CAAC;YAChE,CAAC,CAAC,SAAS,CAAC;QACb,OAAO,IAAI,CAAC,oBAAoB,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;IAC9D,CAAC;IAOO,oBAAoB,CAC3B,QAAuC,EACvC,gBAAyB;QAEzB,IAAI,gBAAgB,EAAE,CAAC;YACtB,OAAO,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC;QAChE,CAAC;QAKD,OAAO,IAAI,CAAC,gBAAgB,CAAC,eAAe,EAAE,CAAC;IAChD,CAAC;IAEO,KAAK,CAAC,qBAAqB,CAClC,gBAAyB;QAEzB,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACvB,OAAO,IAAI,CAAC,gBAAgB,CAAC,kBAAkB,EAAE,CAAC;QACnD,CAAC;QACD,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,CAAC;IACvE,CAAC;IAIO,6BAA6B,CAAC,KAAa,EAAE,SAAmB;QACvE,IAAI,CAAC;YACJ,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE;gBACpC,QAAQ,EAAE,SAAkC;aAC5C,CAAC,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAEhB,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;gBAClC,IAAI,CAAC;oBACJ,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;gBACpD,CAAC;gBAAC,MAAM,CAAC;oBACR,SAAS;gBACV,CAAC;YACF,CAAC;YAED,MAAM,KAAK,CAAC;QACb,CAAC;IACF,CAAC;IAEO,cAAc,CAAC,OAAgB,EAAE,KAAa;QACrD,IAAI,CAAC,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ;YAAE,OAAO,IAAI,CAAC;QACzD,MAAM,UAAU,GAAI,OAAmC,CAAC,KAAK,CAAC,CAAC;QAC/D,OAAO,OAAO,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC;IAC3D,CAAC;CACD,CAAA;;4BAxXY,iBAAiB;IAD7B,IAAA,YAAO,GAAE;qCAMiB,uBAAM,EACF,wBAAU,EACN,mBAAc,EACP,qDAAqB,EACpB,uDAAsB,EAC5B,uDAAyB;GAVjD,iBAAiB,CAwX7B"}
+{"version":3,"file":"oauth-token.service.js","sourceRoot":"","sources":["../../../src/modules/oauth-server/oauth-token.service.ts"],"names":[],"mappings":"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"}

package/dist/modules/oauth-server/oauth.controller.d.ts

@@ -12,4 +12,7 @@ export declare class OAuthController {
     metadata(_req: Request, res: Response): void;
     protectedResourceMetadataOptions(_req: Request, res: Response): void;
     protectedResourceMetadata(req: Request, res: Response): Promise<void>;
+    defaultProtectedResourceMetadataOptions(_req: Request, res: Response): void;
+    defaultProtectedResourceMetadata(_req: Request, res: Response): void;
+    private buildProtectedResourceMetadata;
 }

package/dist/modules/oauth-server/oauth.controller.js

@@ -24,10 +24,12 @@ const url_service_1 = require("../../services/url.service");
 const oauth_server_config_1 = require("./oauth-server.config");
 const oauth_server_service_1 = require("./oauth-server.service");
 const oauth_errors_1 = require("./oauth.errors");
+const oauth_helpers_1 = require("./oauth.helpers");
 const oauthServerService = di_1.Container.get(oauth_server_service_1.OAuthServerService);
 const globalConfig = di_1.Container.get(config_1.GlobalConfig);
 const oauthServerConfig = di_1.Container.get(oauth_server_config_1.OAuthServerConfig);
 const logger = di_1.Container.get(backend_common_1.Logger);
+const urlService = di_1.Container.get(url_service_1.UrlService);
 const oauthClientLimitGuard = async (_req, res, next) => {
     if (await oauthServerService.isClientLimitReached()) {
         const limit = globalConfig.endpoints.mcpMaxRegisteredClients;
@@ -42,6 +44,11 @@ const oauthClientLimitGuard = async (_req, res, next) => {
     }
     next();
 };
+const rfc9207IssuerParam = (_req, res, next) => {
+    const originalLocation = res.location.bind(res);
+    res.location = (url) => originalLocation(oauth_helpers_1.OAuthHelpers.setIssuerParam(url, urlService.getInstanceBaseUrl()));
+    next();
+};
 const registerRouter = (0, register_js_1.clientRegistrationHandler)({
     clientsStore: oauthServerService.clientsStore,
 });
@@ -60,6 +67,7 @@ const sharedEndpointRouters = (basePath) => [
         path: `${basePath}/authorize`,
         router: authorizeRouter,
         skipAuth: true,
+        middlewares: [rfc9207IssuerParam],
         ipRateLimit: (0, decorators_1.createIpRateLimit)(oauthServerConfig.rateLimitAuthorize, 5 * constants_1.Time.minutes.toMilliseconds),
     },
     {
@@ -126,6 +134,22 @@ let OAuthController = class OAuthController {
             res.status(404).json({ message: 'Unknown protected resource' });
             return;
         }
+        res.json(this.buildProtectedResourceMetadata(resource));
+    }
+    defaultProtectedResourceMetadataOptions(_req, res) {
+        this.setCorsHeaders(res);
+        res.status(204).end();
+    }
+    defaultProtectedResourceMetadata(_req, res) {
+        this.setCorsHeaders(res);
+        const resource = this.resourceRegistry.getDefaultResource();
+        if (!resource) {
+            res.status(404).json({ message: 'Unknown protected resource' });
+            return;
+        }
+        res.json(this.buildProtectedResourceMetadata(resource));
+    }
+    buildProtectedResourceMetadata(resource) {
         const baseUrl = this.urlService.getInstanceBaseUrl();
         const metadata = {
             resource: resource.getResourceUrl(),
@@ -135,7 +159,7 @@ let OAuthController = class OAuthController {
         if (resource.scopes.length > 0) {
             metadata.scopes_supported = resource.scopes;
         }
-        res.json(metadata);
+        return metadata;
     }
 };
 exports.OAuthController = OAuthController;
@@ -183,6 +207,26 @@ __decorate([
     __metadata("design:paramtypes", [Object, Object]),
     __metadata("design:returntype", Promise)
 ], OAuthController.prototype, "protectedResourceMetadata", null);
+__decorate([
+    (0, decorators_1.Options)('/.well-known/oauth-protected-resource', {
+        skipAuth: true,
+        usesTemplates: true,
+        ipRateLimit: wellKnownIpRateLimit,
+    }),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object]),
+    __metadata("design:returntype", void 0)
+], OAuthController.prototype, "defaultProtectedResourceMetadataOptions", null);
+__decorate([
+    (0, decorators_1.Get)('/.well-known/oauth-protected-resource', {
+        skipAuth: true,
+        usesTemplates: true,
+        ipRateLimit: wellKnownIpRateLimit,
+    }),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object]),
+    __metadata("design:returntype", void 0)
+], OAuthController.prototype, "defaultProtectedResourceMetadata", null);
 exports.OAuthController = OAuthController = __decorate([
     (0, decorators_1.RootLevelController)('/'),
     __metadata("design:paramtypes", [url_service_1.UrlService, protected_resource_registry_1.ProtectedResourceRegistry])

package/dist/modules/oauth-server/oauth.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"oauth.controller.js","sourceRoot":"","sources":["../../../src/modules/oauth-server/oauth.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"oauth.controller.js","sourceRoot":"","sources":["../../../src/modules/oauth-server/oauth.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8FAAmG;AACnG,4FAAuG;AACvG,wFAA6F;AAC7F,sFAAuF;AACvF,wDAA6C;AAC7C,wCAA2C;AAC3C,8CAAsC;AACtC,gDAMyB;AACzB,gCAAoC;AAIpC,wFAAmF;AACnF,wDAAoD;AAEpD,+DAA0D;AAC1D,iEAA4D;AAC5D,iDAAqE;AACrE,mDAA+C;AAE/C,MAAM,kBAAkB,GAAG,cAAS,CAAC,GAAG,CAAC,yCAAkB,CAAC,CAAC;AAC7D,MAAM,YAAY,GAAG,cAAS,CAAC,GAAG,CAAC,qBAAY,CAAC,CAAC;AACjD,MAAM,iBAAiB,GAAG,cAAS,CAAC,GAAG,CAAC,uCAAiB,CAAC,CAAC;AAC3D,MAAM,MAAM,GAAG,cAAS,CAAC,GAAG,CAAC,uBAAM,CAAC,CAAC;AACrC,MAAM,UAAU,GAAG,cAAS,CAAC,GAAG,CAAC,wBAAU,CAAC,CAAC;AAc7C,MAAM,qBAAqB,GAAmB,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;IACvE,IAAI,MAAM,kBAAkB,CAAC,oBAAoB,EAAE,EAAE,CAAC;QACrD,MAAM,KAAK,GAAG,YAAY,CAAC,SAAS,CAAC,uBAAuB,CAAC;QAC7D,MAAM,CAAC,IAAI,CAAC,wEAAwE,EAAE;YACrF,KAAK;SACL,CAAC,CAAC;QACH,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;YACpB,KAAK,EAAE,cAAc;YACrB,iBAAiB,EAAE,IAAA,kDAAmC,EAAC,KAAK,CAAC;SAC7D,CAAC,CAAC;QACH,OAAO;IACR,CAAC;IACD,IAAI,EAAE,CAAC;AACR,CAAC,CAAC;AAcF,MAAM,kBAAkB,GAAmB,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;IAC9D,MAAM,gBAAgB,GAAG,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAChD,GAAG,CAAC,QAAQ,GAAG,CAAC,GAAW,EAAE,EAAE,CAC9B,gBAAgB,CAAC,4BAAY,CAAC,cAAc,CAAC,GAAG,EAAE,UAAU,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC;IACrF,IAAI,EAAE,CAAC;AACR,CAAC,CAAC;AAKF,MAAM,cAAc,GAAG,IAAA,uCAAyB,EAAC;IAChD,YAAY,EAAE,kBAAkB,CAAC,YAAY;CAC7C,CAAW,CAAC;AACb,MAAM,eAAe,GAAG,IAAA,mCAAoB,EAAC,EAAE,QAAQ,EAAE,kBAAkB,EAAE,CAAW,CAAC;AACzF,MAAM,WAAW,GAAG,IAAA,uBAAY,EAAC,EAAE,QAAQ,EAAE,kBAAkB,EAAE,CAAW,CAAC;AAC7E,MAAM,YAAY,GAAG,IAAA,6BAAiB,EAAC,EAAE,QAAQ,EAAE,kBAAkB,EAAE,CAAW,CAAC;AAEnF,MAAM,qBAAqB,GAAG,CAAC,QAAiC,EAA0B,EAAE,CAAC;IAC5F;QACC,IAAI,EAAE,GAAG,QAAQ,WAAW;QAC5B,MAAM,EAAE,cAAc;QACtB,QAAQ,EAAE,IAAI;QACd,WAAW,EAAE,CAAC,qBAAqB,CAAC;QACpC,WAAW,EAAE,IAAA,8BAAiB,EAC7B,iBAAiB,CAAC,iBAAiB,EACnC,CAAC,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,CAC/B;KACD;IACD;QACC,IAAI,EAAE,GAAG,QAAQ,YAAY;QAC7B,MAAM,EAAE,eAAe;QACvB,QAAQ,EAAE,IAAI;QACd,WAAW,EAAE,CAAC,kBAAkB,CAAC;QACjC,WAAW,EAAE,IAAA,8BAAiB,EAC7B,iBAAiB,CAAC,kBAAkB,EACpC,CAAC,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,CAC/B;KACD;IACD;QACC,IAAI,EAAE,GAAG,QAAQ,QAAQ;QACzB,MAAM,EAAE,WAAW;QACnB,QAAQ,EAAE,IAAI;QACd,WAAW,EAAE,IAAA,8BAAiB,EAC7B,iBAAiB,CAAC,cAAc,EAChC,CAAC,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,CAC/B;KACD;IACD;QACC,IAAI,EAAE,GAAG,QAAQ,SAAS;QAC1B,MAAM,EAAE,YAAY;QACpB,QAAQ,EAAE,IAAI;QACd,WAAW,EAAE,IAAA,8BAAiB,EAC7B,iBAAiB,CAAC,eAAe,EACjC,CAAC,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,CAC/B;KACD;CACD,CAAC;AAEF,MAAM,oBAAoB,GAAG,IAAA,8BAAiB,EAC7C,iBAAiB,CAAC,kBAAkB,EACpC,CAAC,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,CAC/B,CAAC;AAGK,IAAM,eAAe,GAArB,MAAM,eAAe;IAC3B,YACkB,UAAsB,EACtB,gBAA2C;0BAD3C,UAAU;gCACV,gBAAgB;IAC/B,CAAC;IAGI,cAAc,CAAC,GAAa;QAEnC,GAAG,CAAC,MAAM,CAAC,6BAA6B,EAAE,GAAG,CAAC,CAAC;QAC/C,GAAG,CAAC,MAAM,CAAC,8BAA8B,EAAE,cAAc,CAAC,CAAC;QAC3D,GAAG,CAAC,MAAM,CAAC,8BAA8B,EAAE,cAAc,CAAC,CAAC;IAC5D,CAAC;IAYD,eAAe,CAAC,IAAa,EAAE,GAAa;QAC3C,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;QACzB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;IACvB,CAAC;IAgBD,QAAQ,CAAC,IAAa,EAAE,GAAa;QACpC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;QAEzB,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,kBAAkB,EAAE,CAAC;QACrD,MAAM,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC,YAAY,EAAE,CAAC;QACvD,MAAM,QAAQ,GAA4B;YACzC,MAAM,EAAE,OAAO;YACf,sBAAsB,EAAE,GAAG,OAAO,sBAAsB;YACxD,cAAc,EAAE,GAAG,OAAO,kBAAkB;YAC5C,qBAAqB,EAAE,GAAG,OAAO,qBAAqB;YACtD,mBAAmB,EAAE,GAAG,OAAO,mBAAmB;YAClD,wBAAwB,EAAE,CAAC,MAAM,CAAC;YAClC,qBAAqB,EAAE,CAAC,oBAAoB,EAAE,eAAe,CAAC;YAC9D,qCAAqC,EAAE,CAAC,MAAM,EAAE,oBAAoB,EAAE,qBAAqB,CAAC;YAC5F,gCAAgC,EAAE,CAAC,MAAM,CAAC;YAE1C,8CAA8C,EAAE,IAAI;SACpD,CAAC;QAEF,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC1B,QAAQ,CAAC,gBAAgB,GAAG,SAAS,CAAC;QACvC,CAAC;QAED,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACpB,CAAC;IAOD,gCAAgC,CAAC,IAAa,EAAE,GAAa;QAC5D,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;QACzB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;IACvB,CAAC;IAYK,AAAN,KAAK,CAAC,yBAAyB,CAAC,GAAY,EAAE,GAAa;QAC1D,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;QAEzB,MAAM,YAAY,GACjB,GAAG;YACH,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC;gBACtC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC;gBACnC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QAC7B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;QAC7E,IAAI,CAAC,QAAQ,EAAE,CAAC;YACf,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,4BAA4B,EAAE,CAAC,CAAC;YAChE,OAAO;QACR,CAAC;QAED,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,8BAA8B,CAAC,QAAQ,CAAC,CAAC,CAAC;IACzD,CAAC;IAOD,uCAAuC,CAAC,IAAa,EAAE,GAAa;QACnE,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;QACzB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;IACvB,CAAC;IAwBD,gCAAgC,CAAC,IAAa,EAAE,GAAa;QAC5D,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;QAEzB,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,kBAAkB,EAAE,CAAC;QAC5D,IAAI,CAAC,QAAQ,EAAE,CAAC;YACf,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,4BAA4B,EAAE,CAAC,CAAC;YAChE,OAAO;QACR,CAAC;QAED,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,8BAA8B,CAAC,QAAQ,CAAC,CAAC,CAAC;IACzD,CAAC;IAEO,8BAA8B,CAAC,QAA2B;QACjE,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,kBAAkB,EAAE,CAAC;QACrD,MAAM,QAAQ,GAA4B;YACzC,QAAQ,EAAE,QAAQ,CAAC,cAAc,EAAE;YACnC,wBAAwB,EAAE,CAAC,QAAQ,CAAC;YACpC,qBAAqB,EAAE,CAAC,OAAO,CAAC;SAChC,CAAC;QAEF,IAAI,QAAQ,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAChC,QAAQ,CAAC,gBAAgB,GAAG,QAAQ,CAAC,MAAM,CAAC;QAC7C,CAAC;QAED,OAAO,QAAQ,CAAC;IACjB,CAAC;CACD,CAAA;;AAtJO,uBAAO,GAA2B;IACxC,GAAG,qBAAqB,CAAC,YAAY,CAAC;IACtC,GAAG,qBAAqB,CAAC,QAAQ,CAAC;CAClC,AAHa,CAGZ;AAOF;IALC,IAAA,oBAAO,EAAC,yCAAyC,EAAE;QACnD,QAAQ,EAAE,IAAI;QACd,aAAa,EAAE,IAAI;QACnB,WAAW,EAAE,oBAAoB;KACjC,CAAC;;;;sDAID;AAgBD;IALC,IAAA,gBAAG,EAAC,yCAAyC,EAAE;QAC/C,QAAQ,EAAE,IAAI;QACd,aAAa,EAAE,IAAI;QACnB,WAAW,EAAE,oBAAoB;KACjC,CAAC;;;;+CAyBD;AAOD;IALC,IAAA,oBAAO,EAAC,qDAAqD,EAAE;QAC/D,QAAQ,EAAE,IAAI;QACd,aAAa,EAAE,IAAI;QACnB,WAAW,EAAE,oBAAoB;KACjC,CAAC;;;;uEAID;AAYK;IALL,IAAA,gBAAG,EAAC,qDAAqD,EAAE;QAC3D,QAAQ,EAAE,IAAI;QACd,aAAa,EAAE,IAAI;QACnB,WAAW,EAAE,oBAAoB;KACjC,CAAC;;;;gEAgBD;AAOD;IALC,IAAA,oBAAO,EAAC,uCAAuC,EAAE;QACjD,QAAQ,EAAE,IAAI;QACd,aAAa,EAAE,IAAI;QACnB,WAAW,EAAE,oBAAoB;KACjC,CAAC;;;;8EAID;AAwBD;IALC,IAAA,gBAAG,EAAC,uCAAuC,EAAE;QAC7C,QAAQ,EAAE,IAAI;QACd,aAAa,EAAE,IAAI;QACnB,WAAW,EAAE,oBAAoB;KACjC,CAAC;;;;uEAWD;0BApJW,eAAe;IAD3B,IAAA,gCAAmB,EAAC,GAAG,CAAC;qCAGM,wBAAU,EACJ,uDAAyB;GAHjD,eAAe,CAoK3B"}

package/dist/modules/oauth-server/oauth.helpers.d.ts

@@ -1,4 +1,5 @@
 export declare class OAuthHelpers {
     static buildSuccessRedirectUrl(redirectUri: string, code: string, state: string | null, issuer: string): string;
     static buildErrorRedirectUrl(redirectUri: string, error: string, errorDescription: string, state: string | null, issuer: string): string;
+    static setIssuerParam(url: string, issuer: string): string;
 }

package/dist/modules/oauth-server/oauth.helpers.js

@@ -21,6 +21,13 @@ class OAuthHelpers {
         targetUrl.searchParams.set('iss', issuer);
         return targetUrl.toString();
     }
+    static setIssuerParam(url, issuer) {
+        if (!URL.canParse(url))
+            return url;
+        const targetUrl = new URL(url);
+        targetUrl.searchParams.set('iss', issuer);
+        return targetUrl.toString();
+    }
 }
 exports.OAuthHelpers = OAuthHelpers;
 //# sourceMappingURL=oauth.helpers.js.map

package/dist/modules/oauth-server/oauth.helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"oauth.helpers.js","sourceRoot":"","sources":["../../../src/modules/oauth-server/oauth.helpers.ts"],"names":[],"mappings":";;;AAGA;IASC,MAAM,CAAC,uBAAuB,CAC7B,WAAmB,EACnB,IAAY,EACZ,KAAoB,EACpB,MAAc;QAEd,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,CAAC;QACvC,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACzC,IAAI,KAAK,EAAE,CAAC;YACX,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC5C,CAAC;QACD,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC1C,OAAO,SAAS,CAAC,QAAQ,EAAE,CAAC;IAC7B,CAAC;IAQD,MAAM,CAAC,qBAAqB,CAC3B,WAAmB,EACnB,KAAa,EACb,gBAAwB,EACxB,KAAoB,EACpB,MAAc;QAEd,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,CAAC;QACvC,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC3C,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,mBAAmB,EAAE,gBAAgB,CAAC,CAAC;QAClE,IAAI,KAAK,EAAE,CAAC;YACX,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC5C,CAAC;QACD,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC1C,OAAO,SAAS,CAAC,QAAQ,EAAE,CAAC;IAC7B,CAAC;CACD"}
+{"version":3,"file":"oauth.helpers.js","sourceRoot":"","sources":["../../../src/modules/oauth-server/oauth.helpers.ts"],"names":[],"mappings":";;;AAGA;IASC,MAAM,CAAC,uBAAuB,CAC7B,WAAmB,EACnB,IAAY,EACZ,KAAoB,EACpB,MAAc;QAEd,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,CAAC;QACvC,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACzC,IAAI,KAAK,EAAE,CAAC;YACX,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC5C,CAAC;QACD,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC1C,OAAO,SAAS,CAAC,QAAQ,EAAE,CAAC;IAC7B,CAAC;IAQD,MAAM,CAAC,qBAAqB,CAC3B,WAAmB,EACnB,KAAa,EACb,gBAAwB,EACxB,KAAoB,EACpB,MAAc;QAEd,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,CAAC;QACvC,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC3C,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,mBAAmB,EAAE,gBAAgB,CAAC,CAAC;QAClE,IAAI,KAAK,EAAE,CAAC;YACX,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC5C,CAAC;QACD,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC1C,OAAO,SAAS,CAAC,QAAQ,EAAE,CAAC;IAC7B,CAAC;IASD,MAAM,CAAC,cAAc,CAAC,GAAW,EAAE,MAAc;QAChD,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC;YAAE,OAAO,GAAG,CAAC;QAEnC,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;QAC/B,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC1C,OAAO,SAAS,CAAC,QAAQ,EAAE,CAAC;IAC7B,CAAC;CACD"}

package/dist/modules/otel/otel-settings.controller.d.ts

@@ -1,4 +1,4 @@
-import { TestOtelConnectionDto, UpdateOtelSettingsDto } from '@n8n/api-types';
+import { TestOtelTraceDto, UpdateOtelSettingsDto } from '@n8n/api-types';
 import { ModuleRegistry } from '@n8n/backend-common';
 import { AuthenticatedRequest } from '@n8n/db';
 import { OtelLifecycleHandler } from './otel-lifecycle-handler';
@@ -14,5 +14,5 @@ export declare class OtelSettingsController {
     constructor(otelSettingsService: OtelSettingsService, otelService: OtelService, otelLifecycleHandler: OtelLifecycleHandler, moduleRegistry: ModuleRegistry, publisher: Publisher);
     getSettings(_req: AuthenticatedRequest): import("./otel-settings.service").OtelSettingsResponse;
     updateSettings(_req: AuthenticatedRequest, _res: Response, dto: UpdateOtelSettingsDto): Promise<import("./otel-settings.service").OtelSettingsResponse>;
-    testTrace(_req: AuthenticatedRequest, _res: Response, dto: TestOtelConnectionDto): Promise<import("./otel.service").OtelTestTraceResult>;
+    testTrace(_req: AuthenticatedRequest, _res: Response, dto: TestOtelTraceDto): Promise<import("./otel.service").OtelTestTraceResult>;
 }

package/dist/modules/otel/otel-settings.controller.js

@@ -64,7 +64,7 @@ __decorate([
     (0, decorators_1.GlobalScope)('otel:manage'),
     __param(2, decorators_1.Body),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, Response, api_types_1.TestOtelConnectionDto]),
+    __metadata("design:paramtypes", [Object, Response, api_types_1.TestOtelTraceDto]),
     __metadata("design:returntype", Promise)
 ], OtelSettingsController.prototype, "testTrace", null);
 exports.OtelSettingsController = OtelSettingsController = __decorate([

package/dist/modules/otel/otel-settings.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"otel-settings.controller.js","sourceRoot":"","sources":["../../../src/modules/otel/otel-settings.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8CAA8E;AAC9E,wDAAqD;AAErD,gDAAoF;AAEpF,qEAAgE;AAChE,mEAA8D;AAC9D,iDAA6C;AAE7C,0EAA+D;AAGxD,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAClC,YACkB,mBAAwC,EACxC,WAAwB,EACxB,oBAA0C,EAC1C,cAA8B,EAC9B,SAAoB;mCAJpB,mBAAmB;2BACnB,WAAW;oCACX,oBAAoB;8BACpB,cAAc;yBACd,SAAS;IACxB,CAAC;IAIJ,WAAW,CAAC,IAA0B;QACrC,OAAO,IAAI,CAAC,mBAAmB,CAAC,WAAW,EAAE,CAAC;IAC/C,CAAC;IAIK,AAAN,KAAK,CAAC,cAAc,CACnB,IAA0B,EAC1B,IAAc,EACR,GAA0B;QAEhC,MAAM,IAAI,CAAC,mBAAmB,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QACjD,MAAM,IAAI,CAAC,oBAAoB,CAAC,kBAAkB,EAAE,CAAC;QACrD,MAAM,IAAI,CAAC,cAAc,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;QACxD,KAAK,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,EAAE,OAAO,EAAE,oBAAoB,EAAE,CAAC,CAAC;QACtE,OAAO,IAAI,CAAC,mBAAmB,CAAC,WAAW,EAAE,CAAC;IAC/C,CAAC;IAIK,AAAN,KAAK,CAAC,SAAS,CAAC,IAA0B,EAAE,IAAc,EAAQ,GAA0B;QAC3F,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,CAAC,qBAAqB,CAAC,GAAG,CAAC,CAAC;QACvE,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;IACzD,CAAC;CACD,CAAA;;AAxBA;IAFC,IAAA,gBAAG,EAAC,WAAW,CAAC;IAChB,IAAA,wBAAW,EAAC,aAAa,CAAC;;;;yDAG1B;AAIK;IAFL,IAAA,gBAAG,EAAC,WAAW,CAAC;IAChB,IAAA,wBAAW,EAAC,aAAa,CAAC;IAIzB,WAAA,iBAAI,CAAA;;6CADC,QAAQ,EACH,iCAAqB;;4DAOhC;AAIK;IAFL,IAAA,iBAAI,EAAC,aAAa,CAAC;IACnB,IAAA,wBAAW,EAAC,aAAa,CAAC;IACkC,WAAA,iBAAI,CAAA;;6CAAf,QAAQ,EAAa,iCAAqB;;uDAG3F;iCAlCW,sBAAsB;IADlC,IAAA,2BAAc,EAAC,OAAO,CAAC;qCAGgB,2CAAmB,EAC3B,0BAAW,EACF,6CAAoB,EAC1B,+BAAc,EACnB,6BAAS;GAN1B,sBAAsB,CAmClC"}
+{"version":3,"file":"otel-settings.controller.js","sourceRoot":"","sources":["../../../src/modules/otel/otel-settings.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8CAAyE;AACzE,wDAAqD;AAErD,gDAAoF;AAEpF,qEAAgE;AAChE,mEAA8D;AAC9D,iDAA6C;AAE7C,0EAA+D;AAGxD,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAClC,YACkB,mBAAwC,EACxC,WAAwB,EACxB,oBAA0C,EAC1C,cAA8B,EAC9B,SAAoB;mCAJpB,mBAAmB;2BACnB,WAAW;oCACX,oBAAoB;8BACpB,cAAc;yBACd,SAAS;IACxB,CAAC;IAIJ,WAAW,CAAC,IAA0B;QACrC,OAAO,IAAI,CAAC,mBAAmB,CAAC,WAAW,EAAE,CAAC;IAC/C,CAAC;IAIK,AAAN,KAAK,CAAC,cAAc,CACnB,IAA0B,EAC1B,IAAc,EACR,GAA0B;QAEhC,MAAM,IAAI,CAAC,mBAAmB,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QACjD,MAAM,IAAI,CAAC,oBAAoB,CAAC,kBAAkB,EAAE,CAAC;QACrD,MAAM,IAAI,CAAC,cAAc,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;QACxD,KAAK,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,EAAE,OAAO,EAAE,oBAAoB,EAAE,CAAC,CAAC;QACtE,OAAO,IAAI,CAAC,mBAAmB,CAAC,WAAW,EAAE,CAAC;IAC/C,CAAC;IAIK,AAAN,KAAK,CAAC,SAAS,CAAC,IAA0B,EAAE,IAAc,EAAQ,GAAqB;QACtF,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,CAAC,qBAAqB,CAAC,GAAG,CAAC,CAAC;QACvE,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;IACzD,CAAC;CACD,CAAA;;AAxBA;IAFC,IAAA,gBAAG,EAAC,WAAW,CAAC;IAChB,IAAA,wBAAW,EAAC,aAAa,CAAC;;;;yDAG1B;AAIK;IAFL,IAAA,gBAAG,EAAC,WAAW,CAAC;IAChB,IAAA,wBAAW,EAAC,aAAa,CAAC;IAIzB,WAAA,iBAAI,CAAA;;6CADC,QAAQ,EACH,iCAAqB;;4DAOhC;AAIK;IAFL,IAAA,iBAAI,EAAC,aAAa,CAAC;IACnB,IAAA,wBAAW,EAAC,aAAa,CAAC;IACkC,WAAA,iBAAI,CAAA;;6CAAf,QAAQ,EAAa,4BAAgB;;uDAGtF;iCAlCW,sBAAsB;IADlC,IAAA,2BAAc,EAAC,OAAO,CAAC;qCAGgB,2CAAmB,EAC3B,0BAAW,EACF,6CAAoB,EAC1B,+BAAc,EACnB,6BAAS;GAN1B,sBAAsB,CAmClC"}

package/dist/modules/redaction/redaction-context-hook.js

@@ -26,10 +26,11 @@ let RedactionContextHook = class RedactionContextHook {
     async execute(options) {
         const floor = await this.instanceRedactionEnforcementService.get();
         const workflow = (0, n8n_workflow_1.policyToChannels)(options.workflow.settings?.redactionPolicy ?? 'none');
+        const inherited = (0, n8n_workflow_1.redactionSettingToChannels)(options.context?.redaction);
         const floorEnforcesProduction = floor !== 'off';
         const floorEnforcesManual = floor === 'all';
-        const manual = workflow.manual || floorEnforcesManual;
-        const production = workflow.production || floorEnforcesProduction || manual;
+        const manual = workflow.manual || floorEnforcesManual || inherited.manual;
+        const production = workflow.production || floorEnforcesProduction || manual || inherited.production;
         const floorRaisedTheBar = (floorEnforcesProduction && !workflow.production) ||
             (floorEnforcesManual && !workflow.manual);
         const source = floorRaisedTheBar ? 'instance' : 'workflow';
@@ -49,6 +50,7 @@ exports.RedactionContextHook = RedactionContextHook;
 exports.RedactionContextHook = RedactionContextHook = __decorate([
     (0, decorators_1.ContextEstablishmentHook)({
         alwaysExecute: true,
+        runForSubExecution: true,
     }),
     __metadata("design:paramtypes", [instance_redaction_enforcement_service_1.InstanceRedactionEnforcementService])
 ], RedactionContextHook);

package/dist/modules/redaction/redaction-context-hook.js.map

@@ -1 +1 @@
-{"version":3,"file":"redaction-context-hook.js","sourceRoot":"","sources":["../../../src/modules/redaction/redaction-context-hook.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gDAMyB;AACzB,+CAAsE;AAEtE,qGAA+F;AAKxF,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAChC,YACkB,mCAAwE;QAAxE,wCAAmC,GAAnC,mCAAmC,CAAqC;QAG1F,oBAAe,GAAoB;YAClC,IAAI,EAAE,sBAAsB;SAC5B,CAAC;IAJC,CAAC;IAMJ,yBAAyB,CAAC,SAAiB;QAE1C,OAAO,KAAK,CAAC;IACd,CAAC;IASD,KAAK,CAAC,OAAO,CAAC,OAAoC;QACjD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,mCAAmC,CAAC,GAAG,EAAE,CAAC;QACnE,MAAM,QAAQ,GAAG,IAAA,+BAAgB,EAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,EAAE,eAAe,IAAI,MAAM,CAAC,CAAC;QAExF,MAAM,uBAAuB,GAAG,KAAK,KAAK,KAAK,CAAC;QAChD,MAAM,mBAAmB,GAAG,KAAK,KAAK,KAAK,CAAC;QAE5C,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,IAAI,mBAAmB,CAAC;QAUtD,MAAM,UAAU,GAAG,QAAQ,CAAC,UAAU,IAAI,uBAAuB,IAAI,MAAM,CAAC;QAM5E,MAAM,iBAAiB,GACtB,CAAC,uBAAuB,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC;YACjD,CAAC,mBAAmB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC3C,MAAM,MAAM,GAAoB,iBAAiB,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC;QAE5E,OAAO;YACN,aAAa,EAAE;gBACd,SAAS,EAAE;oBACV,OAAO,EAAE,CAAC;oBACV,UAAU;oBACV,MAAM;oBACN,MAAM;iBACN;aACD;SACD,CAAC;IACH,CAAC;CACD,CAAA;;+BA5DY,oBAAoB;IAHhC,IAAA,qCAAwB,EAAC;QACzB,aAAa,EAAE,IAAI;KACnB,CAAC;qCAGsD,4EAAmC;GAF9E,oBAAoB,CA4DhC"}
+{"version":3,"file":"redaction-context-hook.js","sourceRoot":"","sources":["../../../src/modules/redaction/redaction-context-hook.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gDAMyB;AACzB,+CAAkG;AAElG,qGAA+F;AAQxF,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAChC,YACkB,mCAAwE;QAAxE,wCAAmC,GAAnC,mCAAmC,CAAqC;QAG1F,oBAAe,GAAoB;YAClC,IAAI,EAAE,sBAAsB;SAC5B,CAAC;IAJC,CAAC;IAMJ,yBAAyB,CAAC,SAAiB;QAE1C,OAAO,KAAK,CAAC;IACd,CAAC;IAeD,KAAK,CAAC,OAAO,CAAC,OAAoC;QACjD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,mCAAmC,CAAC,GAAG,EAAE,CAAC;QACnE,MAAM,QAAQ,GAAG,IAAA,+BAAgB,EAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,EAAE,eAAe,IAAI,MAAM,CAAC,CAAC;QACxF,MAAM,SAAS,GAAG,IAAA,yCAA0B,EAAC,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAEzE,MAAM,uBAAuB,GAAG,KAAK,KAAK,KAAK,CAAC;QAChD,MAAM,mBAAmB,GAAG,KAAK,KAAK,KAAK,CAAC;QAE5C,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,IAAI,mBAAmB,IAAI,SAAS,CAAC,MAAM,CAAC;QAU1E,MAAM,UAAU,GACf,QAAQ,CAAC,UAAU,IAAI,uBAAuB,IAAI,MAAM,IAAI,SAAS,CAAC,UAAU,CAAC;QASlF,MAAM,iBAAiB,GACtB,CAAC,uBAAuB,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC;YACjD,CAAC,mBAAmB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC3C,MAAM,MAAM,GAAoB,iBAAiB,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC;QAE5E,OAAO;YACN,aAAa,EAAE;gBACd,SAAS,EAAE;oBACV,OAAO,EAAE,CAAC;oBACV,UAAU;oBACV,MAAM;oBACN,MAAM;iBACN;aACD;SACD,CAAC;IACH,CAAC;CACD,CAAA;;+BAvEY,oBAAoB;IANhC,IAAA,qCAAwB,EAAC;QACzB,aAAa,EAAE,IAAI;QAGnB,kBAAkB,EAAE,IAAI;KACxB,CAAC;qCAGsD,4EAAmC;GAF9E,oBAAoB,CAuEhC"}

package/dist/modules/source-control.ee/source-control-export.service.ee.js

@@ -398,9 +398,9 @@ let SourceControlExportService = class SourceControlExportService {
             const credentialIds = candidates.map((e) => e.id);
             const credentialsToBeExported = await this.sharedCredentialsRepository.findByCredentialIds(credentialIds, 'credential:owner');
             let missingIds = [];
-            if (credentialsToBeExported.length !== credentialIds.length) {
-                const foundCredentialIds = credentialsToBeExported.map((e) => e.credentialsId);
-                missingIds = credentialIds.filter((remote) => foundCredentialIds.findIndex((local) => local === remote) === -1);
+            const foundCredentialIds = new Set(credentialsToBeExported.map((e) => e.credentialsId));
+            if (foundCredentialIds.size !== credentialIds.length) {
+                missingIds = credentialIds.filter((remote) => !foundCredentialIds.has(remote));
             }
             await Promise.all(credentialsToBeExported.map(async (sharing) => {
                 const { name, type, data, id, isGlobal = false, isResolvable = false, resolvableAllowFallback = false, } = sharing.credentials;