n8n 2.46.0 → 2.46.2

package/dist/modules/mcp-registry/mcp-connection-discovery.service.js.map

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

package/dist/modules/mcp-registry/mcp-credential-access.d.ts

@@ -0,0 +1,3 @@
+import type { CredentialsFinderService } from '@n8n/backend-services';
+import type { CredentialsEntity, User } from '@n8n/db';
+export declare function findUsableMcpCredential(credentialsFinderService: CredentialsFinderService, credentialId: string, user: User): Promise<CredentialsEntity | null>;

package/dist/modules/mcp-registry/mcp-credential-access.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findUsableMcpCredential = findUsableMcpCredential;
+const permissions_1 = require("@n8n/permissions");
+async function findUsableMcpCredential(credentialsFinderService, credentialId, user) {
+    const connectable = await credentialsFinderService.findCredentialForUser(credentialId, user, [
+        'credential:connect',
+    ]);
+    if (connectable)
+        return connectable;
+    const readable = await credentialsFinderService.findCredentialForUser(credentialId, user, [
+        'credential:read',
+    ]);
+    if (!readable || readable.isResolvable)
+        return null;
+    return readable.isGlobal || (0, permissions_1.hasGlobalScope)(user, 'credential:use') ? readable : null;
+}
+//# sourceMappingURL=mcp-credential-access.js.map

package/dist/modules/mcp-registry/mcp-credential-access.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp-credential-access.js","sourceRoot":"","sources":["../../../src/modules/mcp-registry/mcp-credential-access.ts"],"names":[],"mappings":";;;AAEA,kDAAkD;AAU3C,KAAK,kCACX,wBAAkD,EAClD,YAAoB,EACpB,IAAU;IAEV,MAAM,WAAW,GAAG,MAAM,wBAAwB,CAAC,qBAAqB,CAAC,YAAY,EAAE,IAAI,EAAE;QAC5F,oBAAoB;KACpB,CAAC,CAAC;IACH,IAAI,WAAW;QAAE,OAAO,WAAW,CAAC;IAEpC,MAAM,QAAQ,GAAG,MAAM,wBAAwB,CAAC,qBAAqB,CAAC,YAAY,EAAE,IAAI,EAAE;QACzF,iBAAiB;KACjB,CAAC,CAAC;IACH,IAAI,CAAC,QAAQ,IAAI,QAAQ,CAAC,YAAY;QAAE,OAAO,IAAI,CAAC;IACpD,OAAO,QAAQ,CAAC,QAAQ,IAAI,IAAA,4BAAc,EAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC;AACtF,CAAC"}

package/dist/modules/oauth-server/database/repositories/oauth-authorization-code.repository.d.ts

@@ -1,5 +1,8 @@
-import { DataSource, Repository } from '@n8n/typeorm';
+import { BaseRepository, TransactionRunner, type OperationContext } from '@n8n/db';
+import { DataSource } from '@n8n/typeorm';
 import { AuthorizationCode } from '../entities/oauth-authorization-code.entity';
