@authup/server-core 1.0.0-beta.52 → 1.0.0-beta.53

package/dist/core/oauth2/mfa-login/types.d.ts

@@ -0,0 +1,64 @@
+import type { Session, User } from '@authup/core-kit';
+import type { OAuth2TokenConfirmation, OAuth2TokenGrantResponse, OAuth2TokenPayload } from '@authup/specs';
+import type { IEventService } from '../../entities/index.ts';
+import type { IAuthFlowMetrics } from '../../metrics/index.ts';
+import type { ISessionManager } from '../../authentication/index.ts';
+import type { IOAuth2TokenIssuer, IOAuth2TokenRepository } from '../token/index.ts';
+export type OAuth2MfaLoginTicketIssueInput = {
+    user: User;
+    clientId?: string | null;
+    confirmation?: OAuth2TokenConfirmation;
+};
+export type OAuth2MfaLoginTicketIssueOptions = {
+    ipAddress?: string;
+    userAgent?: string;
+};
+export type OAuth2MfaLoginTicket = {
+    token: string;
+    expiresIn: number;
+};
+export type OAuth2MfaLoginCompleteInput = {
+    /**
+     * The pending session the ticket references — already mfa-stamped by
+     * the challenge verify (markMfaVerified runs in the verify unit of
+     * work, before completion).
+     */
+    session: Session;
+    /**
+     * The verified mfa_token payload the caller authenticated with.
+     */
+    ticket: OAuth2TokenPayload;
+    /**
+     * Actor name for the LOGIN security event.
+     */
+    userName?: string;
+};
+/**
+ * The "MFA-pending" login-ticket seam (issue #3242): the password grant
+ * issues a restricted ticket (kind: mfa_token) instead of failing closed
+ * when the second factor cannot ride the single POST (email / WebAuthn),
+ * and a successful interactive challenge completes the login by minting
+ * the full token pair for the now-MFA'd pending session.
+ */
+export interface IOAuth2MfaLoginService {
+    /**
+     * Create the pending session (mfa_at: null, ticket-scoped lifetime)
+     * and mint the mfa_token bound to it.
+     */
+    issueTicket(input: OAuth2MfaLoginTicketIssueInput, options?: OAuth2MfaLoginTicketIssueOptions): Promise<OAuth2MfaLoginTicket>;
+    /**
+     * Mint the full grant for the completed session, extend it to the
+     * regular session lifetime, and consume the ticket (single use).
+     */
+    complete(input: OAuth2MfaLoginCompleteInput): Promise<OAuth2TokenGrantResponse>;
+}
+export type OAuth2MfaLoginServiceContext = {
+    sessionManager: ISessionManager;
+    ticketIssuer: IOAuth2TokenIssuer;
+    accessTokenIssuer: IOAuth2TokenIssuer;
+    refreshTokenIssuer: IOAuth2TokenIssuer;
+    tokenRepository: IOAuth2TokenRepository;
+    eventService?: IEventService;
+    metrics?: IAuthFlowMetrics;
+};
+//# sourceMappingURL=types.d.ts.map

package/dist/core/oauth2/mfa-login/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/core/oauth2/mfa-login/types.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,KAAK,EACR,uBAAuB,EACvB,wBAAwB,EACxB,kBAAkB,EACrB,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,KAAK,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAEpF,MAAM,MAAM,8BAA8B,GAAG;IACzC,IAAI,EAAE,IAAI,CAAC;IACX,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,YAAY,CAAC,EAAE,uBAAuB,CAAC;CAC1C,CAAC;AAEF,MAAM,MAAM,gCAAgC,GAAG;IAC3C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG;IACtC;;;;OAIG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,MAAM,EAAE,kBAAkB,CAAC;IAC3B;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,WAAW,sBAAsB;IACnC;;;OAGG;IACH,WAAW,CACP,KAAK,EAAE,8BAA8B,EACrC,OAAO,CAAC,EAAE,gCAAgC,GAC3C,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAEjC;;;OAGG;IACH,QAAQ,CAAC,KAAK,EAAE,2BAA2B,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;CACnF;AAED,MAAM,MAAM,4BAA4B,GAAG;IACvC,cAAc,EAAE,eAAe,CAAC;IAChC,YAAY,EAAE,kBAAkB,CAAC;IACjC,iBAAiB,EAAE,kBAAkB,CAAC;IACtC,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,eAAe,EAAE,sBAAsB,CAAC;IACxC,YAAY,CAAC,EAAE,aAAa,CAAC;IAC7B,OAAO,CAAC,EAAE,gBAAgB,CAAC;CAC9B,CAAC"}

package/dist/core/oauth2/mfa-login/types.mjs

@@ -0,0 +1,4 @@
+import "node:path";
+import "node:url";
+import.meta.url;
+export {};

package/dist/core/oauth2/token/index.mjs

@@ -2,6 +2,7 @@ import "node:path";
 import "node:url";
 import.meta.url;
 import { OAuth2AccessTokenIssuer } from "./issuer/access/module.mjs";
+import { OAuth2MfaTokenIssuer } from "./issuer/mfa/module.mjs";
 import { OAuth2OpenIDTokenIssuer } from "./issuer/open-id/module.mjs";
 import { OAuth2RefreshTokenIssuer } from "./issuer/refresh/module.mjs";
 import "./issuer/index.mjs";
@@ -11,4 +12,4 @@ import { OAuth2TokenSigner } from "./signer/module.mjs";
 import "./signer/index.mjs";
 import { OAuth2TokenVerifier } from "./verifier/module.mjs";
 import "./verifier/index.mjs";
-export { OAuth2AccessTokenIssuer, OAuth2OpenIDTokenIssuer, OAuth2RefreshTokenIssuer, OAuth2TokenRevoker, OAuth2TokenSigner, OAuth2TokenVerifier };
+export { OAuth2AccessTokenIssuer, OAuth2MfaTokenIssuer, OAuth2OpenIDTokenIssuer, OAuth2RefreshTokenIssuer, OAuth2TokenRevoker, OAuth2TokenSigner, OAuth2TokenVerifier };

package/dist/core/oauth2/token/issuer/index.d.ts

@@ -1,4 +1,5 @@
 export * from './access/index.ts';
+export * from './mfa/index.ts';
 export * from './open-id/index.ts';
 export * from './refresh/index.ts';
 export * from './types.ts';

package/dist/core/oauth2/token/issuer/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/core/oauth2/token/issuer/index.ts"],"names":[],"mappings":"AAOA,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AAEnC,cAAc,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/core/oauth2/token/issuer/index.ts"],"names":[],"mappings":"AAOA,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AAEnC,cAAc,YAAY,CAAC"}

package/dist/core/oauth2/token/issuer/index.mjs

@@ -3,8 +3,10 @@ import "node:url";
 import.meta.url;
 import { OAuth2AccessTokenIssuer } from "./access/module.mjs";
 import "./access/index.mjs";
+import { OAuth2MfaTokenIssuer } from "./mfa/module.mjs";
+import "./mfa/index.mjs";
 import { OAuth2OpenIDTokenIssuer } from "./open-id/module.mjs";
 import "./open-id/index.mjs";
 import { OAuth2RefreshTokenIssuer } from "./refresh/module.mjs";
 import "./refresh/index.mjs";
-export { OAuth2AccessTokenIssuer, OAuth2OpenIDTokenIssuer, OAuth2RefreshTokenIssuer };
+export { OAuth2AccessTokenIssuer, OAuth2MfaTokenIssuer, OAuth2OpenIDTokenIssuer, OAuth2RefreshTokenIssuer };

