@trokky/trokky 3.5.1 → 3.5.2

package/dist/core/services/auth-service.js

@@ -1,3 +1,4 @@
+import { scopedPermissions } from '../security/oauth2/scoped-permissions.js';
 /**
  * Authentication service: password verification, JWT issuance and the
  * login flows (including MFA hand-off). Extracted from TrokkyCore.
@@ -74,22 +75,77 @@ export class AuthService {
         if (!decoded || !userId || !username) {
             return null;
         }
+        // Every JWT this server signs has one job. A Studio session token carries no `type`; an
+        // OAuth2 access token is `oauth2_access`. Anything else — an OAuth2 refresh token, an MFA
+        // pending or setup token — must not work as a bearer credential, or an MFA-pending token
+        // would be a login that skipped the second factor.
+        const tokenType = decoded.type;
+        if (tokenType !== undefined && tokenType !== 'oauth2_access') {
+            return null;
+        }
+        const scopes = tokenType === 'oauth2_access' && Array.isArray(decoded.scopes)
+            ? decoded.scopes
+            : undefined;
+        if (tokenType === 'oauth2_access' && !scopes) {
+            return null;
+        }
+        const loginAt = decoded.iat ? new Date(decoded.iat * 1000).toISOString() : new Date().toISOString();
+        const expiresAt = decoded.exp ? new Date(decoded.exp * 1000).toISOString() : undefined;
         // Fetch fresh user data from storage to get current permissions
         try {
             const currentUser = await this.deps.getUser(userId);
             if (!currentUser || !currentUser.isActive) {
                 return null; // User no longer exists or is inactive
             }
+            if (scopes) {
+                // Valid only while the approval behind it stands: revoking it in Studio ends every
+                // token issued under it, this one included
+                const grantId = typeof decoded.grantId === 'string' ? decoded.grantId : undefined;
+                if (!grantId || !this.deps.isOAuth2GrantLive || !(await this.deps.isOAuth2GrantLive(currentUser, grantId))) {
+                    return null;
+                }
+                const clientId = typeof decoded.clientId === 'string' ? decoded.clientId : undefined;
+                // A trusted (first-party) client acts as the user outright. Its session carries the
+                // client id and no scopes: routes treat it as the user, the account routes still
+                // refuse it because it is an OAuth2 token.
+                if (clientId && this.deps.isTrustedOAuth2Client?.(clientId)) {
+                    return {
+                        userId,
+                        username,
+                        role: currentUser.role,
+                        permissions: currentUser.permissions,
+                        loginAt,
+                        expiresAt,
+                        clientId
+                    };
+                }
+                // Acts for the user, holds only what the user granted, and is never an admin: the
+                // `api` role routes every check through `permissions` alone.
+                return {
+                    userId,
+                    username,
+                    role: 'api',
+                    permissions: scopedPermissions(currentUser, scopes),
+                    loginAt,
+                    expiresAt,
+                    scopes,
+                    clientId
+                };
+            }
             return {
                 userId,
                 username,
                 role: currentUser.role, // Use fresh role from storage
                 permissions: currentUser.permissions, // Use fresh permissions from storage
-                loginAt: decoded.iat ? new Date(decoded.iat * 1000).toISOString() : new Date().toISOString(),
-                expiresAt: decoded.exp ? new Date(decoded.exp * 1000).toISOString() : undefined
+                loginAt,
+                expiresAt
             };
         }
         catch (error) {
+            // A scoped token's rights depend on the user's current ones: without them, refuse
+            if (scopes) {
+                return null;
+            }
             // If we can't fetch user data, fall back to JWT payload for backwards compatibility
             if (!decoded.role || !decoded.permissions) {
                 return null;
@@ -99,8 +155,8 @@ export class AuthService {
                 username,
                 role: decoded.role,
                 permissions: decoded.permissions,
-                loginAt: decoded.iat ? new Date(decoded.iat * 1000).toISOString() : new Date().toISOString(),
-                expiresAt: decoded.exp ? new Date(decoded.exp * 1000).toISOString() : undefined
+                loginAt,
+                expiresAt
             };
         }
     }
@@ -493,7 +549,9 @@ export class AuthService {
         try {
             // Verify the refresh token
             const session = await this.verifyAuthToken(refreshToken);
-            if (!session) {
+            // Only a Studio session renews into a Studio session. An OAuth2 access token must not:
+            // that would turn a scoped grant into the user's full rights.
+            if (!session || session.clientId) {
                 return null;
             }
             // Get the user

package/dist/core/services/auth-service.js.map

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

package/dist/core/services/document-service.d.ts.map

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

package/dist/core/services/document-service.js

@@ -57,7 +57,11 @@ export class DocumentService {
                 ipAddress: auditContext.ipAddress,
                 userAgent: auditContext.userAgent,
                 sessionId: undefined, // Could be added later if needed
-                metadata: undefined // Could be added later for additional context
+                // An application acting for the user: the history says "by <user> via <application>",
+                // so a person can tell an agent's change from their own
+                metadata: auditContext.clientId
+                    ? { via: { clientId: auditContext.clientId, clientName: auditContext.clientName ?? auditContext.clientId } }
+                    : undefined
             });
             this.deps.auditLog.info('Audit log created', {
                 documentId,

package/dist/core/services/document-service.js.map

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

package/dist/core/services/oauth2-server-service.d.ts

@@ -3,6 +3,7 @@ import type { TrokkyLogger } from '../utils/logger.js';
 import { OAuth2AuthorizationServer } from '../security/oauth2/index.js';
 import type { OAuth2Scope, TokenResponse } from '../types/oauth2.js';
 import { User, UpdateUserData } from '../types/index.js';
+import type { DataStorageAdapter } from '../types/storage-adapters.js';
 export interface OAuth2ServerServiceDependencies {
     logger: TrokkyLogger;
     cryptoAdapter: CryptoAdapter;
@@ -14,7 +15,27 @@ export interface OAuth2ServerServiceDependencies {
     } | undefined;
     getUser: (id: string) => Promise<User | null>;
     updateUser: (id: string, userData: UpdateUserData) => Promise<User>;
+    /** Where revocations are recorded, one record per grant */
+    getDataStorage: () => DataStorageAdapter | null | undefined;
 }