-export declare class AuthorizationCodeRepository extends Repository<AuthorizationCode> {
-    constructor(dataSource: DataSource);
+export declare class AuthorizationCodeRepository extends BaseRepository<AuthorizationCode> {
+    constructor(dataSource: DataSource, transactionRunner: TransactionRunner);
+    insertCode(code: Pick<AuthorizationCode, 'code' | 'clientId' | 'userId' | 'redirectUri' | 'codeChallenge' | 'codeChallengeMethod' | 'state' | 'resource' | 'scope' | 'expiresAt' | 'used'>, ctx: OperationContext): Promise<void>;
+    consumeCode(code: string, ctx: OperationContext): Promise<boolean>;
 }

package/dist/modules/oauth-server/database/repositories/oauth-authorization-code.repository.js

@@ -10,17 +10,25 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuthorizationCodeRepository = void 0;
+const db_1 = require("@n8n/db");
 const di_1 = require("@n8n/di");
 const typeorm_1 = require("@n8n/typeorm");
 const oauth_authorization_code_entity_1 = require("../entities/oauth-authorization-code.entity");
-let AuthorizationCodeRepository = class AuthorizationCodeRepository extends typeorm_1.Repository {
-    constructor(dataSource) {
-        super(oauth_authorization_code_entity_1.AuthorizationCode, dataSource.manager);
+let AuthorizationCodeRepository = class AuthorizationCodeRepository extends db_1.BaseRepository {
+    constructor(dataSource, transactionRunner) {
+        super(oauth_authorization_code_entity_1.AuthorizationCode, dataSource.manager, transactionRunner);
+    }
+    async insertCode(code, ctx) {
+        await this.managerFor(ctx).insert(oauth_authorization_code_entity_1.AuthorizationCode, code);
+    }
+    async consumeCode(code, ctx) {
+        const result = await this.managerFor(ctx).update(oauth_authorization_code_entity_1.AuthorizationCode, { code, used: false, expiresAt: (0, typeorm_1.MoreThan)(Date.now()) }, { used: true });
+        return (result.affected ?? 0) > 0;
     }
 };
 exports.AuthorizationCodeRepository = AuthorizationCodeRepository;
 exports.AuthorizationCodeRepository = AuthorizationCodeRepository = __decorate([
     (0, di_1.Service)(),
-    __metadata("design:paramtypes", [typeorm_1.DataSource])
+    __metadata("design:paramtypes", [typeorm_1.DataSource, db_1.TransactionRunner])
 ], AuthorizationCodeRepository);
 //# sourceMappingURL=oauth-authorization-code.repository.js.map

package/dist/modules/oauth-server/database/repositories/oauth-authorization-code.repository.js.map

@@ -1 +1 @@
-{"version":3,"file":"oauth-authorization-code.repository.js","sourceRoot":"","sources":["../../../../../src/modules/oauth-server/database/repositories/oauth-authorization-code.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAAkC;AAClC,0CAAsD;AAEtD,iGAAgF;AAGzE,IAAM,2BAA2B,GAAjC,MAAM,2BAA4B,SAAQ,oBAA6B;IAC7E,YAAY,UAAsB;QACjC,KAAK,CAAC,mDAAiB,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;IAC9C,CAAC;CACD,CAAA;;sCAJY,2BAA2B;IADvC,IAAA,YAAO,GAAE;qCAEe,oBAAU;GADtB,2BAA2B,CAIvC"}
+{"version":3,"file":"oauth-authorization-code.repository.js","sourceRoot":"","sources":["../../../../../src/modules/oauth-server/database/repositories/oauth-authorization-code.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAAmF;AACnF,gCAAkC;AAClC,0CAAoD;AAEpD,iGAAgF;AAGzE,IAAM,2BAA2B,GAAjC,MAAM,2BAA4B,SAAQ,mBAAiC;IACjF,YAAY,UAAsB,EAAE,iBAAoC;QACvE,KAAK,CAAC,mDAAiB,EAAE,UAAU,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;IACjE,CAAC;IAED,KAAK,CAAC,UAAU,CACf,IAaC,EACD,GAAqB;QAErB,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,mDAAiB,EAAE,IAAI,CAAC,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,IAAY,EAAE,GAAqB;QACpD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,MAAM,CAC/C,mDAAiB,EACjB,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,IAAA,kBAAQ,EAAC,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,EACtD,EAAE,IAAI,EAAE,IAAI,EAAE,CACd,CAAC;QACF,OAAO,CAAC,MAAM,CAAC,QAAQ,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IACnC,CAAC;CACD,CAAA;;sCAjCY,2BAA2B;IADvC,IAAA,YAAO,GAAE;qCAEe,oBAAU,EAAqB,sBAAiB;GAD5D,2BAA2B,CAiCvC"}

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

@@ -0,0 +1,9 @@
+import { BaseRepository, TransactionRunner, User, type OperationContext } from '@n8n/db';
+import { DataSource } from '@n8n/typeorm';
+export declare class OAuthGrantRepository extends BaseRepository<User> {
+    constructor(dataSource: DataSource, transactionRunner: TransactionRunner);
+    deleteGrantsForDisabledUsers(): Promise<void>;
+    lockUserForGrant(userId: string, ctx: OperationContext): Promise<User | null>;
+    private findLockedUser;
+    deleteUserGrants(userId: string, ctx: OperationContext): Promise<void>;
+}

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

@@ -0,0 +1,75 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OAuthGrantRepository = 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");
+const oauth_authorization_code_entity_1 = require("../entities/oauth-authorization-code.entity");
+const oauth_refresh_token_entity_1 = require("../entities/oauth-refresh-token.entity");
+const oauth_user_consent_entity_1 = require("../entities/oauth-user-consent.entity");
+let OAuthGrantRepository = class OAuthGrantRepository extends db_1.BaseRepository {
+    constructor(dataSource, transactionRunner) {
+        super(db_1.User, dataSource.manager, transactionRunner);
+    }
+    async deleteGrantsForDisabledUsers() {
+        const batchSize = 100;
+        let afterId;
+        while (true) {
+            const ids = await this.runInTransaction({}, async (manager) => {
+                const users = await manager.find(db_1.User, {
+                    where: { disabled: true, ...(afterId ? { id: (0, typeorm_1.MoreThan)(afterId) } : {}) },
+                    select: ['id'],
+                    order: { id: 'ASC' },
+                    take: batchSize,
+                    ...(manager.connection.options.type === 'postgres'
+                        ? { lock: { mode: 'pessimistic_write' } }
+                        : {}),
+                });
+                const userIds = users.map(({ id }) => id);
+                if (userIds.length > 0) {
+                    for (const entity of [oauth_access_token_entity_1.AccessToken, oauth_refresh_token_entity_1.RefreshToken, oauth_authorization_code_entity_1.AuthorizationCode, oauth_user_consent_entity_1.UserConsent]) {
+                        await manager.delete(entity, { userId: (0, typeorm_1.In)(userIds) });
+                    }
+                }
+                return userIds;
+            });
+            if (ids.length < batchSize)
+                return;
+            afterId = ids.at(-1);
+        }
+    }
+    async lockUserForGrant(userId, ctx) {
+        return await this.findLockedUser(this.managerFor(ctx), userId);
+    }
+    async findLockedUser(manager, userId) {
+        return await manager.findOne(db_1.User, {
+            where: { id: userId },
+            ...(manager.connection.options.type === 'postgres'
+                ? { lock: { mode: 'pessimistic_write' } }
+                : {}),
+        });
+    }
+    async deleteUserGrants(userId, ctx) {
+        const manager = this.managerFor(ctx);
+        await manager.delete(oauth_access_token_entity_1.AccessToken, { userId });
+        await manager.delete(oauth_refresh_token_entity_1.RefreshToken, { userId });
+        await manager.delete(oauth_authorization_code_entity_1.AuthorizationCode, { userId });
+        await manager.delete(oauth_user_consent_entity_1.UserConsent, { userId });
+    }
+};
+exports.OAuthGrantRepository = OAuthGrantRepository;
+exports.OAuthGrantRepository = OAuthGrantRepository = __decorate([
+    (0, di_1.Service)(),
+    __metadata("design:paramtypes", [typeorm_1.DataSource, db_1.TransactionRunner])
+], OAuthGrantRepository);
+//# sourceMappingURL=oauth-grant.repository.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"oauth-grant.repository.js","sourceRoot":"","sources":["../../../../../src/modules/oauth-server/database/repositories/oauth-grant.repository.ts"],"names":[],"mappings":"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"}

package/dist/modules/oauth-server/database/repositories/oauth-user-consent.repository.d.ts

@@ -1,5 +1,6 @@
 import type { McpClientConnectedPeriod } from '@n8n/api-types';
-import { DataSource, Repository } from '@n8n/typeorm';
+import { BaseRepository, TransactionRunner, type OperationContext } from '@n8n/db';
+import { DataSource } from '@n8n/typeorm';
 import { UserConsent } from '../entities/oauth-user-consent.entity';
 type ConsentOwner = {
     id: string;
@@ -18,8 +19,10 @@ export type FindConnectedClientsOptions = {
     skip?: number;
     take?: number;
 };
-export declare class UserConsentRepository extends Repository<UserConsent> {
-    constructor(dataSource: DataSource);
+export declare class UserConsentRepository extends BaseRepository<UserConsent> {
+    constructor(dataSource: DataSource, transactionRunner: TransactionRunner);
+    saveGrant(userId: string, clientId: string, scope: string[], ctx: OperationContext): Promise<void>;
+    findGrant(userId: string, clientId: string, ctx: OperationContext): Promise<UserConsent | null>;
     findConnectedClients(options: FindConnectedClientsOptions): Promise<{
         rows: UserConsent[];
         total: number;

package/dist/modules/oauth-server/database/repositories/oauth-user-consent.repository.js

@@ -10,13 +10,20 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UserConsentRepository = void 0;
+const db_1 = require("@n8n/db");
 const di_1 = require("@n8n/di");
 const typeorm_1 = require("@n8n/typeorm");
 const oauth_user_consent_entity_1 = require("../entities/oauth-user-consent.entity");
 const DAY_IN_MS = 24 * 60 * 60 * 1000;
-let UserConsentRepository = class UserConsentRepository extends typeorm_1.Repository {
-    constructor(dataSource) {
-        super(oauth_user_consent_entity_1.UserConsent, dataSource.manager);
+let UserConsentRepository = class UserConsentRepository extends db_1.BaseRepository {
+    constructor(dataSource, transactionRunner) {
+        super(oauth_user_consent_entity_1.UserConsent, dataSource.manager, transactionRunner);
+    }
+    async saveGrant(userId, clientId, scope, ctx) {
+        await this.managerFor(ctx).upsert(oauth_user_consent_entity_1.UserConsent, { userId, clientId, scope, grantedAt: Date.now() }, ['userId', 'clientId']);
+    }
+    async findGrant(userId, clientId, ctx) {
+        return await this.managerFor(ctx).findOneBy(oauth_user_consent_entity_1.UserConsent, { userId, clientId });
     }
     async findConnectedClients(options) {
         const qb = this.createQueryBuilder('consent')
@@ -75,6 +82,6 @@ let UserConsentRepository = class UserConsentRepository extends typeorm_1.Reposi
 exports.UserConsentRepository = UserConsentRepository;
 exports.UserConsentRepository = UserConsentRepository = __decorate([
     (0, di_1.Service)(),
-    __metadata("design:paramtypes", [typeorm_1.DataSource])
+    __metadata("design:paramtypes", [typeorm_1.DataSource, db_1.TransactionRunner])
 ], UserConsentRepository);
 //# sourceMappingURL=oauth-user-consent.repository.js.map

package/dist/modules/oauth-server/database/repositories/oauth-user-consent.repository.js.map

@@ -1 +1 @@
-{"version":3,"file":"oauth-user-consent.repository.js","sourceRoot":"","sources":["../../../../../src/modules/oauth-server/database/repositories/oauth-user-consent.repository.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"oauth-user-consent.repository.js","sourceRoot":"","sources":["../../../../../src/modules/oauth-server/database/repositories/oauth-user-consent.repository.ts"],"names":[],"mappings":"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"}

package/dist/modules/oauth-server/oauth-authorization-code.service.d.ts

@@ -1,14 +1,15 @@
+import type { OperationContext } from '@n8n/db';
 import type { AuthorizationCode } from './database/entities/oauth-authorization-code.entity';
 import { AuthorizationCodeRepository } from './database/repositories/oauth-authorization-code.repository';
 export declare class OAuthAuthorizationCodeService {
     private readonly authorizationCodeRepository;
     private readonly AUTHORIZATION_CODE_EXPIRY_MS;
     constructor(authorizationCodeRepository: AuthorizationCodeRepository);
-    createAuthorizationCode(clientId: string, userId: string, redirectUri: string, codeChallenge: string, state: string | null, resource?: string, scopes?: string[]): Promise<string>;
+    createAuthorizationCode(clientId: string, userId: string, redirectUri: string, codeChallenge: string, state: string | null, resource?: string, scopes?: string[], ctx?: OperationContext): Promise<string>;
     findAndValidateAuthorizationCode(authorizationCode: string, clientId: string): Promise<AuthorizationCode>;
     findAuthorizationCode(code: string, clientId: string, redirectUri?: string): Promise<AuthorizationCode | null>;
     validateAndConsumeAuthorizationCode(authorizationCode: string, clientId: string, redirectUri?: string): Promise<AuthorizationCode>;
-    markAuthorizationCodeAsUsed(authorizationCode: string): Promise<void>;
+    markAuthorizationCodeAsUsed(authorizationCode: string, ctx?: OperationContext): Promise<void>;
     deleteForGrant(clientId: string, userId: string): Promise<void>;
     getCodeChallenge(authorizationCode: string, clientId: string): Promise<string>;
 }

package/dist/modules/oauth-server/oauth-authorization-code.service.js

@@ -20,9 +20,9 @@ let OAuthAuthorizationCodeService = class OAuthAuthorizationCodeService {
         this.authorizationCodeRepository = authorizationCodeRepository;
         this.AUTHORIZATION_CODE_EXPIRY_MS = 10 * constants_1.Time.minutes.toMilliseconds;
     }
-    async createAuthorizationCode(clientId, userId, redirectUri, codeChallenge, state, resource, scopes = []) {
+    async createAuthorizationCode(clientId, userId, redirectUri, codeChallenge, state, resource, scopes = [], ctx = {}) {
         const code = (0, node_crypto_1.randomBytes)(32).toString('hex');
-        await this.authorizationCodeRepository.insert({
+        await this.authorizationCodeRepository.insertCode({
             code,
             clientId,
             userId,
@@ -34,7 +34,7 @@ let OAuthAuthorizationCodeService = class OAuthAuthorizationCodeService {
             scope: scopes,
             expiresAt: Date.now() + this.AUTHORIZATION_CODE_EXPIRY_MS,
             used: false,
-        });
+        }, ctx);
         return code;
     }
     async findAndValidateAuthorizationCode(authorizationCode, clientId) {
@@ -84,10 +84,8 @@ let OAuthAuthorizationCodeService = class OAuthAuthorizationCodeService {
         authRecord.used = true;
         return authRecord;
     }
-    async markAuthorizationCodeAsUsed(authorizationCode) {
-        const result = await this.authorizationCodeRepository.update({ code: authorizationCode, used: false }, { used: true });
-        const numAffected = result.affected ?? 0;
-        if (numAffected < 1) {
+    async markAuthorizationCodeAsUsed(authorizationCode, ctx = {}) {
+        if (!(await this.authorizationCodeRepository.consumeCode(authorizationCode, ctx))) {
             throw new errors_js_1.InvalidGrantError('Authorization code already used');
         }
     }

package/dist/modules/oauth-server/oauth-authorization-code.service.js.map

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

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

@@ -5,6 +5,7 @@ import { OAuthClientRepository } from './database/repositories/oauth-client.repo
 import { UserConsentRepository } from './database/repositories/oauth-user-consent.repository';
 import { OAuthAuthorizationCodeService } from './oauth-authorization-code.service';
 import { OAuthSessionService, type OAuthSessionPayload } from './oauth-session.service';
+import { OAuthGrantService } from './oauth-grant.service';
 import { UrlService } from '@n8n/backend-services';
 import { ProtectedResourceRegistry, type ProtectedResource } from '@n8n/backend-services/auth';
 type ConsentDetailsResult = {
@@ -39,7 +40,8 @@ export declare class OAuthConsentService {
     private readonly authorizationCodeService;
     private readonly protectedResourceRegistry;
     private readonly urlService;
-    constructor(logger: Logger, oauthSessionService: OAuthSessionService, oauthClientRepository: OAuthClientRepository, userConsentRepository: UserConsentRepository, authorizationCodeService: OAuthAuthorizationCodeService, protectedResourceRegistry: ProtectedResourceRegistry, urlService: UrlService);
+    private readonly grantService;
+    constructor(logger: Logger, oauthSessionService: OAuthSessionService, oauthClientRepository: OAuthClientRepository, userConsentRepository: UserConsentRepository, authorizationCodeService: OAuthAuthorizationCodeService, protectedResourceRegistry: ProtectedResourceRegistry, urlService: UrlService, grantService: OAuthGrantService);
     getConsentDetails(sessionToken: string, user: User): Promise<ConsentDetailsResult | null>;
     private supportedScopesFor;
     private grantableScopes;

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

@@ -17,12 +17,13 @@ const oauth_client_repository_1 = require("./database/repositories/oauth-client.
 const oauth_user_consent_repository_1 = require("./database/repositories/oauth-user-consent.repository");
 const oauth_authorization_code_service_1 = require("./oauth-authorization-code.service");
 const oauth_session_service_1 = require("./oauth-session.service");
+const oauth_grant_service_1 = require("./oauth-grant.service");
 const oauth_helpers_1 = require("./oauth.helpers");
 const errors_1 = require("@n8n/errors");
 const backend_services_1 = require("@n8n/backend-services");
 const auth_1 = require("@n8n/backend-services/auth");
 let OAuthConsentService = class OAuthConsentService {
-    constructor(logger, oauthSessionService, oauthClientRepository, userConsentRepository, authorizationCodeService, protectedResourceRegistry, urlService) {
+    constructor(logger, oauthSessionService, oauthClientRepository, userConsentRepository, authorizationCodeService, protectedResourceRegistry, urlService, grantService) {
         this.logger = logger;
         this.oauthSessionService = oauthSessionService;
         this.oauthClientRepository = oauthClientRepository;
@@ -30,6 +31,7 @@ let OAuthConsentService = class OAuthConsentService {
         this.authorizationCodeService = authorizationCodeService;
         this.protectedResourceRegistry = protectedResourceRegistry;
         this.urlService = urlService;
+        this.grantService = grantService;
     }
     async getConsentDetails(sessionToken, user) {
         try {
@@ -159,21 +161,18 @@ let OAuthConsentService = class OAuthConsentService {
         });
         throw new errors_1.ForbiddenError('User is not authorized for the requested resource');
     }
-    async issueGrant(user, sessionPayload, grantedScopes) {
-        const issuer = this.urlService.getInstanceBaseUrl();
-        await this.userConsentRepository.upsert({
-            userId: user.id,
-            clientId: sessionPayload.clientId,
-            grantedAt: Date.now(),
-            scope: grantedScopes,
-        }, ['userId', 'clientId']);
-        const code = await this.authorizationCodeService.createAuthorizationCode(sessionPayload.clientId, user.id, sessionPayload.redirectUri, sessionPayload.codeChallenge, sessionPayload.state, sessionPayload.resource, grantedScopes);
-        const successRedirectUrl = oauth_helpers_1.OAuthHelpers.buildSuccessRedirectUrl(sessionPayload.redirectUri, code, sessionPayload.state, issuer);
-        this.logger.info('Consent approved', {
-            clientId: sessionPayload.clientId,
-            userId: user.id,
-        });
-        return { redirectUrl: successRedirectUrl };
+    async issueGrant(user, sessionPayload, grantedScopes, ctx = {}) {
+        return await this.grantService.runForActiveUser(user.id, async (ctx) => {
+            const issuer = this.urlService.getInstanceBaseUrl();
+            await this.userConsentRepository.saveGrant(user.id, sessionPayload.clientId, grantedScopes, ctx);
+            const code = await this.authorizationCodeService.createAuthorizationCode(sessionPayload.clientId, user.id, sessionPayload.redirectUri, sessionPayload.codeChallenge, sessionPayload.state, sessionPayload.resource, grantedScopes, ctx);
+            const successRedirectUrl = oauth_helpers_1.OAuthHelpers.buildSuccessRedirectUrl(sessionPayload.redirectUri, code, sessionPayload.state, issuer);
+            this.logger.info('Consent approved', {
+                clientId: sessionPayload.clientId,
+                userId: user.id,
+            });
+            return { redirectUrl: successRedirectUrl };
+        }, ctx);
     }
     async resolveGrantedScopes(sessionPayload, scopes, user) {
         const resource = sessionPayload.resource
@@ -200,9 +199,7 @@ let OAuthConsentService = class OAuthConsentService {
             (await this.protectedResourceRegistry.getByResourceUrl(sessionPayload.resource));
         if (!resource?.isFirstParty)
             return null;
-        const consent = await this.userConsentRepository.findOne({
-            where: { clientId: sessionPayload.clientId, userId: user.id },
-        });
+        const consent = await this.userConsentRepository.findGrant(user.id, sessionPayload.clientId, {});
         if (!consent) {
             return null;
         }
@@ -223,12 +220,19 @@ let OAuthConsentService = class OAuthConsentService {
             });
             return null;
         }
-        return await this.issueGrant(user, sessionPayload, consented);
+        return await this.grantService.runForActiveUser(user.id, async (ctx) => {
+            const currentConsent = await this.userConsentRepository.findGrant(user.id, sessionPayload.clientId, ctx);
+            if (!currentConsent ||
+                currentConsent.id !== consent.id ||
+                currentConsent.grantedAt !== consent.grantedAt)
+                return null;
+            return await this.issueGrant(user, sessionPayload, consented, ctx);
+        });
     }
 };
 exports.OAuthConsentService = OAuthConsentService;
 exports.OAuthConsentService = OAuthConsentService = __decorate([
     (0, di_1.Service)(),
-    __metadata("design:paramtypes", [backend_common_1.Logger, oauth_session_service_1.OAuthSessionService, oauth_client_repository_1.OAuthClientRepository, oauth_user_consent_repository_1.UserConsentRepository, oauth_authorization_code_service_1.OAuthAuthorizationCodeService, auth_1.ProtectedResourceRegistry, backend_services_1.UrlService])
+    __metadata("design:paramtypes", [backend_common_1.Logger, oauth_session_service_1.OAuthSessionService, oauth_client_repository_1.OAuthClientRepository, oauth_user_consent_repository_1.UserConsentRepository, oauth_authorization_code_service_1.OAuthAuthorizationCodeService, auth_1.ProtectedResourceRegistry, backend_services_1.UrlService, oauth_grant_service_1.OAuthGrantService])
 ], OAuthConsentService);
 //# sourceMappingURL=oauth-consent.service.js.map

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

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

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

@@ -0,0 +1,8 @@
+import { TransactionRunner, type OperationContext } from '@n8n/db';
+import { OAuthGrantRepository } from './database/repositories/oauth-grant.repository';
+export declare class OAuthGrantService {
+    private readonly txRunner;
+    private readonly grantRepository;
+    constructor(txRunner: TransactionRunner, grantRepository: OAuthGrantRepository);
+    runForActiveUser<T>(userId: string, work: (ctx: OperationContext) => Promise<T>, ctx?: OperationContext): Promise<T>;
+}

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

@@ -0,0 +1,36 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OAuthGrantService = void 0;
+const errors_js_1 = require("@modelcontextprotocol/sdk/server/auth/errors.js");
+const db_1 = require("@n8n/db");
+const di_1 = require("@n8n/di");
+const oauth_grant_repository_1 = require("./database/repositories/oauth-grant.repository");
+let OAuthGrantService = class OAuthGrantService {
+    constructor(txRunner, grantRepository) {
+        this.txRunner = txRunner;
+        this.grantRepository = grantRepository;
+    }
+    async runForActiveUser(userId, work, ctx = {}) {
+        return await this.txRunner.run(ctx, async (ctx) => {
+            const user = await this.grantRepository.lockUserForGrant(userId, ctx);
+            if (!user || user.disabled)
+                throw new errors_js_1.InvalidGrantError('Invalid authorization grant');
+            return await work(ctx);
+        });
+    }
+};
+exports.OAuthGrantService = OAuthGrantService;
+exports.OAuthGrantService = OAuthGrantService = __decorate([
+    (0, di_1.Service)(),
+    __metadata("design:paramtypes", [db_1.TransactionRunner, oauth_grant_repository_1.OAuthGrantRepository])
+], OAuthGrantService);
+//# sourceMappingURL=oauth-grant.service.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"oauth-grant.service.js","sourceRoot":"","sources":["../../../src/modules/oauth-server/oauth-grant.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+EAAoF;AACpF,gCAAmE;AACnE,gCAAkC;AAElC,2FAAsF;AAG/E,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAC7B,YACkB,QAA2B,EAC3B,eAAqC;wBADrC,QAAQ;+BACR,eAAe;IAC9B,CAAC;IAEJ,KAAK,CAAC,gBAAgB,CACrB,MAAc,EACd,IAA2C,EAC3C,GAAG,GAAqB,EAAE;QAE1B,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;YACjD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,gBAAgB,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;YACtE,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,QAAQ;gBAAE,MAAM,IAAI,6BAAiB,CAAC,6BAA6B,CAAC,CAAC;YACvF,OAAO,MAAM,IAAI,CAAC,GAAG,CAAC,CAAC;QACxB,CAAC,CAAC,CAAC;IACJ,CAAC;CACD,CAAA;;4BAjBY,iBAAiB;IAD7B,IAAA,YAAO,GAAE;qCAGmB,sBAAiB,EACV,6CAAoB;GAH3C,iBAAiB,CAiB7B"}

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

@@ -7,13 +7,25 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OAuthServerModule = void 0;
+const backend_common_1 = require("@n8n/backend-common");
 const decorators_1 = require("@n8n/decorators");
 const di_1 = require("@n8n/di");
 const n8n_core_1 = require("n8n-core");
 let OAuthServerModule = class OAuthServerModule {
     async init() {
         const { instanceType } = di_1.Container.get(n8n_core_1.InstanceSettings);
+        const { OAuthGrantRepository } = await import('./database/repositories/oauth-grant.repository.js');
+        const { UserDeactivationHooks } = await import('../../services/user-deactivation-hooks.service.js');
+        const grants = di_1.Container.get(OAuthGrantRepository);
+        di_1.Container.get(UserDeactivationHooks).register('oauth-server', async (userId, ctx) => {
+            await grants.deleteUserGrants(userId, ctx);
+        });
         if (instanceType === 'main') {
+            await grants.deleteGrantsForDisabledUsers().catch((error) => {
+                di_1.Container.get(backend_common_1.Logger).error('Failed to clean up OAuth grants for disabled users', {
+                    error,
+                });
+            });
             await import('./oauth.controller.js');
             await import('./oauth-consent.controller.js');
             await import('./oauth-clients.controller.js');