package/dist/core/oauth2/token/issuer/mfa/index.d.ts

@@ -0,0 +1,2 @@
+export * from './module.ts';
+//# sourceMappingURL=index.d.ts.map

package/dist/core/oauth2/token/issuer/mfa/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/core/oauth2/token/issuer/mfa/index.ts"],"names":[],"mappings":"AAOA,cAAc,aAAa,CAAC"}

package/dist/core/oauth2/token/issuer/mfa/index.mjs

@@ -0,0 +1,5 @@
+import "node:path";
+import "node:url";
+import.meta.url;
+import { OAuth2MfaTokenIssuer } from "./module.mjs";
+export { OAuth2MfaTokenIssuer };

package/dist/core/oauth2/token/issuer/mfa/module.d.ts

@@ -0,0 +1,18 @@
+import type { OAuth2TokenPayload } from '@authup/specs';
+import type { IOAuth2TokenSigner } from '../../signer/index.ts';
+import type { IOAuth2TokenRepository } from '../../repository/index.ts';
+import { OAuth2BaseTokenIssuer } from '../base.ts';
+import type { IOAuth2TokenIssuer, OAuth2TokenIssuerOptions, OAuth2TokenIssuerResponse } from '../types.ts';
+/**
+ * Issues the short-lived "MFA-pending" login ticket (kind: mfa_token).
+ * Deliberately minimal: no role claims, no scope, no session-token
+ * inventory row — the ticket is not a bearer, it only unlocks the
+ * challenge routes (which opt in by kind).
+ */
+export declare class OAuth2MfaTokenIssuer extends OAuth2BaseTokenIssuer implements IOAuth2TokenIssuer {
+    protected repository: IOAuth2TokenRepository;
+    protected signer: IOAuth2TokenSigner;
+    constructor(repository: IOAuth2TokenRepository, signer: IOAuth2TokenSigner, options?: OAuth2TokenIssuerOptions);
+    issue(input?: OAuth2TokenPayload): Promise<OAuth2TokenIssuerResponse>;
+}
+//# sourceMappingURL=module.d.ts.map

package/dist/core/oauth2/token/issuer/mfa/module.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../../../../src/core/oauth2/token/issuer/mfa/module.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAExD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACxE,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,KAAK,EAAE,kBAAkB,EAAE,wBAAwB,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAC;AAE3G;;;;;GAKG;AACH,qBAAa,oBAAqB,SAAQ,qBAAsB,YAAW,kBAAkB;IACzF,SAAS,CAAC,UAAU,EAAE,sBAAsB,CAAC;IAE7C,SAAS,CAAC,MAAM,EAAG,kBAAkB,CAAC;gBAGlC,UAAU,EAAE,sBAAsB,EAClC,MAAM,EAAE,kBAAkB,EAC1B,OAAO,GAAE,wBAA6B;IAQpC,KAAK,CAAC,KAAK,GAAE,kBAAuB,GAAI,OAAO,CAAC,yBAAyB,CAAC;CAgBnF"}

package/dist/core/oauth2/token/issuer/mfa/module.mjs

@@ -0,0 +1,36 @@
+import "node:path";
+import "node:url";
+import.meta.url;
+import { OAuth2BaseTokenIssuer } from "../base.mjs";
+import { OAuth2TokenKind } from "@authup/specs";
+//#region src/core/oauth2/token/issuer/mfa/module.ts
+/**
+* Issues the short-lived "MFA-pending" login ticket (kind: mfa_token).
+* Deliberately minimal: no role claims, no scope, no session-token
+* inventory row — the ticket is not a bearer, it only unlocks the
+* challenge routes (which opt in by kind).
+*/ var OAuth2MfaTokenIssuer = class extends OAuth2BaseTokenIssuer {
+	repository;
+	signer;
+	constructor(repository, signer, options = {}) {
+		super(options);
+		this.repository = repository;
+		this.signer = signer;
+	}
+	async issue(input = {}) {
+		const iss = this.buildIss(input);
+		const data = await this.repository.insert({
+			...input,
+			kind: OAuth2TokenKind.MFA,
+			exp: this.buildExp(input),
+			...iss ? { iss } : {}
+		});
+		const token = await this.signer.sign(data);
+		await this.repository.saveWithSignature(data, token);
+		return [token, data];
+	}
+};
+//#endregion
+export { OAuth2MfaTokenIssuer };
+
+//# sourceMappingURL=module.mjs.map

package/dist/core/oauth2/token/issuer/mfa/module.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"module.mjs","names":["OAuth2TokenKind","OAuth2BaseTokenIssuer","OAuth2MfaTokenIssuer","repository","signer","options","issue","input","iss","buildIss","data","insert","kind","MFA","exp","buildExp","token","sign","saveWithSignature"],"sources":["../../../../../../src/core/oauth2/token/issuer/mfa/module.ts"],"sourcesContent":["/*\n * Copyright (c) 2026.\n * Author Peter Placzek (tada5hi)\n * For the full copyright and license information,\n * view the LICENSE file that was distributed with this source code.\n */\n\nimport type { OAuth2TokenPayload } from '@authup/specs';\nimport { OAuth2TokenKind } from '@authup/specs';\nimport type { IOAuth2TokenSigner } from '../../signer/index.ts';\nimport type { IOAuth2TokenRepository } from '../../repository/index.ts';\nimport { OAuth2BaseTokenIssuer } from '../base.ts';\nimport type { IOAuth2TokenIssuer, OAuth2TokenIssuerOptions, OAuth2TokenIssuerResponse } from '../types.ts';\n\n/**\n * Issues the short-lived \"MFA-pending\" login ticket (kind: mfa_token).\n * Deliberately minimal: no role claims, no scope, no session-token\n * inventory row — the ticket is not a bearer, it only unlocks the\n * challenge routes (which opt in by kind).\n */\nexport class OAuth2MfaTokenIssuer extends OAuth2BaseTokenIssuer implements IOAuth2TokenIssuer {\n    protected repository: IOAuth2TokenRepository;\n\n    protected signer : IOAuth2TokenSigner;\n\n    constructor(\n        repository: IOAuth2TokenRepository,\n        signer: IOAuth2TokenSigner,\n        options: OAuth2TokenIssuerOptions = {},\n    ) {\n        super(options);\n\n        this.repository = repository;\n        this.signer = signer;\n    }\n\n    async issue(input: OAuth2TokenPayload = {}) : Promise<OAuth2TokenIssuerResponse> {\n        const iss = this.buildIss(input);\n\n        const data = await this.repository.insert({\n            ...input,\n            kind: OAuth2TokenKind.MFA,\n            exp: this.buildExp(input),\n            ...(iss ? { iss } : {}),\n        });\n\n        const token = await this.signer.sign(data);\n\n        await this.repository.saveWithSignature(data, token);\n\n        return [token, data];\n    }\n}\n"],"mappings":";;;;;;;;;;;GAoBA,IAAaE,uBAAb,cAA0CD,sBAAAA;CAC5BE;CAEAC;CAEV,YACID,YACAC,QACAC,UAAoC,CAAC,GACvC;EACE,MAAMA,OAAAA;EAEN,KAAKF,aAAaA;EAClB,KAAKC,SAASA;CAClB;CAEA,MAAME,MAAMC,QAA4B,CAAC,GAAwC;EAC7E,MAAMC,MAAM,KAAKC,SAASF,KAAAA;EAE1B,MAAMG,OAAO,MAAM,KAAKP,WAAWQ,OAAO;GACtC,GAAGJ;GACHK,MAAMZ,gBAAgBa;GACtBC,KAAK,KAAKC,SAASR,KAAAA;GACnB,GAAIC,MAAM,EAAEA,IAAI,IAAI,CAAC;EACzB,CAAA;EAEA,MAAMQ,QAAQ,MAAM,KAAKZ,OAAOa,KAAKP,IAAAA;EAErC,MAAM,KAAKP,WAAWe,kBAAkBR,MAAMM,KAAAA;EAE9C,OAAO,CAACA,OAAON,IAAAA;CACnB;AACJ"}