+/**
+ * One approval a person gave an application: what the tokens it holds may do, and the
+ * handle to take them back. Kept on the user record, under preferences (the one field every
+ * storage adapter persists as-is), next to the consents.
+ */
+export interface OAuth2Grant {
+    id: string;
+    clientId: string;
+    /** The client's name when the grant was made, as the person saw it */
+    clientName: string;
+    scopes: OAuth2Scope[];
+    createdAt: string;
+    lastUsedAt?: string;
+    /** Where the sign-in came from, as its token request identified itself */
+    userAgent?: string;
+}
+export declare const OAUTH2_GRANTS_KEY = "_oauth2Grants";
+export declare function grantsOf(user: Pick<User, 'preferences'> | null | undefined): Record<string, OAuth2Grant>;
 /**
  * OAuth2 authorization-server token issuance and consent management.
  */
@@ -30,7 +51,7 @@ export declare class OAuth2ServerService {
      * Generate OAuth2 tokens for a user
      * Used by the OAuth2 routes to create access and refresh tokens
      */
-    generateOAuth2Tokens(user: User, scopes: OAuth2Scope[], clientId: string): Promise<{
+    generateOAuth2Tokens(user: User, scopes: OAuth2Scope[], clientId: string, grantId: string): Promise<{
         accessToken: string;
         refreshToken?: string;
         expiresIn: number;
@@ -40,6 +61,30 @@ export declare class OAuth2ServerService {
      * Returns new tokens if the refresh token is valid
      */
     refreshOAuth2Token(refreshToken: string, clientId: string, requestedScope?: string): Promise<TokenResponse | null>;
+    /** Record a new approval, when an application first receives tokens for it */
+    createGrant(user: User, clientId: string, scopes: OAuth2Scope[], userAgent?: string): Promise<OAuth2Grant>;
+    listGrants(userId: string): Promise<OAuth2Grant[]>;
+    /**
+     * Whether tokens issued under a grant still work: it is the user's own, it has been used
+     * within the refresh-token lifetime (after that no token of it can be valid), and it has
+     * not been revoked.
+     */
+    isGrantLive(user: Pick<User, 'preferences'>, grantId: string): Promise<boolean>;
+    /**
+     * Revoke one grant: every token issued under it stops working at once. The consent for its
+     * client goes too, so the application has to ask again rather than be approved silently.
+     */
+    revokeGrant(userId: string, grantId: string): Promise<boolean>;
+    /**
+     * RFC 7009: revoke the grant behind a token the caller holds. Possessing the token is the
+     * authorisation. Unknown, invalid or already revoked tokens are not an error.
+     */
+    revokeByToken(token: string, clientId?: string): Promise<void>;
+    private hasLapsed;
+    /** Outlives every token issued under the grant, and every copy of it a stale write restores */
+    private recordRevocation;
+    /** Read-modify-write of the grants under the user's lock, dropping lapsed ones on the way */
+    private updateGrants;
     /**
      * Check if a user has an existing consent for a client with the given scopes
      * Returns the consent if all requested scopes are already consented, null otherwise
@@ -53,9 +98,11 @@ export declare class OAuth2ServerService {
      * Stores in user preferences for persistence
      */
     saveUserConsent(userId: string, clientId: string, scopes: OAuth2Scope[], expiresInDays?: number): Promise<boolean>;
+    private writeUserConsent;
     /**
      * Revoke user consent for a client
      */
     revokeUserConsent(userId: string, clientId: string): Promise<boolean>;
+    private removeUserConsent;
 }
 //# sourceMappingURL=oauth2-server-service.d.ts.map

package/dist/core/services/oauth2-server-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"oauth2-server-service.d.ts","sourceRoot":"","sources":["../../../src/core/services/oauth2-server-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACtD,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAA;AACvE,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AACpE,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAExD,MAAM,WAAW,+BAA+B;IAC9C,MAAM,EAAE,YAAY,CAAA;IACpB,aAAa,EAAE,aAAa,CAAA;IAC5B,SAAS,EAAE,MAAM,CAAA;IACjB,eAAe,EAAE,MAAM,yBAAyB,GAAG,IAAI,CAAA;IACvD,gBAAgB,EAAE,MAAM;QAAE,cAAc,CAAC,EAAE,MAAM,CAAC;QAAC,eAAe,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS,CAAA;IACzF,OAAO,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC,CAAA;IAC7C,UAAU,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAc,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;CACpE;AAED;;GAEG;AACH,qBAAa,mBAAmB;IAClB,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAAJ,IAAI,EAAE,+BAA+B;IAElE;;;OAGG;IACI,eAAe,IAAI,yBAAyB,GAAG,IAAI;IAI1D;;;OAGG;IACU,oBAAoB,CAC/B,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,WAAW,EAAE,EACrB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC;QACT,WAAW,EAAE,MAAM,CAAA;QACnB,YAAY,CAAC,EAAE,MAAM,CAAA;QACrB,SAAS,EAAE,MAAM,CAAA;KAClB,CAAC;IAoDF;;;OAGG;IACU,kBAAkB,CAC7B,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,MAAM,EAChB,cAAc,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;IAqEhC;;;OAGG;IACU,cAAc,CACzB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,eAAe,EAAE,WAAW,EAAE,GAC7B,OAAO,CAAC;QAAE,UAAU,EAAE,OAAO,CAAC;QAAC,eAAe,EAAE,WAAW,EAAE,CAAA;KAAE,CAAC;IAsDnE;;;OAGG;IACU,eAAe,CAC1B,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,WAAW,EAAE,EACrB,aAAa,CAAC,EAAE,MAAM,GACrB,OAAO,CAAC,OAAO,CAAC;IAqEnB;;OAEG;IACU,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CA+BnF"}
+{"version":3,"file":"oauth2-server-service.d.ts","sourceRoot":"","sources":["../../../src/core/services/oauth2-server-service.ts"],"names":[],"mappings":"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"}

package/dist/core/services/oauth2-server-service.js

@@ -1,3 +1,37 @@
+import { getAuthFlowState, saveAuthFlowState } from '../security/auth-flow-store.js';
+export const OAUTH2_GRANTS_KEY = '_oauth2Grants';
+export function grantsOf(user) {
+    const grants = user?.preferences?.[OAUTH2_GRANTS_KEY];
+    return grants && typeof grants === 'object' ? grants : {};
+}
+/**
+ * A revocation, recorded under the grant's own id. The grant list sits in the user's
+ * preferences, which several writers read and write back whole (consents, MFA, password
+ * reset, a user edit), so a write that read the preferences before a revoke can put the grant
+ * back. This record is written once and never rewritten by anything else, so a revoke stands
+ * whatever races it, on every adapter and every replica.
+ */
+const REVOKED_GRANT_KIND = 'oauth2_grant_revoked';
+/** How often a renewal records `lastUsedAt`: each write is a user write and an audit event */
+const LAST_USED_EVERY_MS = 12 * 60 * 60 * 1000;
+/** Slack on the grant's lifetime for that throttling, so a grant in use never lapses */
+const LIFETIME_SLACK_MS = 24 * 60 * 60 * 1000;
+/**
+ * Grant writes for one user run one after another in this process: five devices finishing
+ * their sign-in at once each add a grant, and none may overwrite another's.
+ */
+const userLocks = new Map();
+function withUserLock(userId, work) {
+    const previous = userLocks.get(userId) ?? Promise.resolve();
+    const run = previous.catch(() => undefined).then(work);
+    const tail = run.catch(() => undefined);
+    userLocks.set(userId, tail);
+    void tail.then(() => {
+        if (userLocks.get(userId) === tail)
+            userLocks.delete(userId);
+    });
+    return run;
+}
 /**
  * OAuth2 authorization-server token issuance and consent management.
  */
@@ -17,17 +51,19 @@ export class OAuth2ServerService {
      * Generate OAuth2 tokens for a user
      * Used by the OAuth2 routes to create access and refresh tokens
      */
-    async generateOAuth2Tokens(user, scopes, clientId) {
+    async generateOAuth2Tokens(user, scopes, clientId, grantId) {
         const accessTokenTtl = this.deps.getOAuth2Options()?.accessTokenTtl ?? 3600;
         const refreshTokenTtl = this.deps.getOAuth2Options()?.refreshTokenTtl ?? 2592000;
         const includeRefreshToken = scopes.includes('offline_access');
         // Convert OAuth2 scopes to permissions for the token payload
         const permissions = this.deps.getOAuth2Server()?.scopesToPermissions(scopes) || [];
         // Generate access token
+        // Every token names its grant: revoking the grant ends it, access token included
         const accessTokenPayload = {
             sub: user.id,
             type: 'oauth2_access',
             clientId,
+            grantId,
             scopes,
             permissions,
             username: user.username,
@@ -43,6 +79,7 @@ export class OAuth2ServerService {
                 sub: user.id,
                 type: 'oauth2_refresh',
                 clientId,
+                grantId,
                 scopes
             };
             refreshToken = await this.deps.cryptoAdapter.generateJWT(refreshTokenPayload, this.deps.jwtSecret, {
@@ -91,14 +128,30 @@ export class OAuth2ServerService {
                 this.deps.logger.warn('User not found or inactive for refresh', { userId: payload.sub });
                 return null;
             }
-            // Determine scopes - can only narrow, not expand
-            let scopes = payload.scopes;
+            // A revoked or lapsed grant, or a token from before grants existed, renews nothing
+            const grant = payload.grantId && await this.isGrantLive(user, payload.grantId)
+                ? grantsOf(user)[payload.grantId]
+                : undefined;
+            if (!grant || grant.clientId !== clientId) {
+                this.deps.logger.warn('Refresh for a missing or revoked grant', { userId: payload.sub, clientId });
+                return null;
+            }
+            // Determine scopes - can only narrow, not expand, and never beyond the grant
+            let scopes = payload.scopes.filter(s => grant.scopes.includes(s));
             if (requestedScope) {
                 const requestedScopes = requestedScope.split(' ').filter(Boolean);
-                scopes = requestedScopes.filter(s => payload.scopes.includes(s));
+                scopes = requestedScopes.filter(s => scopes.includes(s));
+            }
+            // Bookkeeping: a failure to record it must not sign the application out
+            const lastUsed = Date.parse(grant.lastUsedAt ?? grant.createdAt);
+            if (!(Date.now() - lastUsed < LAST_USED_EVERY_MS)) {
+                await this.updateGrants(user.id, grants => {
+                    if (Object.hasOwn(grants, grant.id))
+                        grants[grant.id] = { ...grants[grant.id], lastUsedAt: new Date().toISOString() };
+                }).catch(error => this.deps.logger.warn('Could not record grant use', { error, grantId: grant.id }));
             }
             // Generate new tokens
-            const tokens = await this.generateOAuth2Tokens(user, scopes, clientId);
+            const tokens = await this.generateOAuth2Tokens(user, scopes, clientId, grant.id);
             this.deps.logger.info('OAuth2 token refreshed', {
                 userId: user.id,
                 clientId,
@@ -118,6 +171,108 @@ export class OAuth2ServerService {
         }
     }
     // ============================================
+    // Grants: what applications hold, and taking it back
+    // ============================================
+    /** Record a new approval, when an application first receives tokens for it */
+    async createGrant(user, clientId, scopes, userAgent) {
+        const now = new Date().toISOString();
+        const grant = {
+            id: `grant-${globalThis.crypto.randomUUID()}`,
+            clientId,
+            clientName: this.deps.getOAuth2Server()?.getClient(clientId)?.name ?? clientId,
+            scopes,
+            createdAt: now,
+            lastUsedAt: now,
+            ...(userAgent ? { userAgent: userAgent.slice(0, 200) } : {})
+        };
+        await this.updateGrants(user.id, grants => { grants[grant.id] = grant; });
+        this.deps.logger.info('OAuth2 grant created', { userId: user.id, clientId, grantId: grant.id });
+        return grant;
+    }
+    async listGrants(userId) {
+        const user = await this.deps.getUser(userId);
+        const live = [];
+        for (const grant of Object.values(grantsOf(user))) {
+            if (user && await this.isGrantLive(user, grant.id))
+                live.push(grant);
+        }
+        return live.sort((a, b) => b.createdAt.localeCompare(a.createdAt));
+    }
+    /**
+     * Whether tokens issued under a grant still work: it is the user's own, it has been used
+     * within the refresh-token lifetime (after that no token of it can be valid), and it has
+     * not been revoked.
+     */
+    async isGrantLive(user, grantId) {
+        const grants = grantsOf(user);
+        if (!Object.hasOwn(grants, grantId) || this.hasLapsed(grants[grantId]))
+            return false;
+        return !(await getAuthFlowState(this.deps.getDataStorage(), grantId, REVOKED_GRANT_KIND));
+    }
+    /**
+     * Revoke one grant: every token issued under it stops working at once. The consent for its
+     * client goes too, so the application has to ask again rather than be approved silently.
+     */
+    async revokeGrant(userId, grantId) {
+        const user = await this.deps.getUser(userId);
+        if (!user || !Object.hasOwn(grantsOf(user), grantId))
+            return false;
+        await this.recordRevocation(grantId);
+        const clientId = grantsOf(user)[grantId].clientId;
+        await this.updateGrants(userId, (grants, preferences) => {
+            delete grants[grantId];
+            const consents = preferences._oauth2Consents;
+            if (consents && Object.hasOwn(consents, clientId)) {
+                const { [clientId]: _removed, ...remaining } = consents;
+                preferences._oauth2Consents = remaining;
+            }
+        });
+        this.deps.logger.info('OAuth2 grant revoked', { userId, grantId });
+        return true;
+    }
+    /**
+     * RFC 7009: revoke the grant behind a token the caller holds. Possessing the token is the
+     * authorisation. Unknown, invalid or already revoked tokens are not an error.
+     */
+    async revokeByToken(token, clientId) {
+        const payload = await this.deps.cryptoAdapter.verifyJWT(token, this.deps.jwtSecret).catch(() => null);
+        if (!payload?.sub || !payload.grantId)
+            return;
+        if (payload.type !== 'oauth2_access' && payload.type !== 'oauth2_refresh')
+            return;
+        if (clientId && payload.clientId !== clientId)
+            return;
+        await this.revokeGrant(payload.sub, payload.grantId);
+    }
+    hasLapsed(grant) {
+        const refreshTokenTtl = this.deps.getOAuth2Options()?.refreshTokenTtl ?? 2592000;
+        const lastUsed = Date.parse(grant.lastUsedAt ?? grant.createdAt);
+        return !(Date.now() - lastUsed < refreshTokenTtl * 1000 + LIFETIME_SLACK_MS);
+    }
+    /** Outlives every token issued under the grant, and every copy of it a stale write restores */
+    async recordRevocation(grantId) {
+        const refreshTokenTtl = this.deps.getOAuth2Options()?.refreshTokenTtl ?? 2592000;
+        await saveAuthFlowState(this.deps.getDataStorage(), {
+            id: grantId,
+            kind: REVOKED_GRANT_KIND,
+            data: {},
+            expiresAt: new Date(Date.now() + refreshTokenTtl * 1000 + 2 * LIFETIME_SLACK_MS).toISOString()
+        });
+    }
+    /** Read-modify-write of the grants under the user's lock, dropping lapsed ones on the way */
+    updateGrants(userId, change) {
+        return withUserLock(userId, async () => {
+            const user = await this.deps.getUser(userId);
+            if (!user)
+                return;
+            const preferences = { ...(user.preferences || {}) };
+            const grants = Object.fromEntries(Object.entries(grantsOf(user)).filter(([, grant]) => !this.hasLapsed(grant)));
+            change(grants, preferences);
+            preferences[OAUTH2_GRANTS_KEY] = grants;
+            await this.deps.updateUser(userId, { preferences });
+        });
+    }
+    // ============================================
     // OAuth2 Consent Management
     // ============================================
     /**
@@ -172,6 +327,9 @@ export class OAuth2ServerService {
      * Stores in user preferences for persistence
      */
     async saveUserConsent(userId, clientId, scopes, expiresInDays) {
+        return withUserLock(userId, () => this.writeUserConsent(userId, clientId, scopes, expiresInDays));
+    }
+    async writeUserConsent(userId, clientId, scopes, expiresInDays) {
         try {
             this.deps.logger.info('saveUserConsent: starting', { userId, clientId, scopes });
             const user = await this.deps.getUser(userId);
@@ -186,11 +344,10 @@ export class OAuth2ServerService {
                 currentPreferences,
                 existingConsents
             });
-            // Merge scopes if consent already exists
-            const existingConsent = existingConsents[clientId];
-            const mergedScopes = existingConsent
-                ? [...new Set([...existingConsent.scopes, ...scopes])]
-                : scopes;
+            // The latest approval replaces the last one. Merging would undo a narrowing: approve
+            // read+delete, later approve read only, and the next request for read+delete would
+            // still match the stored consent and be approved without asking.
+            const mergedScopes = [...new Set(scopes)];
             // Calculate expiry (default: 365 days, or never if not specified)
             const expiresAt = expiresInDays
                 ? new Date(Date.now() + expiresInDays * 24 * 60 * 60 * 1000).toISOString()
@@ -229,6 +386,9 @@ export class OAuth2ServerService {
      * Revoke user consent for a client
      */
     async revokeUserConsent(userId, clientId) {
+        return withUserLock(userId, () => this.removeUserConsent(userId, clientId));
+    }
+    async removeUserConsent(userId, clientId) {
         try {
             const user = await this.deps.getUser(userId);
             if (!user) {