package/dist/core/oauth2/token/repository/types.d.ts

@@ -7,6 +7,16 @@ export interface IOAuth2TokenRepository {
      * @param exp Expiration date in unix timestamp
      */
     setInactive(id: string, exp?: number): Promise<void>;
+    /**
+     * Atomically mark a token inactive, returning whether THIS call performed
+     * the transition (true) or the token was already inactive (false). Backed
+     * by a set-if-absent write, so it is safe for single-use enforcement under
+     * concurrency (no isInactive→setInactive TOCTOU).
+     *
+     * @param id JTI
+     * @param exp Expiration date in unix timestamp
+     */
+    claimInactive(id: string, exp?: number): Promise<boolean>;
     /**
      * Check if a token by its jti is active.
      *

package/dist/core/oauth2/token/repository/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/core/oauth2/token/repository/types.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAExD,MAAM,WAAW,sBAAsB;IACnC;;;;;OAKG;IACH,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtD;;;;OAIG;IACH,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAIzC;;;;OAIG;IACH,WAAW,CAAC,EAAE,EAAE,MAAM,GAAI,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAAC;IAE7D;;;OAGG;IACH,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAI,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAAC;IAIvE;;;;OAIG;IACH,UAAU,CAAC,EAAE,EAAE,MAAM,GAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAIvC;;;;OAIG;IACH,MAAM,CAAC,OAAO,EAAE,kBAAkB,GAAI,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAElE;;;;OAIG;IACH,IAAI,CAAC,OAAO,EAAE,kBAAkB,GAAI,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAEhE;;;;;OAKG;IACH,iBAAiB,CAAC,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,GAAI,OAAO,CAAC,kBAAkB,CAAC,CAAC;CACnG"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/core/oauth2/token/repository/types.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAExD,MAAM,WAAW,sBAAsB;IACnC;;;;;OAKG;IACH,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtD;;;;;;;;OAQG;IACH,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAE3D;;;;OAIG;IACH,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAIzC;;;;OAIG;IACH,WAAW,CAAC,EAAE,EAAE,MAAM,GAAI,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAAC;IAE7D;;;OAGG;IACH,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAI,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAAC;IAIvE;;;;OAIG;IACH,UAAU,CAAC,EAAE,EAAE,MAAM,GAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAIvC;;;;OAIG;IACH,MAAM,CAAC,OAAO,EAAE,kBAAkB,GAAI,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAElE;;;;OAIG;IACH,IAAI,CAAC,OAAO,EAAE,kBAAkB,GAAI,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAEhE;;;;;OAKG;IACH,iBAAiB,CAAC,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,GAAI,OAAO,CAAC,kBAAkB,CAAC,CAAC;CACnG"}

package/dist/core/oauth2/token/revoker/module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../../../src/core/oauth2/token/revoker/module.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAExD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AACrE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAC5E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAEtD,qBAAa,kBAAmB,YAAW,mBAAmB;IAC1D,SAAS,CAAC,UAAU,EAAG,sBAAsB,CAAC;IAE9C,SAAS,CAAC,sBAAsB,CAAC,EAAG,uBAAuB,CAAC;gBAGxD,UAAU,EAAG,sBAAsB,EACnC,sBAAsB,CAAC,EAAG,uBAAuB;IAM/C,MAAM,CAAC,KAAK,EAAE,kBAAkB,GAAI,OAAO,CAAC,IAAI,CAAC;CAa1D"}
+{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../../../src/core/oauth2/token/revoker/module.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAExD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AACrE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAC5E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAEtD,qBAAa,kBAAmB,YAAW,mBAAmB;IAC1D,SAAS,CAAC,UAAU,EAAG,sBAAsB,CAAC;IAE9C,SAAS,CAAC,sBAAsB,CAAC,EAAG,uBAAuB,CAAC;gBAGxD,UAAU,EAAG,sBAAsB,EACnC,sBAAsB,CAAC,EAAG,uBAAuB;IAM/C,MAAM,CAAC,KAAK,EAAE,kBAAkB,GAAI,OAAO,CAAC,IAAI,CAAC;CAoB1D"}

package/dist/core/oauth2/token/revoker/module.mjs

@@ -13,6 +13,7 @@ var OAuth2TokenRevoker = class {
 	async revoke(input) {
 		if (!input.jti) throw JWTError.payloadPropertyInvalid("jti");
 		await this.repository.removeById(input.jti);
+		await this.repository.setInactive(input.jti, input.exp);
 		if (this.sessionTokenRepository) await this.sessionTokenRepository.revokeById(input.jti, (/* @__PURE__ */ new Date()).toISOString());
 	}
 };

package/dist/core/oauth2/token/revoker/module.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"module.mjs","names":["JWTError","OAuth2TokenRevoker","repository","sessionTokenRepository","revoke","input","jti","payloadPropertyInvalid","removeById","revokeById","Date","toISOString"],"sources":["../../../../../src/core/oauth2/token/revoker/module.ts"],"sourcesContent":["/*\n * Copyright (c) 2025.\n * Author Peter Placzek (tada5hi)\n * For the full copyright and license information,\n * view the LICENSE file that was distributed with this source code.\n */\n\nimport type { OAuth2TokenPayload } from '@authup/specs';\nimport { JWTError } from '@authup/specs';\nimport type { IOAuth2TokenRepository } from '../repository/index.ts';\nimport type { ISessionTokenRepository } from '../../session-token/index.ts';\nimport type { IOAuth2TokenRevoker } from './types.ts';\n\nexport class OAuth2TokenRevoker implements IOAuth2TokenRevoker {\n    protected repository : IOAuth2TokenRepository;\n\n    protected sessionTokenRepository? : ISessionTokenRepository;\n\n    constructor(\n        repository : IOAuth2TokenRepository,\n        sessionTokenRepository? : ISessionTokenRepository,\n    ) {\n        this.repository = repository;\n        this.sessionTokenRepository = sessionTokenRepository;\n    }\n\n    async revoke(input: OAuth2TokenPayload) : Promise<void> {\n        if (!input.jti) {\n            throw JWTError.payloadPropertyInvalid('jti');\n        }\n\n        await this.repository.removeById(input.jti);\n\n        // Soft-revoke the durable row so a refresh grant (which trusts the row,\n        // not the cache blocklist) rejects an explicitly revoked refresh token.\n        if (this.sessionTokenRepository) {\n            await this.sessionTokenRepository.revokeById(input.jti, new Date().toISOString());\n        }\n    }\n}\n"],"mappings":";;;;;AAaA,IAAaC,qBAAb,MAAaA;CACCC;CAEAC;CAEV,YACID,YACAC,wBACF;EACE,KAAKD,aAAaA;EAClB,KAAKC,yBAAyBA;CAClC;CAEA,MAAMC,OAAOC,OAA2C;EACpD,IAAI,CAACA,MAAMC,KACP,MAAMN,SAASO,uBAAuB,KAAA;EAG1C,MAAM,KAAKL,WAAWM,WAAWH,MAAMC,GAAG;EAI1C,IAAI,KAAKH,wBACL,MAAM,KAAKA,uBAAuBM,WAAWJ,MAAMC,sBAAK,IAAII,KAAAA,EAAAA,CAAOC,YAAW,CAAA;CAEtF;AACJ"}
+{"version":3,"file":"module.mjs","names":["JWTError","OAuth2TokenRevoker","repository","sessionTokenRepository","revoke","input","jti","payloadPropertyInvalid","removeById","setInactive","exp","revokeById","Date","toISOString"],"sources":["../../../../../src/core/oauth2/token/revoker/module.ts"],"sourcesContent":["/*\n * Copyright (c) 2025.\n * Author Peter Placzek (tada5hi)\n * For the full copyright and license information,\n * view the LICENSE file that was distributed with this source code.\n */\n\nimport type { OAuth2TokenPayload } from '@authup/specs';\nimport { JWTError } from '@authup/specs';\nimport type { IOAuth2TokenRepository } from '../repository/index.ts';\nimport type { ISessionTokenRepository } from '../../session-token/index.ts';\nimport type { IOAuth2TokenRevoker } from './types.ts';\n\nexport class OAuth2TokenRevoker implements IOAuth2TokenRevoker {\n    protected repository : IOAuth2TokenRepository;\n\n    protected sessionTokenRepository? : ISessionTokenRepository;\n\n    constructor(\n        repository : IOAuth2TokenRepository,\n        sessionTokenRepository? : ISessionTokenRepository,\n    ) {\n        this.repository = repository;\n        this.sessionTokenRepository = sessionTokenRepository;\n    }\n\n    async revoke(input: OAuth2TokenPayload) : Promise<void> {\n        if (!input.jti) {\n            throw JWTError.payloadPropertyInvalid('jti');\n        }\n\n        await this.repository.removeById(input.jti);\n\n        // Blocklist explicitly from the verified payload. `removeById` only\n        // writes the inactive marker when the id-keyed cache entry is still\n        // present, so after a cache flush/eviction an otherwise-valid access\n        // token would return 202 from /token/revoke yet stay active until its\n        // natural expiry. Idempotent with the removeById path on a cache hit.\n        await this.repository.setInactive(input.jti, input.exp);\n\n        // Soft-revoke the durable row so a refresh grant (which trusts the row,\n        // not the cache blocklist) rejects an explicitly revoked refresh token.\n        if (this.sessionTokenRepository) {\n            await this.sessionTokenRepository.revokeById(input.jti, new Date().toISOString());\n        }\n    }\n}\n"],"mappings":";;;;;AAaA,IAAaC,qBAAb,MAAaA;CACCC;CAEAC;CAEV,YACID,YACAC,wBACF;EACE,KAAKD,aAAaA;EAClB,KAAKC,yBAAyBA;CAClC;CAEA,MAAMC,OAAOC,OAA2C;EACpD,IAAI,CAACA,MAAMC,KACP,MAAMN,SAASO,uBAAuB,KAAA;EAG1C,MAAM,KAAKL,WAAWM,WAAWH,MAAMC,GAAG;EAO1C,MAAM,KAAKJ,WAAWO,YAAYJ,MAAMC,KAAKD,MAAMK,GAAG;EAItD,IAAI,KAAKP,wBACL,MAAM,KAAKA,uBAAuBQ,WAAWN,MAAMC,sBAAK,IAAIM,KAAAA,EAAAA,CAAOC,YAAW,CAAA;CAEtF;AACJ"}

package/dist/core/oauth2/token/signer/module.d.ts

@@ -1,9 +1,9 @@
 import type { OAuth2TokenPayload } from '@authup/specs';
-import type { IOAuth2KeyRepository } from '../../key/index.ts';
+import type { IKeyStore } from '../../../key/index.ts';
 import type { IOAuth2TokenSigner } from './types.ts';
 export declare class OAuth2TokenSigner implements IOAuth2TokenSigner {
-    protected keyRepository: IOAuth2KeyRepository;
-    constructor(keyRepository: IOAuth2KeyRepository);
+    protected keyStore: IKeyStore;
+    constructor(keyStore: IKeyStore);
     sign<T extends OAuth2TokenPayload>(payload: T): Promise<string>;
 }
 //# sourceMappingURL=module.d.ts.map

package/dist/core/oauth2/token/signer/module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../../../src/core/oauth2/token/signer/module.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAExD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAErD,qBAAa,iBAAkB,YAAW,kBAAkB;IACxD,SAAS,CAAC,aAAa,EAAG,oBAAoB,CAAC;gBAEnC,aAAa,EAAG,oBAAoB;IAI1C,IAAI,CAAC,CAAC,SAAS,kBAAkB,EAAE,OAAO,EAAE,CAAC,GAAI,OAAO,CAAC,MAAM,CAAC;CAgDzE"}
+{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../../../src/core/oauth2/token/signer/module.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAExD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAErD,qBAAa,iBAAkB,YAAW,kBAAkB;IACxD,SAAS,CAAC,QAAQ,EAAG,SAAS,CAAC;gBAEnB,QAAQ,EAAG,SAAS;IAI1B,IAAI,CAAC,CAAC,SAAS,kBAAkB,EAAE,OAAO,EAAE,CAAC,GAAI,OAAO,CAAC,MAAM,CAAC;CA+CzE"}

package/dist/core/oauth2/token/signer/module.mjs

@@ -2,17 +2,16 @@ import "node:path";
 import "node:url";
 import.meta.url;
 import { signToken } from "@authup/server-kit";
-import { JWKError, JWKType } from "@authup/specs";
+import { JWKError, JWKType, JWKUse } from "@authup/specs";
 //#region src/core/oauth2/token/signer/module.ts
 var OAuth2TokenSigner = class {
-	keyRepository;
-	constructor(keyRepository) {
-		this.keyRepository = keyRepository;
+	keyStore;
+	constructor(keyStore) {
+		this.keyStore = keyStore;
 	}
 	async sign(payload) {
 		if (!payload.realm_id) throw JWKError.invalidRealm();
-		const key = await this.keyRepository.findByRealmId(payload.realm_id);
-		if (!key) throw JWKError.notFoundForRealm(payload.realm_id, payload.realm_name);
+		const key = await this.keyStore.resolveOrCreate(payload.realm_id, JWKUse.SIGNATURE);
 		if (!key.decryption_key) throw JWKError.decryptionKeyMissing();
 		let token;
 		if (key.type === JWKType.OCT) token = await signToken(payload, {

package/dist/core/oauth2/token/signer/module.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"module.mjs","names":["signToken","JWKError","JWKType","OAuth2TokenSigner","keyRepository","sign","payload","realm_id","invalidRealm","key","findByRealmId","notFoundForRealm","realm_name","decryption_key","decryptionKeyMissing","token","type","OCT","keyId","id","EC","algorithm","signature_algorithm"],"sources":["../../../../../src/core/oauth2/token/signer/module.ts"],"sourcesContent":["/*\n * Copyright (c) 2025.\n * Author Peter Placzek (tada5hi)\n * For the full copyright and license information,\n * view the LICENSE file that was distributed with this source code.\n */\n\nimport { type TokenECAlgorithm, type TokenRSAAlgorithm, signToken } from '@authup/server-kit';\nimport type { OAuth2TokenPayload } from '@authup/specs';\nimport { JWKError, JWKType } from '@authup/specs';\nimport type { IOAuth2KeyRepository } from '../../key/index.ts';\nimport type { IOAuth2TokenSigner } from './types.ts';\n\nexport class OAuth2TokenSigner implements IOAuth2TokenSigner {\n    protected keyRepository : IOAuth2KeyRepository;\n\n    constructor(keyRepository : IOAuth2KeyRepository) {\n        this.keyRepository = keyRepository;\n    }\n\n    async sign<T extends OAuth2TokenPayload>(payload: T) : Promise<string> {\n        if (!payload.realm_id) {\n            throw JWKError.invalidRealm();\n        }\n\n        const key = await this.keyRepository.findByRealmId(payload.realm_id);\n        if (!key) {\n            throw JWKError.notFoundForRealm(payload.realm_id, payload.realm_name);\n        }\n\n        if (!key.decryption_key) {\n            throw JWKError.decryptionKeyMissing();\n        }\n\n        let token : string;\n        if (key.type === JWKType.OCT) {\n            token = await signToken(\n                payload,\n                {\n                    type: JWKType.OCT,\n                    key: key.decryption_key,\n                    keyId: key.id,\n                },\n            );\n        } else if (key.type === JWKType.EC) {\n            token = await signToken(\n                payload,\n                {\n                    type: key.type,\n                    key: key.decryption_key,\n                    algorithm: key.signature_algorithm as TokenECAlgorithm,\n                    keyId: key.id,\n                },\n            );\n        } else {\n            token = await signToken(\n                payload,\n                {\n                    type: key.type,\n                    key: key.decryption_key,\n                    algorithm: key.signature_algorithm as TokenRSAAlgorithm,\n                    keyId: key.id,\n                },\n            );\n        }\n\n        return token;\n    }\n}\n"],"mappings":";;;;;;AAaA,IAAaG,oBAAb,MAAaA;CACCC;CAEV,YAAYA,eAAsC;EAC9C,KAAKA,gBAAgBA;CACzB;CAEA,MAAMC,KAAmCC,SAA8B;EACnE,IAAI,CAACA,QAAQC,UACT,MAAMN,SAASO,aAAY;EAG/B,MAAMC,MAAM,MAAM,KAAKL,cAAcM,cAAcJ,QAAQC,QAAQ;EACnE,IAAI,CAACE,KACD,MAAMR,SAASU,iBAAiBL,QAAQC,UAAUD,QAAQM,UAAU;EAGxE,IAAI,CAACH,IAAII,gBACL,MAAMZ,SAASa,qBAAoB;EAGvC,IAAIC;EACJ,IAAIN,IAAIO,SAASd,QAAQe,KACrBF,QAAQ,MAAMf,UACVM,SACA;GACIU,MAAMd,QAAQe;GACdR,KAAKA,IAAII;GACTK,OAAOT,IAAIU;EACf,CAAA;OAED,IAAIV,IAAIO,SAASd,QAAQkB,IAC5BL,QAAQ,MAAMf,UACVM,SACA;GACIU,MAAMP,IAAIO;GACVP,KAAKA,IAAII;GACTQ,WAAWZ,IAAIa;GACfJ,OAAOT,IAAIU;EACf,CAAA;OAGJJ,QAAQ,MAAMf,UACVM,SACA;GACIU,MAAMP,IAAIO;GACVP,KAAKA,IAAII;GACTQ,WAAWZ,IAAIa;GACfJ,OAAOT,IAAIU;EACf,CAAA;EAIR,OAAOJ;CACX;AACJ"}
+{"version":3,"file":"module.mjs","names":["signToken","JWKError","JWKType","JWKUse","OAuth2TokenSigner","keyStore","sign","payload","realm_id","invalidRealm","key","resolveOrCreate","SIGNATURE","decryption_key","decryptionKeyMissing","token","type","OCT","keyId","id","EC","algorithm","signature_algorithm"],"sources":["../../../../../src/core/oauth2/token/signer/module.ts"],"sourcesContent":["/*\n * Copyright (c) 2025.\n * Author Peter Placzek (tada5hi)\n * For the full copyright and license information,\n * view the LICENSE file that was distributed with this source code.\n */\n\nimport { type TokenECAlgorithm, type TokenRSAAlgorithm, signToken } from '@authup/server-kit';\nimport type { OAuth2TokenPayload } from '@authup/specs';\nimport { JWKError, JWKType, JWKUse } from '@authup/specs';\nimport type { IKeyStore } from '../../../key/index.ts';\nimport type { IOAuth2TokenSigner } from './types.ts';\n\nexport class OAuth2TokenSigner implements IOAuth2TokenSigner {\n    protected keyStore : IKeyStore;\n\n    constructor(keyStore : IKeyStore) {\n        this.keyStore = keyStore;\n    }\n\n    async sign<T extends OAuth2TokenPayload>(payload: T) : Promise<string> {\n        if (!payload.realm_id) {\n            throw JWKError.invalidRealm();\n        }\n\n        // highest-priority ACTIVE key — passive keys only verify, and an\n        // all-disabled realm fails loud inside the store.\n        const key = await this.keyStore.resolveOrCreate(payload.realm_id, JWKUse.SIGNATURE);\n\n        if (!key.decryption_key) {\n            throw JWKError.decryptionKeyMissing();\n        }\n\n        let token : string;\n        if (key.type === JWKType.OCT) {\n            token = await signToken(\n                payload,\n                {\n                    type: JWKType.OCT,\n                    key: key.decryption_key,\n                    keyId: key.id,\n                },\n            );\n        } else if (key.type === JWKType.EC) {\n            token = await signToken(\n                payload,\n                {\n                    type: key.type,\n                    key: key.decryption_key,\n                    algorithm: key.signature_algorithm as TokenECAlgorithm,\n                    keyId: key.id,\n                },\n            );\n        } else {\n            token = await signToken(\n                payload,\n                {\n                    type: key.type,\n                    key: key.decryption_key,\n                    algorithm: key.signature_algorithm as TokenRSAAlgorithm,\n                    keyId: key.id,\n                },\n            );\n        }\n\n        return token;\n    }\n}\n"],"mappings":";;;;;;AAaA,IAAaI,oBAAb,MAAaA;CACCC;CAEV,YAAYA,UAAsB;EAC9B,KAAKA,WAAWA;CACpB;CAEA,MAAMC,KAAmCC,SAA8B;EACnE,IAAI,CAACA,QAAQC,UACT,MAAMP,SAASQ,aAAY;EAK/B,MAAMC,MAAM,MAAM,KAAKL,SAASM,gBAAgBJ,QAAQC,UAAUL,OAAOS,SAAS;EAElF,IAAI,CAACF,IAAIG,gBACL,MAAMZ,SAASa,qBAAoB;EAGvC,IAAIC;EACJ,IAAIL,IAAIM,SAASd,QAAQe,KACrBF,QAAQ,MAAMf,UACVO,SACA;GACIS,MAAMd,QAAQe;GACdP,KAAKA,IAAIG;GACTK,OAAOR,IAAIS;EACf,CAAA;OAED,IAAIT,IAAIM,SAASd,QAAQkB,IAC5BL,QAAQ,MAAMf,UACVO,SACA;GACIS,MAAMN,IAAIM;GACVN,KAAKA,IAAIG;GACTQ,WAAWX,IAAIY;GACfJ,OAAOR,IAAIS;EACf,CAAA;OAGJJ,QAAQ,MAAMf,UACVO,SACA;GACIS,MAAMN,IAAIM;GACVN,KAAKA,IAAIG;GACTQ,WAAWX,IAAIY;GACfJ,OAAOR,IAAIS;EACf,CAAA;EAIR,OAAOJ;CACX;AACJ"}

package/dist/core/oauth2/token/verifier/module.d.ts

@@ -1,11 +1,11 @@
 import type { OAuth2TokenPayload } from '@authup/specs';
-import type { IOAuth2KeyRepository } from '../../key/index.ts';
+import type { IKeyStore } from '../../../key/index.ts';
 import type { IOAuth2TokenRepository } from '../repository/types.ts';
 import type { IOAuth2TokenVerifier, OAuth2TokenVerifyOptions } from './types.ts';
 export declare class OAuth2TokenVerifier implements IOAuth2TokenVerifier {
-    protected keyRepository: IOAuth2KeyRepository;
+    protected keyStore: IKeyStore;
     protected tokenRepository: IOAuth2TokenRepository;
-    constructor(keyRepository: IOAuth2KeyRepository, tokenRepository: IOAuth2TokenRepository);
+    constructor(keyStore: IKeyStore, tokenRepository: IOAuth2TokenRepository);
     isInactive(id: string): Promise<boolean>;
     verify(token: string, options?: OAuth2TokenVerifyOptions): Promise<OAuth2TokenPayload>;
 }

package/dist/core/oauth2/token/verifier/module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../../../src/core/oauth2/token/verifier/module.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAExD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AACrE,OAAO,KAAK,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAC;AAEjF,qBAAa,mBAAoB,YAAW,oBAAoB;IAC5D,SAAS,CAAC,aAAa,EAAG,oBAAoB,CAAC;IAE/C,SAAS,CAAC,eAAe,EAAG,sBAAsB,CAAC;gBAG/C,aAAa,EAAG,oBAAoB,EACpC,eAAe,EAAG,sBAAsB;IAMtC,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAIxC,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,GAAE,wBAA6B,GAAI,OAAO,CAAC,kBAAkB,CAAC;CA6GpG"}
+{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../../../src/core/oauth2/token/verifier/module.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAOxD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AACrE,OAAO,KAAK,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAC;AAEjF,qBAAa,mBAAoB,YAAW,oBAAoB;IAC5D,SAAS,CAAC,QAAQ,EAAG,SAAS,CAAC;IAE/B,SAAS,CAAC,eAAe,EAAG,sBAAsB,CAAC;gBAG/C,QAAQ,EAAG,SAAS,EACpB,eAAe,EAAG,sBAAsB;IAMtC,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAIxC,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,GAAE,wBAA6B,GAAI,OAAO,CAAC,kBAAkB,CAAC;CAwHpG"}

package/dist/core/oauth2/token/verifier/module.mjs

@@ -1,14 +1,15 @@
 import "node:path";
 import "node:url";
 import.meta.url;
+import { KeyStatus } from "@authup/core-kit";
 import { extractTokenHeader, verifyToken } from "@authup/server-kit";
-import { JWKError, JWKType, JWTError } from "@authup/specs";
+import { JWKError, JWKType, JWKUse, JWTError } from "@authup/specs";
 //#region src/core/oauth2/token/verifier/module.ts
 var OAuth2TokenVerifier = class {
-	keyRepository;
+	keyStore;
 	tokenRepository;
-	constructor(keyRepository, tokenRepository) {
-		this.keyRepository = keyRepository;
+	constructor(keyStore, tokenRepository) {
+		this.keyStore = keyStore;
 		this.tokenRepository = tokenRepository;
 	}
 	async isInactive(id) {
@@ -25,8 +26,10 @@ var OAuth2TokenVerifier = class {
 		}
 		const header = extractTokenHeader(token);
 		if (!header.kid) throw JWTError.headerPropertyInvalid("kid");
-		const key = await this.keyRepository.findById(header.kid);
+		const key = await this.keyStore.resolveById(header.kid);
 		if (!key) throw JWKError.notFound(header.kid);
+		if (key.use !== JWKUse.SIGNATURE) throw JWKError.notFound(header.kid);
+		if (key.status === KeyStatus.DISABLED) throw JWKError.notFound(header.kid);
 		switch (key.type) {
 			case JWKType.OCT:
 				if (!key.decryption_key) throw JWKError.decryptionKeyMissing();

package/dist/core/oauth2/token/verifier/module.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"module.mjs","names":["extractTokenHeader","verifyToken","JWKError","JWKType","JWTError","OAuth2TokenVerifier","keyRepository","tokenRepository","isInactive","id","verify","token","options","payload","findOneBySignature","jti","payloadPropertyInvalid","skipActiveCheck","notActive","header","kid","headerPropertyInvalid","key","findById","notFound","type","OCT","decryption_key","decryptionKeyMissing","ignoreExpiry","EC","encryption_key","signature_algorithm","algorithms","saveWithSignature"],"sources":["../../../../../src/core/oauth2/token/verifier/module.ts"],"sourcesContent":["/*\n * Copyright (c) 2025.\n * Author Peter Placzek (tada5hi)\n * For the full copyright and license information,\n * view the LICENSE file that was distributed with this source code.\n */\n\nimport {\n    type TokenECAlgorithm,\n    type TokenRSAAlgorithm,\n    extractTokenHeader,\n    verifyToken,\n} from '@authup/server-kit';\nimport type { OAuth2TokenPayload } from '@authup/specs';\nimport { JWKError, JWKType, JWTError } from '@authup/specs';\nimport type { IOAuth2KeyRepository } from '../../key/index.ts';\nimport type { IOAuth2TokenRepository } from '../repository/types.ts';\nimport type { IOAuth2TokenVerifier, OAuth2TokenVerifyOptions } from './types.ts';\n\nexport class OAuth2TokenVerifier implements IOAuth2TokenVerifier {\n    protected keyRepository : IOAuth2KeyRepository;\n\n    protected tokenRepository : IOAuth2TokenRepository;\n\n    constructor(\n        keyRepository : IOAuth2KeyRepository,\n        tokenRepository : IOAuth2TokenRepository,\n    ) {\n        this.keyRepository = keyRepository;\n        this.tokenRepository = tokenRepository;\n    }\n\n    async isInactive(id: string): Promise<boolean> {\n        return this.tokenRepository.isInactive(id);\n    }\n\n    async verify(token: string, options: OAuth2TokenVerifyOptions = {}) : Promise<OAuth2TokenPayload> {\n        let payload = await this.tokenRepository.findOneBySignature(token);\n        if (payload) {\n            if (!payload.jti) {\n                throw JWTError.payloadPropertyInvalid('jti');\n            }\n\n            if (!options.skipActiveCheck) {\n                const isInactive = await this.isInactive(payload.jti);\n                if (isInactive) {\n                    throw JWTError.notActive();\n                }\n            }\n\n            return payload;\n        }\n\n        const header = extractTokenHeader(token);\n        if (!header.kid) {\n            throw JWTError.headerPropertyInvalid('kid');\n        }\n\n        const key = await this.keyRepository.findById(header.kid);\n        if (!key) {\n            throw JWKError.notFound(header.kid);\n        }\n\n        switch (key.type) {\n            case JWKType.OCT: {\n                if (!key.decryption_key) {\n                    throw JWKError.decryptionKeyMissing();\n                }\n\n                payload = await verifyToken(\n                    token,\n                    {\n                        type: JWKType.OCT,\n                        key: key.decryption_key,\n                    },\n                    { ignoreExpiry: options.ignoreExpiry },\n                );\n                break;\n            }\n            case JWKType.EC: {\n                if (!key.encryption_key) {\n                    throw JWKError.decryptionKeyMissing();\n                }\n\n                payload = await verifyToken(\n                    token,\n                    {\n                        type: key.type,\n                        key: key.encryption_key,\n                        ...(\n                            key.signature_algorithm ?\n                                { algorithms: [key.signature_algorithm] } :\n                                []\n                        ) as TokenECAlgorithm[],\n                    },\n                    { ignoreExpiry: options.ignoreExpiry },\n                );\n                break;\n            }\n            default: {\n                if (!key.encryption_key) {\n                    throw JWKError.decryptionKeyMissing();\n                }\n\n                payload = await verifyToken(\n                    token,\n                    {\n                        type: key.type,\n                        key: key.encryption_key,\n                        ...(\n                            key.signature_algorithm ?\n                                { algorithms: [key.signature_algorithm] } :\n                                []\n                        ) as TokenRSAAlgorithm[],\n                    },\n                    { ignoreExpiry: options.ignoreExpiry },\n                );\n            }\n        }\n\n        if (!payload.jti) {\n            throw JWTError.payloadPropertyInvalid('jti');\n        }\n\n        // Never populate the shared signature-keyed claims cache on the\n        // exp-ignoring path. An expired token verified with `ignoreExpiry`\n        // (the RP-initiated-logout id_token_hint) would otherwise be re-cached\n        // with buildTTL's 1h fallback (a past exp yields a non-positive ttl),\n        // and the cache-first branch above returns it with no exp re-check on\n        // every subsequent verify — so `/token/introspect` would report an\n        // expired token as active for up to an hour (RFC 7662). Keep the\n        // exp-bypass scoped to this single call.\n        if (!options.ignoreExpiry) {\n            await this.tokenRepository.saveWithSignature(payload, token);\n        }\n\n        if (!options.skipActiveCheck) {\n            const isInactive = await this.isInactive(payload.jti);\n            if (isInactive) {\n                throw JWTError.notActive();\n            }\n        }\n\n        return payload;\n    }\n}\n"],"mappings":";;;;;;AAmBA,IAAaK,sBAAb,MAAaA;CACCC;CAEAC;CAEV,YACID,eACAC,iBACF;EACE,KAAKD,gBAAgBA;EACrB,KAAKC,kBAAkBA;CAC3B;CAEA,MAAMC,WAAWC,IAA8B;EAC3C,OAAO,KAAKF,gBAAgBC,WAAWC,EAAAA;CAC3C;CAEA,MAAMC,OAAOC,OAAeC,UAAoC,CAAC,GAAiC;EAC9F,IAAIC,UAAU,MAAM,KAAKN,gBAAgBO,mBAAmBH,KAAAA;EAC5D,IAAIE,SAAS;GACT,IAAI,CAACA,QAAQE,KACT,MAAMX,SAASY,uBAAuB,KAAA;GAG1C,IAAI,CAACJ,QAAQK;QAELT,MADqB,KAAKA,WAAWK,QAAQE,GAAG,GAEhD,MAAMX,SAASc,UAAS;GAAA;GAIhC,OAAOL;EACX;EAEA,MAAMM,SAASnB,mBAAmBW,KAAAA;EAClC,IAAI,CAACQ,OAAOC,KACR,MAAMhB,SAASiB,sBAAsB,KAAA;EAGzC,MAAMC,MAAM,MAAM,KAAKhB,cAAciB,SAASJ,OAAOC,GAAG;EACxD,IAAI,CAACE,KACD,MAAMpB,SAASsB,SAASL,OAAOC,GAAG;EAGtC,QAAQE,IAAIG,MAAZ;GACI,KAAKtB,QAAQuB;IACT,IAAI,CAACJ,IAAIK,gBACL,MAAMzB,SAAS0B,qBAAoB;IAGvCf,UAAU,MAAMZ,YACZU,OACA;KACIc,MAAMtB,QAAQuB;KACdJ,KAAKA,IAAIK;IACb,GACA,EAAEE,cAAcjB,QAAQiB,aAAa,CAAA;IAEzC;GAEJ,KAAK1B,QAAQ2B;IACT,IAAI,CAACR,IAAIS,gBACL,MAAM7B,SAAS0B,qBAAoB;IAGvCf,UAAU,MAAMZ,YACZU,OACA;KACIc,MAAMH,IAAIG;KACVH,KAAKA,IAAIS;KACT,GACIT,IAAIU,sBACA,EAAEC,YAAY,CAACX,IAAIU,mBAAAA,EAAqB,IACxC,CAAA;IAEZ,GACA,EAAEH,cAAcjB,QAAQiB,aAAa,CAAA;IAEzC;GAEJ;IACI,IAAI,CAACP,IAAIS,gBACL,MAAM7B,SAAS0B,qBAAoB;IAGvCf,UAAU,MAAMZ,YACZU,OACA;KACIc,MAAMH,IAAIG;KACVH,KAAKA,IAAIS;KACT,GACIT,IAAIU,sBACA,EAAEC,YAAY,CAACX,IAAIU,mBAAAA,EAAqB,IACxC,CAAA;IAEZ,GACA,EAAEH,cAAcjB,QAAQiB,aAAa,CAAA;EAGjD;EAEA,IAAI,CAAChB,QAAQE,KACT,MAAMX,SAASY,uBAAuB,KAAA;EAW1C,IAAI,CAACJ,QAAQiB,cACT,MAAM,KAAKtB,gBAAgB2B,kBAAkBrB,SAASF,KAAAA;EAG1D,IAAI,CAACC,QAAQK;OAELT,MADqB,KAAKA,WAAWK,QAAQE,GAAG,GAEhD,MAAMX,SAASc,UAAS;EAAA;EAIhC,OAAOL;CACX;AACJ"}
+{"version":3,"file":"module.mjs","names":["extractTokenHeader","verifyToken","KeyStatus","JWKError","JWKType","JWKUse","JWTError","OAuth2TokenVerifier","keyStore","tokenRepository","isInactive","id","verify","token","options","payload","findOneBySignature","jti","payloadPropertyInvalid","skipActiveCheck","notActive","header","kid","headerPropertyInvalid","key","resolveById","notFound","use","SIGNATURE","status","DISABLED","type","OCT","decryption_key","decryptionKeyMissing","ignoreExpiry","EC","encryption_key","signature_algorithm","algorithms","saveWithSignature"],"sources":["../../../../../src/core/oauth2/token/verifier/module.ts"],"sourcesContent":["/*\n * Copyright (c) 2025.\n * Author Peter Placzek (tada5hi)\n * For the full copyright and license information,\n * view the LICENSE file that was distributed with this source code.\n */\n\nimport {\n    type TokenECAlgorithm,\n    type TokenRSAAlgorithm,\n    extractTokenHeader,\n    verifyToken,\n} from '@authup/server-kit';\nimport { KeyStatus } from '@authup/core-kit';\nimport type { OAuth2TokenPayload } from '@authup/specs';\nimport {\n    JWKError,\n    JWKType,\n    JWKUse,\n    JWTError,\n} from '@authup/specs';\nimport type { IKeyStore } from '../../../key/index.ts';\nimport type { IOAuth2TokenRepository } from '../repository/types.ts';\nimport type { IOAuth2TokenVerifier, OAuth2TokenVerifyOptions } from './types.ts';\n\nexport class OAuth2TokenVerifier implements IOAuth2TokenVerifier {\n    protected keyStore : IKeyStore;\n\n    protected tokenRepository : IOAuth2TokenRepository;\n\n    constructor(\n        keyStore : IKeyStore,\n        tokenRepository : IOAuth2TokenRepository,\n    ) {\n        this.keyStore = keyStore;\n        this.tokenRepository = tokenRepository;\n    }\n\n    async isInactive(id: string): Promise<boolean> {\n        return this.tokenRepository.isInactive(id);\n    }\n\n    async verify(token: string, options: OAuth2TokenVerifyOptions = {}) : Promise<OAuth2TokenPayload> {\n        let payload = await this.tokenRepository.findOneBySignature(token);\n        if (payload) {\n            if (!payload.jti) {\n                throw JWTError.payloadPropertyInvalid('jti');\n            }\n\n            if (!options.skipActiveCheck) {\n                const isInactive = await this.isInactive(payload.jti);\n                if (isInactive) {\n                    throw JWTError.notActive();\n                }\n            }\n\n            return payload;\n        }\n\n        const header = extractTokenHeader(token);\n        if (!header.kid) {\n            throw JWTError.headerPropertyInvalid('kid');\n        }\n\n        const key = await this.keyStore.resolveById(header.kid);\n        if (!key) {\n            throw JWKError.notFound(header.kid);\n        }\n\n        // the key store also holds at-rest encryption keys (use: enc) —\n        // those must never verify a token.\n        if (key.use !== JWKUse.SIGNATURE) {\n            throw JWKError.notFound(header.kid);\n        }\n\n        // disabled = neither signs nor verifies (passive still verifies).\n        if (key.status === KeyStatus.DISABLED) {\n            throw JWKError.notFound(header.kid);\n        }\n\n        switch (key.type) {\n            case JWKType.OCT: {\n                if (!key.decryption_key) {\n                    throw JWKError.decryptionKeyMissing();\n                }\n\n                payload = await verifyToken(\n                    token,\n                    {\n                        type: JWKType.OCT,\n                        key: key.decryption_key,\n                    },\n                    { ignoreExpiry: options.ignoreExpiry },\n                );\n                break;\n            }\n            case JWKType.EC: {\n                if (!key.encryption_key) {\n                    throw JWKError.decryptionKeyMissing();\n                }\n\n                payload = await verifyToken(\n                    token,\n                    {\n                        type: key.type,\n                        key: key.encryption_key,\n                        ...(\n                            key.signature_algorithm ?\n                                { algorithms: [key.signature_algorithm] } :\n                                []\n                        ) as TokenECAlgorithm[],\n                    },\n                    { ignoreExpiry: options.ignoreExpiry },\n                );\n                break;\n            }\n            default: {\n                if (!key.encryption_key) {\n                    throw JWKError.decryptionKeyMissing();\n                }\n\n                payload = await verifyToken(\n                    token,\n                    {\n                        type: key.type,\n                        key: key.encryption_key,\n                        ...(\n                            key.signature_algorithm ?\n                                { algorithms: [key.signature_algorithm] } :\n                                []\n                        ) as TokenRSAAlgorithm[],\n                    },\n                    { ignoreExpiry: options.ignoreExpiry },\n                );\n            }\n        }\n\n        if (!payload.jti) {\n            throw JWTError.payloadPropertyInvalid('jti');\n        }\n\n        // Never populate the shared signature-keyed claims cache on the\n        // exp-ignoring path. An expired token verified with `ignoreExpiry`\n        // (the RP-initiated-logout id_token_hint) would otherwise be re-cached\n        // with buildTTL's 1h fallback (a past exp yields a non-positive ttl),\n        // and the cache-first branch above returns it with no exp re-check on\n        // every subsequent verify — so `/token/introspect` would report an\n        // expired token as active for up to an hour (RFC 7662). Keep the\n        // exp-bypass scoped to this single call.\n        if (!options.ignoreExpiry) {\n            await this.tokenRepository.saveWithSignature(payload, token);\n        }\n\n        if (!options.skipActiveCheck) {\n            const isInactive = await this.isInactive(payload.jti);\n            if (isInactive) {\n                throw JWTError.notActive();\n            }\n        }\n\n        return payload;\n    }\n}\n"],"mappings":";;;;;;;AAyBA,IAAaO,sBAAb,MAAaA;CACCC;CAEAC;CAEV,YACID,UACAC,iBACF;EACE,KAAKD,WAAWA;EAChB,KAAKC,kBAAkBA;CAC3B;CAEA,MAAMC,WAAWC,IAA8B;EAC3C,OAAO,KAAKF,gBAAgBC,WAAWC,EAAAA;CAC3C;CAEA,MAAMC,OAAOC,OAAeC,UAAoC,CAAC,GAAiC;EAC9F,IAAIC,UAAU,MAAM,KAAKN,gBAAgBO,mBAAmBH,KAAAA;EAC5D,IAAIE,SAAS;GACT,IAAI,CAACA,QAAQE,KACT,MAAMX,SAASY,uBAAuB,KAAA;GAG1C,IAAI,CAACJ,QAAQK;QAELT,MADqB,KAAKA,WAAWK,QAAQE,GAAG,GAEhD,MAAMX,SAASc,UAAS;GAAA;GAIhC,OAAOL;EACX;EAEA,MAAMM,SAASrB,mBAAmBa,KAAAA;EAClC,IAAI,CAACQ,OAAOC,KACR,MAAMhB,SAASiB,sBAAsB,KAAA;EAGzC,MAAMC,MAAM,MAAM,KAAKhB,SAASiB,YAAYJ,OAAOC,GAAG;EACtD,IAAI,CAACE,KACD,MAAMrB,SAASuB,SAASL,OAAOC,GAAG;EAKtC,IAAIE,IAAIG,QAAQtB,OAAOuB,WACnB,MAAMzB,SAASuB,SAASL,OAAOC,GAAG;EAItC,IAAIE,IAAIK,WAAW3B,UAAU4B,UACzB,MAAM3B,SAASuB,SAASL,OAAOC,GAAG;EAGtC,QAAQE,IAAIO,MAAZ;GACI,KAAK3B,QAAQ4B;IACT,IAAI,CAACR,IAAIS,gBACL,MAAM9B,SAAS+B,qBAAoB;IAGvCnB,UAAU,MAAMd,YACZY,OACA;KACIkB,MAAM3B,QAAQ4B;KACdR,KAAKA,IAAIS;IACb,GACA,EAAEE,cAAcrB,QAAQqB,aAAa,CAAA;IAEzC;GAEJ,KAAK/B,QAAQgC;IACT,IAAI,CAACZ,IAAIa,gBACL,MAAMlC,SAAS+B,qBAAoB;IAGvCnB,UAAU,MAAMd,YACZY,OACA;KACIkB,MAAMP,IAAIO;KACVP,KAAKA,IAAIa;KACT,GACIb,IAAIc,sBACA,EAAEC,YAAY,CAACf,IAAIc,mBAAAA,EAAqB,IACxC,CAAA;IAEZ,GACA,EAAEH,cAAcrB,QAAQqB,aAAa,CAAA;IAEzC;GAEJ;IACI,IAAI,CAACX,IAAIa,gBACL,MAAMlC,SAAS+B,qBAAoB;IAGvCnB,UAAU,MAAMd,YACZY,OACA;KACIkB,MAAMP,IAAIO;KACVP,KAAKA,IAAIa;KACT,GACIb,IAAIc,sBACA,EAAEC,YAAY,CAACf,IAAIc,mBAAAA,EAAqB,IACxC,CAAA;IAEZ,GACA,EAAEH,cAAcrB,QAAQqB,aAAa,CAAA;EAGjD;EAEA,IAAI,CAACpB,QAAQE,KACT,MAAMX,SAASY,uBAAuB,KAAA;EAW1C,IAAI,CAACJ,QAAQqB,cACT,MAAM,KAAK1B,gBAAgB+B,kBAAkBzB,SAASF,KAAAA;EAG1D,IAAI,CAACC,QAAQK;OAELT,MADqB,KAAKA,WAAWK,QAAQE,GAAG,GAEhD,MAAMX,SAASc,UAAS;EAAA;EAIhC,OAAOL;CACX;AACJ"}