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

package/dist/core/oauth2/end-session/service.mjs

@@ -0,0 +1,130 @@
+import "node:path";
+import "node:url";
+import.meta.url;
+import { isSimpleMatch, isUUID } from "@authup/kit";
+import { EventName, EventRefType, EventScope } from "@authup/core-kit";
+import { OAuth2TokenKind } from "@authup/specs";
+//#region src/core/oauth2/end-session/service.ts
+var OAuth2EndSessionService = class {
+	tokenVerifier;
+	sessionManager;
+	clientRepository;
+	realmRepository;
+	eventService;
+	hintGracePeriod;
+	constructor(ctx) {
+		this.tokenVerifier = ctx.tokenVerifier;
+		this.sessionManager = ctx.sessionManager;
+		this.clientRepository = ctx.clientRepository;
+		this.realmRepository = ctx.realmRepository;
+		this.eventService = ctx.eventService;
+		this.hintGracePeriod = ctx.hintGracePeriod ?? 0;
+	}
+	async verify(data) {
+		let hintVerified = false;
+		let sub;
+		let subKind;
+		let sessionId;
+		let hintRealmId;
+		let audiences = [];
+		if (data.id_token_hint) try {
+			const payload = await this.tokenVerifier.verify(data.id_token_hint, {
+				ignoreExpiry: true,
+				skipActiveCheck: true
+			});
+			if (payload.kind === OAuth2TokenKind.ID_TOKEN && this.isWithinHintGraceWindow(payload)) {
+				hintVerified = true;
+				sub = payload.sub;
+				subKind = payload.sub_kind;
+				sessionId = payload.sid ?? payload.session_id ?? void 0;
+				hintRealmId = payload.realm_id ?? void 0;
+				const { aud } = payload;
+				if (Array.isArray(aud)) audiences = aud.filter((entry) => typeof entry === "string");
+				else if (typeof aud === "string") audiences = [aud];
+			}
+		} catch {}
+		const clientId = data.client_id ?? (audiences.length === 1 ? audiences[0] : void 0);
+		let client = null;
+		if (clientId) {
+			const realmKey = data.realm_id ?? data.realm_name ?? (hintVerified ? hintRealmId : void 0);
+			const realm = await this.realmRepository.resolve(realmKey, false);
+			if (realm) client = await this.clientRepository.findOneByIdOrName(clientId, realm.id);
+			else if (!realmKey && isUUID(clientId)) client = await this.clientRepository.findOneByIdOrName(clientId);
+		}
+		if (hintVerified && data.client_id) {
+			const expected = isUUID(data.client_id) ? data.client_id : client?.id;
+			if (audiences.length === 0 || !expected || !audiences.includes(expected)) {
+				hintVerified = false;
+				sub = void 0;
+				subKind = void 0;
+				sessionId = void 0;
+			}
+		}
+		let clientName;
+		let redirectUri;
+		if (client) {
+			clientName = client.name;
+			if (data.post_logout_redirect_uri && this.isValidPostLogoutRedirect(client.post_logout_redirect_uri, data.post_logout_redirect_uri)) redirectUri = data.post_logout_redirect_uri;
+		}
+		return {
+			hintVerified,
+			...hintVerified ? {
+				sub,
+				subKind,
+				sessionId
+			} : {},
+			...clientId ? { clientId } : {},
+			...clientName ? { clientName } : {},
+			...redirectUri ? {
+				redirectUri,
+				...data.state ? { state: data.state } : {}
+			} : {}
+		};
+	}
+	async revoke(sessionId, sub, subKind) {
+		const session = await this.sessionManager.findOneById(sessionId);
+		if (!session) return false;
+		if (session.sub !== sub || session.sub_kind !== subKind) return false;
+		await this.sessionManager.revoke(sessionId);
+		await this.eventService?.record({
+			scope: EventScope.OAUTH2,
+			name: EventName.LOGOUT,
+			refType: EventRefType.SESSION,
+			refId: sessionId,
+			actorType: session.sub_kind,
+			actorId: session.sub,
+			realmId: session.realm_id,
+			data: { revoked_session_id: sessionId }
+		});
+		return true;
+	}
+	/**
+	* With a positive `hintGracePeriod`, an expired hint is honored only within
+	* the window past `exp` — beyond it a leaked id_token stops being a
+	* replayable remote logout (the hint counts as unverified; the click-gated
+	* confirm page still works). 0 keeps spec/Keycloak parity: any expired hint.
+	*/ isWithinHintGraceWindow(payload) {
+		if (this.hintGracePeriod <= 0) return true;
+		if (typeof payload.exp !== "number") return false;
+		return Math.floor(Date.now() / 1e3) - payload.exp <= this.hintGracePeriod;
+	}
+	/**
+	* A post-logout redirect is honored only when it is an absolute http(s) URL
+	* that matches a registered client redirect pattern (defense against open
+	* redirects to attacker-controlled URLs).
+	*/ isValidPostLogoutRedirect(registered, candidate) {
+		let parsed;
+		try {
+			parsed = new URL(candidate);
+		} catch {
+			return false;
+		}
+		if (parsed.protocol !== "http:" && parsed.protocol !== "https:") return false;
+		if (!registered) return false;
+		return isSimpleMatch(candidate, registered.split(","));
+	}
+};
+//#endregion
+export { OAuth2EndSessionService };
+
+//# sourceMappingURL=service.mjs.map

package/dist/core/oauth2/end-session/service.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"service.mjs","names":["isSimpleMatch","isUUID","EventName","EventRefType","EventScope","OAuth2TokenKind","OAuth2EndSessionService","tokenVerifier","sessionManager","clientRepository","realmRepository","eventService","hintGracePeriod","ctx","verify","data","hintVerified","sub","subKind","sessionId","hintRealmId","audiences","id_token_hint","payload","ignoreExpiry","skipActiveCheck","kind","ID_TOKEN","isWithinHintGraceWindow","sub_kind","sid","session_id","undefined","realm_id","aud","Array","isArray","filter","entry","clientId","client_id","length","client","realmKey","realm_name","realm","resolve","findOneByIdOrName","id","expected","includes","clientName","redirectUri","name","post_logout_redirect_uri","isValidPostLogoutRedirect","state","revoke","session","findOneById","record","scope","OAUTH2","LOGOUT","refType","SESSION","refId","actorType","actorId","realmId","revoked_session_id","exp","nowSeconds","Math","floor","Date","now","registered","candidate","parsed","URL","protocol","split"],"sources":["../../../../src/core/oauth2/end-session/service.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 { isSimpleMatch, isUUID } from '@authup/kit';\nimport type { Client, IdentityType } from '@authup/core-kit';\nimport { EventName, EventRefType, EventScope } from '@authup/core-kit';\nimport type { OAuth2TokenPayload } from '@authup/specs';\nimport { OAuth2TokenKind } from '@authup/specs';\nimport type { IEventService, IRealmRepository } from '../../entities/index.ts';\nimport type { ISessionManager } from '../../authentication/index.ts';\nimport type { IOAuth2ClientRepository } from '../client/index.ts';\nimport type { IOAuth2TokenVerifier } from '../token/index.ts';\nimport type {\n    IOAuth2EndSessionService,\n    OAuth2EndSessionRequest,\n    OAuth2EndSessionResult,\n    OAuth2EndSessionServiceContext,\n} from './types.ts';\n\nexport class OAuth2EndSessionService implements IOAuth2EndSessionService {\n    protected tokenVerifier: IOAuth2TokenVerifier;\n\n    protected sessionManager: ISessionManager;\n\n    protected clientRepository: IOAuth2ClientRepository;\n\n    protected realmRepository: IRealmRepository;\n\n    protected eventService?: IEventService;\n\n    protected hintGracePeriod: number;\n\n    constructor(ctx: OAuth2EndSessionServiceContext) {\n        this.tokenVerifier = ctx.tokenVerifier;\n        this.sessionManager = ctx.sessionManager;\n        this.clientRepository = ctx.clientRepository;\n        this.realmRepository = ctx.realmRepository;\n        this.eventService = ctx.eventService;\n        this.hintGracePeriod = ctx.hintGracePeriod ?? 0;\n    }\n\n    async verify(data: OAuth2EndSessionRequest): Promise<OAuth2EndSessionResult> {\n        let hintVerified = false;\n        let sub: string | undefined;\n        let subKind: string | undefined;\n        let sessionId: string | undefined;\n        let hintRealmId: string | undefined;\n        let audiences: string[] = [];\n\n        if (data.id_token_hint) {\n            try {\n                // Signature + kind are the anchors; exp is skipped (a logout hint\n                // is routinely expired) and the cache blocklist is irrelevant.\n                const payload = await this.tokenVerifier.verify(data.id_token_hint, {\n                    ignoreExpiry: true,\n                    skipActiveCheck: true,\n                });\n\n                // MUST be an id_token — access/refresh tokens also carry\n                // session_id, so accepting them would let a leaked access token\n                // act as a logout weapon.\n                if (payload.kind === OAuth2TokenKind.ID_TOKEN && this.isWithinHintGraceWindow(payload)) {\n                    hintVerified = true;\n                    sub = payload.sub;\n                    subKind = payload.sub_kind;\n                    sessionId = payload.sid ?? payload.session_id ?? undefined;\n                    hintRealmId = payload.realm_id ?? undefined;\n                    // aud may be a single string or an array (JWT spec).\n                    const { aud } = payload;\n                    if (Array.isArray(aud)) {\n                        audiences = aud.filter((entry): entry is string => typeof entry === 'string');\n                    } else if (typeof aud === 'string') {\n                        audiences = [aud];\n                    }\n                }\n            } catch {\n                // forged / unverifiable hint → stays unverified (no revoke)\n            }\n        }\n\n        // Resolve a single client for the aud cross-check and redirect\n        // validation: the request's client_id, else the hint's sole audience\n        // (ambiguous for a multi-aud hint).\n        const clientId = data.client_id ?? (audiences.length === 1 ? audiences[0] : undefined);\n\n        let client: Client | null = null;\n        if (clientId) {\n            // Scope a name-identified client to the request's realm hint; a\n            // VERIFIED hint's own realm claim serves as fallback (claims from an\n            // unverified hint are never trusted). No master fallback here\n            // (unlike /token): a bogus hint must NOT silently resolve a\n            // same-named client in master → null realm.\n            const realmKey = data.realm_id ?? data.realm_name ?? (hintVerified ? hintRealmId : undefined);\n            const realm = await this.realmRepository.resolve(realmKey, false);\n\n            // Fail closed instead of dropping the realm predicate: a supplied\n            // realm key that does not resolve never degrades to an unscoped\n            // lookup, and a NAME-form client_id without any realm key is\n            // ambiguous (every realm has a built-in `web` client — same rule as\n            // the /authorize verifier). A UUID is globally unique and needs no\n            // scope; the sole-aud-derived clientId is always a UUID.\n            if (realm) {\n                client = await this.clientRepository.findOneByIdOrName(clientId, realm.id);\n            } else if (!realmKey && isUUID(clientId)) {\n                client = await this.clientRepository.findOneByIdOrName(clientId);\n            }\n        }\n\n        // aud/client_id cross-check: when the request supplies a client_id on a\n        // verified hint, it MUST denote one of the hint's audiences. The aud is\n        // the client UUID, so a name-form client_id is compared via its resolved\n        // client's id. Fail closed: an aud-less hint, or a name that did not\n        // resolve, counts as unverified.\n        if (hintVerified && data.client_id) {\n            const expected = isUUID(data.client_id) ? data.client_id : client?.id;\n            if (audiences.length === 0 || !expected || !audiences.includes(expected)) {\n                hintVerified = false;\n                sub = undefined;\n                subKind = undefined;\n                sessionId = undefined;\n            }\n        }\n\n        let clientName: string | undefined;\n        let redirectUri: string | undefined;\n\n        // Redirect validation is independent of hint verification — the\n        // click-gated confirm page (unverified hint / hint-less request) still\n        // honors a registered post-logout redirect.\n        if (client) {\n            clientName = client.name;\n            if (\n                data.post_logout_redirect_uri &&\n                this.isValidPostLogoutRedirect(client.post_logout_redirect_uri, data.post_logout_redirect_uri)\n            ) {\n                redirectUri = data.post_logout_redirect_uri;\n            }\n        }\n\n        return {\n            hintVerified,\n            ...(hintVerified ? {\n                sub,\n                subKind,\n                sessionId,\n            } : {}),\n            ...(clientId ? { clientId } : {}),\n            ...(clientName ? { clientName } : {}),\n            ...(redirectUri ? { redirectUri, ...(data.state ? { state: data.state } : {}) } : {}),\n        };\n    }\n\n    async revoke(sessionId: string, sub: string, subKind: string): Promise<boolean> {\n        const session = await this.sessionManager.findOneById(sessionId);\n        if (!session) {\n            return false;\n        }\n\n        // Never revoke a session that does not belong to the hint's subject.\n        if (session.sub !== sub || session.sub_kind !== subKind) {\n            return false;\n        }\n\n        await this.sessionManager.revoke(sessionId);\n\n        await this.eventService?.record({\n            scope: EventScope.OAUTH2,\n            name: EventName.LOGOUT,\n            refType: EventRefType.SESSION,\n            refId: sessionId,\n            actorType: session.sub_kind as `${IdentityType}`,\n            actorId: session.sub,\n            realmId: session.realm_id,\n            data: { revoked_session_id: sessionId },\n        });\n\n        return true;\n    }\n\n    /**\n     * With a positive `hintGracePeriod`, an expired hint is honored only within\n     * the window past `exp` — beyond it a leaked id_token stops being a\n     * replayable remote logout (the hint counts as unverified; the click-gated\n     * confirm page still works). 0 keeps spec/Keycloak parity: any expired hint.\n     */\n    protected isWithinHintGraceWindow(payload: OAuth2TokenPayload): boolean {\n        if (this.hintGracePeriod <= 0) {\n            return true;\n        }\n\n        // a bounded window without an exp claim to judge against fails closed\n        if (typeof payload.exp !== 'number') {\n            return false;\n        }\n\n        const nowSeconds = Math.floor(Date.now() / 1000);\n        return nowSeconds - payload.exp <= this.hintGracePeriod;\n    }\n\n    /**\n     * A post-logout redirect is honored only when it is an absolute http(s) URL\n     * that matches a registered client redirect pattern (defense against open\n     * redirects to attacker-controlled URLs).\n     */\n    protected isValidPostLogoutRedirect(\n        registered: string | null | undefined,\n        candidate: string,\n    ): boolean {\n        let parsed: URL;\n        try {\n            parsed = new URL(candidate);\n        } catch {\n            return false;\n        }\n\n        if (parsed.protocol !== 'http:' && parsed.protocol !== 'https:') {\n            return false;\n        }\n\n        if (!registered) {\n            return false;\n        }\n\n        return isSimpleMatch(candidate, registered.split(','));\n    }\n}\n"],"mappings":";;;;;;;AAuBA,IAAaM,0BAAb,MAAaA;CACCC;CAEAC;CAEAC;CAEAC;CAEAC;CAEAC;CAEV,YAAYC,KAAqC;EAC7C,KAAKN,gBAAgBM,IAAIN;EACzB,KAAKC,iBAAiBK,IAAIL;EAC1B,KAAKC,mBAAmBI,IAAIJ;EAC5B,KAAKC,kBAAkBG,IAAIH;EAC3B,KAAKC,eAAeE,IAAIF;EACxB,KAAKC,kBAAkBC,IAAID,mBAAmB;CAClD;CAEA,MAAME,OAAOC,MAAgE;EACzE,IAAIC,eAAe;EACnB,IAAIC;EACJ,IAAIC;EACJ,IAAIC;EACJ,IAAIC;EACJ,IAAIC,YAAsB,CAAA;EAE1B,IAAIN,KAAKO,eACL,IAAI;GAGA,MAAMC,UAAU,MAAM,KAAKhB,cAAcO,OAAOC,KAAKO,eAAe;IAChEE,cAAc;IACdC,iBAAiB;GACrB,CAAA;GAKA,IAAIF,QAAQG,SAASrB,gBAAgBsB,YAAY,KAAKC,wBAAwBL,OAAAA,GAAU;IACpFP,eAAe;IACfC,MAAMM,QAAQN;IACdC,UAAUK,QAAQM;IAClBV,YAAYI,QAAQO,OAAOP,QAAQQ,cAAcC,KAAAA;IACjDZ,cAAcG,QAAQU,YAAYD,KAAAA;IAElC,MAAM,EAAEE,QAAQX;IAChB,IAAIY,MAAMC,QAAQF,GAAAA,GACdb,YAAYa,IAAIG,QAAQC,UAA2B,OAAOA,UAAU,QAAA;SACjE,IAAI,OAAOJ,QAAQ,UACtBb,YAAY,CAACa,GAAAA;GAErB;EACJ,QAAQ,CAER;EAMJ,MAAMK,WAAWxB,KAAKyB,cAAcnB,UAAUoB,WAAW,IAAIpB,UAAU,KAAKW,KAAAA;EAE5E,IAAIU,SAAwB;EAC5B,IAAIH,UAAU;GAMV,MAAMI,WAAW5B,KAAKkB,YAAYlB,KAAK6B,eAAe5B,eAAeI,cAAcY,KAAAA;GACnF,MAAMa,QAAQ,MAAM,KAAKnC,gBAAgBoC,QAAQH,UAAU,KAAA;GAQ3D,IAAIE,OACAH,SAAS,MAAM,KAAKjC,iBAAiBsC,kBAAkBR,UAAUM,MAAMG,EAAE;QACtE,IAAI,CAACL,YAAY1C,OAAOsC,QAAAA,GAC3BG,SAAS,MAAM,KAAKjC,iBAAiBsC,kBAAkBR,QAAAA;EAE/D;EAOA,IAAIvB,gBAAgBD,KAAKyB,WAAW;GAChC,MAAMS,WAAWhD,OAAOc,KAAKyB,SAAS,IAAIzB,KAAKyB,YAAYE,QAAQM;GACnE,IAAI3B,UAAUoB,WAAW,KAAK,CAACQ,YAAY,CAAC5B,UAAU6B,SAASD,QAAAA,GAAW;IACtEjC,eAAe;IACfC,MAAMe,KAAAA;IACNd,UAAUc,KAAAA;IACVb,YAAYa,KAAAA;GAChB;EACJ;EAEA,IAAImB;EACJ,IAAIC;EAKJ,IAAIV,QAAQ;GACRS,aAAaT,OAAOW;GACpB,IACItC,KAAKuC,4BACL,KAAKC,0BAA0Bb,OAAOY,0BAA0BvC,KAAKuC,wBAAwB,GAE7FF,cAAcrC,KAAKuC;EAE3B;EAEA,OAAO;GACHtC;GACA,GAAIA,eAAe;IACfC;IACAC;IACAC;GACJ,IAAI,CAAC;GACL,GAAIoB,WAAW,EAAEA,SAAS,IAAI,CAAC;GAC/B,GAAIY,aAAa,EAAEA,WAAW,IAAI,CAAC;GACnC,GAAIC,cAAc;IAAEA;IAAa,GAAIrC,KAAKyC,QAAQ,EAAEA,OAAOzC,KAAKyC,MAAM,IAAI,CAAC;GAAG,IAAI,CAAC;EACvF;CACJ;CAEA,MAAMC,OAAOtC,WAAmBF,KAAaC,SAAmC;EAC5E,MAAMwC,UAAU,MAAM,KAAKlD,eAAemD,YAAYxC,SAAAA;EACtD,IAAI,CAACuC,SACD,OAAO;EAIX,IAAIA,QAAQzC,QAAQA,OAAOyC,QAAQ7B,aAAaX,SAC5C,OAAO;EAGX,MAAM,KAAKV,eAAeiD,OAAOtC,SAAAA;EAEjC,MAAM,KAAKR,cAAciD,OAAO;GAC5BC,OAAOzD,WAAW0D;GAClBT,MAAMnD,UAAU6D;GAChBC,SAAS7D,aAAa8D;GACtBC,OAAO/C;GACPgD,WAAWT,QAAQ7B;GACnBuC,SAASV,QAAQzC;GACjBoD,SAASX,QAAQzB;GACjBlB,MAAM,EAAEuD,oBAAoBnD,UAAU;EAC1C,CAAA;EAEA,OAAO;CACX;;;;;;IAQA,wBAAkCI,SAAsC;EACpE,IAAI,KAAKX,mBAAmB,GACxB,OAAO;EAIX,IAAI,OAAOW,QAAQgD,QAAQ,UACvB,OAAO;EAIX,OADmBE,KAAKC,MAAMC,KAAKC,IAAG,IAAK,GACpCJ,IAAajD,QAAQgD,OAAO,KAAK3D;CAC5C;;;;;IAOA,0BACIiE,YACAC,WACO;EACP,IAAIC;EACJ,IAAI;GACAA,SAAS,IAAIC,IAAIF,SAAAA;EACrB,QAAQ;GACJ,OAAO;EACX;EAEA,IAAIC,OAAOE,aAAa,WAAWF,OAAOE,aAAa,UACnD,OAAO;EAGX,IAAI,CAACJ,YACD,OAAO;EAGX,OAAO7E,cAAc8E,WAAWD,WAAWK,MAAM,GAAA,CAAA;CACrD;AACJ"}

package/dist/core/oauth2/end-session/types.d.ts

@@ -0,0 +1,56 @@
+import type { IEventService, IRealmRepository } from '../../entities/index.ts';
+import type { ISessionManager } from '../../authentication/index.ts';
+import type { IOAuth2ClientRepository } from '../client/index.ts';
+import type { IOAuth2TokenVerifier } from '../token/index.ts';
+export type OAuth2EndSessionRequest = {
+    id_token_hint?: string;
+    client_id?: string;
+    post_logout_redirect_uri?: string;
+    state?: string;
+    realm_id?: string;
+    realm_name?: string;
+};
+export type OAuth2EndSessionResult = {
+    /**
+     * True when a signature-verified id_token_hint proved possession. Only then
+     * are `sub` / `sessionId` populated and a server-side revoke authorized.
+     */
+    hintVerified: boolean;
+    sub?: string;
+    subKind?: string;
+    sessionId?: string;
+    clientId?: string;
+    clientName?: string;
+    /**
+     * The post-logout redirect — present ONLY when it matched a registered
+     * client pattern (open-redirect guard). `state` rides only alongside it.
+     */
+    redirectUri?: string;
+    state?: string;
+};
+export type OAuth2EndSessionServiceContext = {
+    tokenVerifier: IOAuth2TokenVerifier;
+    sessionManager: ISessionManager;
+    clientRepository: IOAuth2ClientRepository;
+    realmRepository: IRealmRepository;
+    eventService?: IEventService;
+    /**
+     * Seconds past its `exp` an (expired) id_token_hint is still accepted for
+     * a server-side revoke (config `endSessionHintGracePeriod`).
+     * 0 (default) = unbounded — spec/Keycloak parity.
+     */
+    hintGracePeriod?: number;
+};
+export interface IOAuth2EndSessionService {
+    /**
+     * Verify the request (id_token_hint signature + kind + aud, redirect
+     * validation). Pure — performs no mutation.
+     */
+    verify(data: OAuth2EndSessionRequest): Promise<OAuth2EndSessionResult>;
+    /**
+     * Revoke the session ONLY when it belongs to the hint's subject.
+     * @returns whether a session was revoked.
+     */
+    revoke(sessionId: string, sub: string, subKind: string): Promise<boolean>;
+}
+//# sourceMappingURL=types.d.ts.map

package/dist/core/oauth2/end-session/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/core/oauth2/end-session/types.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC/E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAClE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAE9D,MAAM,MAAM,uBAAuB,GAAG;IAClC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACjC;;;OAGG;IACH,YAAY,EAAE,OAAO,CAAC;IACtB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,8BAA8B,GAAG;IACzC,aAAa,EAAE,oBAAoB,CAAC;IACpC,cAAc,EAAE,eAAe,CAAC;IAChC,gBAAgB,EAAE,uBAAuB,CAAC;IAC1C,eAAe,EAAE,gBAAgB,CAAC;IAClC,YAAY,CAAC,EAAE,aAAa,CAAC;IAC7B;;;;OAIG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF,MAAM,WAAW,wBAAwB;IACrC;;;OAGG;IACH,MAAM,CAAC,IAAI,EAAE,uBAAuB,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAC;IAEvE;;;OAGG;IACH,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAC7E"}

package/dist/core/oauth2/end-session/types.mjs

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

package/dist/core/oauth2/end-session/validator.d.ts

@@ -0,0 +1,6 @@
+import { Container } from 'validup';
+import type { OAuth2EndSessionRequest } from './types.ts';
+export declare class OAuth2EndSessionRequestValidator extends Container<OAuth2EndSessionRequest> {
+    protected initialize(): void;
+}
+//# sourceMappingURL=validator.d.ts.map

package/dist/core/oauth2/end-session/validator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"validator.d.ts","sourceRoot":"","sources":["../../../../src/core/oauth2/end-session/validator.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAEpC,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAC;AAS1D,qBAAa,gCAAiC,SAAQ,SAAS,CAAC,uBAAuB,CAAC;IACpF,SAAS,CAAC,UAAU;CA0CvB"}

package/dist/core/oauth2/end-session/validator.mjs

@@ -0,0 +1,23 @@
+import "node:path";
+import "node:url";
+import.meta.url;
+import { Container } from "validup";
+import { createValidator } from "@validup/zod";
+import { z } from "zod";
+//#region src/core/oauth2/end-session/validator.ts
+const blankAsAbsent = (schema) => z.preprocess((value) => typeof value === "string" && value.trim() === "" ? void 0 : value, schema);
+var OAuth2EndSessionRequestValidator = class extends Container {
+	initialize() {
+		super.initialize();
+		this.mount("id_token_hint", { optional: true }, createValidator(blankAsAbsent(z.string().max(4096).nullable().optional())));
+		this.mount("client_id", { optional: true }, createValidator(blankAsAbsent(z.string().max(256).nullable().optional())));
+		this.mount("post_logout_redirect_uri", { optional: true }, createValidator(blankAsAbsent(z.string().url().max(2e3).nullable().optional())));
+		this.mount("state", { optional: true }, createValidator(blankAsAbsent(z.string().max(2048).nullable().optional())));
+		this.mount("realm_id", { optional: true }, createValidator(blankAsAbsent(z.string().trim().toLowerCase().max(256).nullable().optional())));
+		this.mount("realm_name", { optional: true }, createValidator(blankAsAbsent(z.string().trim().toLowerCase().max(256).nullable().optional())));
+	}
+};
+//#endregion
+export { OAuth2EndSessionRequestValidator };
+
+//# sourceMappingURL=validator.mjs.map

package/dist/core/oauth2/end-session/validator.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"validator.mjs","names":["createValidator","Container","z","blankAsAbsent","schema","preprocess","value","trim","undefined","OAuth2EndSessionRequestValidator","initialize","mount","optional","string","max","nullable","url","toLowerCase"],"sources":["../../../../src/core/oauth2/end-session/validator.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 { createValidator } from '@validup/zod';\nimport { Container } from 'validup';\nimport { z } from 'zod';\nimport type { OAuth2EndSessionRequest } from './types.ts';\n\n// A blank param (e.g. a stray `?state=` from an RP template) is absent,\n// not a validation failure — it must not discard the rest of the request.\nconst blankAsAbsent = (schema: z.ZodType) => z.preprocess(\n    (value) => (typeof value === 'string' && value.trim() === '' ? undefined : value),\n    schema,\n);\n\nexport class OAuth2EndSessionRequestValidator extends Container<OAuth2EndSessionRequest> {\n    protected initialize() {\n        super.initialize();\n\n        this.mount(\n            'id_token_hint',\n            { optional: true },\n            createValidator(blankAsAbsent(z.string().max(4096).nullable().optional())),\n        );\n\n        this.mount(\n            'client_id',\n            { optional: true },\n            createValidator(blankAsAbsent(z.string().max(256).nullable().optional())),\n        );\n\n        this.mount(\n            'post_logout_redirect_uri',\n            { optional: true },\n            createValidator(blankAsAbsent(z.string().url().max(2000).nullable().optional())),\n        );\n\n        this.mount(\n            'state',\n            { optional: true },\n            createValidator(blankAsAbsent(z.string().max(2048).nullable().optional())),\n        );\n\n        // Canonical identifier form (layer 3): no other validator runs on the\n        // end-session request, so the realm hint is canonicalized at this\n        // ingress — same contract as the token endpoint's readRealmHint.\n        this.mount(\n            'realm_id',\n            { optional: true },\n            createValidator(blankAsAbsent(z.string().trim().toLowerCase().max(256).nullable().optional())),\n        );\n\n        this.mount(\n            'realm_name',\n            { optional: true },\n            createValidator(blankAsAbsent(z.string().trim().toLowerCase().max(256).nullable().optional())),\n        );\n    }\n}\n"],"mappings":";;;;;;;AAcA,MAAMG,iBAAiBC,WAAsBF,EAAEG,YAC1CC,UAAW,OAAOA,UAAU,YAAYA,MAAMC,KAAI,MAAO,KAAKC,KAAAA,IAAYF,OAC3EF,MAAAA;AAGJ,IAAaK,mCAAb,cAAsDR,UAAAA;CACxCS,aAAa;EACnB,MAAMA,WAAAA;EAEN,KAAKC,MACD,iBACA,EAAEC,UAAU,KAAK,GACjBZ,gBAAgBG,cAAcD,EAAEW,OAAM,CAAA,CAAGC,IAAI,IAAA,CAAA,CAAMC,SAAQ,CAAA,CAAGH,SAAQ,CAAA,CAAA,CAAA;EAG1E,KAAKD,MACD,aACA,EAAEC,UAAU,KAAK,GACjBZ,gBAAgBG,cAAcD,EAAEW,OAAM,CAAA,CAAGC,IAAI,GAAA,CAAA,CAAKC,SAAQ,CAAA,CAAGH,SAAQ,CAAA,CAAA,CAAA;EAGzE,KAAKD,MACD,4BACA,EAAEC,UAAU,KAAK,GACjBZ,gBAAgBG,cAAcD,EAAEW,OAAM,CAAA,CAAGG,IAAG,CAAA,CAAGF,IAAI,GAAA,CAAA,CAAMC,SAAQ,CAAA,CAAGH,SAAQ,CAAA,CAAA,CAAA;EAGhF,KAAKD,MACD,SACA,EAAEC,UAAU,KAAK,GACjBZ,gBAAgBG,cAAcD,EAAEW,OAAM,CAAA,CAAGC,IAAI,IAAA,CAAA,CAAMC,SAAQ,CAAA,CAAGH,SAAQ,CAAA,CAAA,CAAA;EAM1E,KAAKD,MACD,YACA,EAAEC,UAAU,KAAK,GACjBZ,gBAAgBG,cAAcD,EAAEW,OAAM,CAAA,CAAGN,KAAI,CAAA,CAAGU,YAAW,CAAA,CAAGH,IAAI,GAAA,CAAA,CAAKC,SAAQ,CAAA,CAAGH,SAAQ,CAAA,CAAA,CAAA;EAG9F,KAAKD,MACD,cACA,EAAEC,UAAU,KAAK,GACjBZ,gBAAgBG,cAAcD,EAAEW,OAAM,CAAA,CAAGN,KAAI,CAAA,CAAGU,YAAW,CAAA,CAAGH,IAAI,GAAA,CAAA,CAAKC,SAAQ,CAAA,CAAGH,SAAQ,CAAA,CAAA,CAAA;CAElG;AACJ"}

package/dist/core/oauth2/grant-types/authorize.d.ts

@@ -1,11 +1,28 @@
 import type { OAuth2TokenGrantResponse } from '@authup/specs';
-import type { OAuth2AuthorizationCode } from '@authup/core-kit';
-import type { IOAuth2TokenIssuer } from '../token/index.ts';
+import type { OAuth2AuthorizationCode, Session } from '@authup/core-kit';
+import type { IKeyStore } from '../../key/index.ts';
+import type { IOAuth2OpenIDTokenIssuer, IOAuth2TokenIssuer } from '../token/index.ts';
 import { OAuth2BaseGrant } from './base.ts';
 import type { IOAuth2Grant, OAuth2AuthorizeGrantContext, OAuth2GrantRunWIthOptions } from './types.ts';
 export declare class OAuth2AuthorizeGrant extends OAuth2BaseGrant<OAuth2AuthorizationCode> implements IOAuth2Grant {
     protected refreshTokenIssuer: IOAuth2TokenIssuer;
+    protected openIdTokenIssuer: IOAuth2OpenIDTokenIssuer;
+    protected keyStore: IKeyStore;
     constructor(ctx: OAuth2AuthorizeGrantContext);
     runWith(authorizationCode: OAuth2AuthorizationCode, options?: OAuth2GrantRunWIthOptions): Promise<OAuth2TokenGrantResponse>;
+    /**
+     * Reuse the bearer's session when the authorization code was issued from an
+     * (interactive) `/authorize` request that carried one — otherwise the
+     * interactive login would create a second session (the abandoned bearer
+     * session that authenticated `POST /authorize`, plus this one).
+     *
+     * The reuse is gated on the session still existing and belonging to the
+     * same subject/realm as the code (defense in depth — the id is
+     * server-derived from the authenticated bearer, never client input). Any
+     * mismatch, or a session-less authorize flow (external IdP, non-interactive
+     * clients), falls back to creating a fresh session — preserving prior
+     * behavior.
+     */
+    protected resolveSession(authorizationCode: OAuth2AuthorizationCode, options: OAuth2GrantRunWIthOptions): Promise<Session>;
 }
 //# sourceMappingURL=authorize.d.ts.map

package/dist/core/oauth2/grant-types/authorize.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"authorize.d.ts","sourceRoot":"","sources":["../../../../src/core/oauth2/grant-types/authorize.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,wBAAwB,EAAsB,MAAM,eAAe,CAAC;AAElF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAEhE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,KAAK,EAAE,YAAY,EAAE,2BAA2B,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAC;AAIvG,qBAAa,oBAAqB,SAAQ,eAAe,CAAC,uBAAuB,CAAE,YAAW,YAAY;IACtG,SAAS,CAAC,kBAAkB,EAAG,kBAAkB,CAAC;gBAEtC,GAAG,EAAE,2BAA2B;IAStC,OAAO,CACT,iBAAiB,EAAE,uBAAuB,EAC1C,OAAO,GAAE,yBAA8B,GACvC,OAAO,CAAC,wBAAwB,CAAC;CAyCxC"}
+{"version":3,"file":"authorize.d.ts","sourceRoot":"","sources":["../../../../src/core/oauth2/grant-types/authorize.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,wBAAwB,EAAsB,MAAM,eAAe,CAAC;AAElF,OAAO,KAAK,EAAE,uBAAuB,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAGzE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,KAAK,EAAE,wBAAwB,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACtF,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,KAAK,EAAE,YAAY,EAAE,2BAA2B,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAC;AAIvG,qBAAa,oBAAqB,SAAQ,eAAe,CAAC,uBAAuB,CAAE,YAAW,YAAY;IACtG,SAAS,CAAC,kBAAkB,EAAG,kBAAkB,CAAC;IAElD,SAAS,CAAC,iBAAiB,EAAG,wBAAwB,CAAC;IAEvD,SAAS,CAAC,QAAQ,EAAG,SAAS,CAAC;gBAEnB,GAAG,EAAE,2BAA2B;IAWtC,OAAO,CACT,iBAAiB,EAAE,uBAAuB,EAC1C,OAAO,GAAE,yBAA8B,GACvC,OAAO,CAAC,wBAAwB,CAAC;IAmErC;;;;;;;;;;;;OAYG;cACa,cAAc,CAC1B,iBAAiB,EAAE,uBAAuB,EAC1C,OAAO,EAAE,yBAAyB,GAClC,OAAO,CAAC,OAAO,CAAC;CAyBvB"}

package/dist/core/oauth2/grant-types/authorize.mjs

@@ -1,29 +1,28 @@
 import "node:path";
 import "node:url";
 import.meta.url;
+import { buildOAuth2TokenHash, deriveAmrAcr } from "../authorization/helpers.mjs";
 import { OAuth2BaseGrant } from "./base.mjs";
 import { buildOAuth2BearerTokenResponse } from "../response/bearer.mjs";
 import { ScopeName } from "@authup/core-kit";
-import { hasOAuth2Scopes } from "@authup/specs";
+import { JWKUse, hasOAuth2Scopes } from "@authup/specs";
 //#region src/core/oauth2/grant-types/authorize.ts
 var OAuth2AuthorizeGrant = class extends OAuth2BaseGrant {
 	refreshTokenIssuer;
+	openIdTokenIssuer;
+	keyStore;
 	constructor(ctx) {
 		super({
 			accessTokenIssuer: ctx.accessTokenIssuer,
 			sessionManager: ctx.sessionManager
 		});
 		this.refreshTokenIssuer = ctx.refreshTokenIssuer;
+		this.openIdTokenIssuer = ctx.openIdTokenIssuer;
+		this.keyStore = ctx.keyStore;
 	}
 	async runWith(authorizationCode, options = {}) {
-		const session = await this.sessionManager.create({
-			user_agent: options.userAgent,
-			ip_address: options.ipAddress,
-			realm_id: authorizationCode.realm_id,
-			client_id: authorizationCode.client_id,
-			sub_kind: authorizationCode.sub_kind,
-			sub: authorizationCode.sub
-		});
+		const session = await this.resolveSession(authorizationCode, options);
+		const amrAcr = deriveAmrAcr(session);
 		const issuePayload = {
 			user_agent: options.userAgent,
 			remote_address: options.ipAddress,
@@ -33,7 +32,9 @@ var OAuth2AuthorizeGrant = class extends OAuth2BaseGrant {
 			realm_id: authorizationCode.realm_id,
 			realm_name: authorizationCode.realm_name,
 			scope: authorizationCode.scope || void 0,
-			client_id: authorizationCode.client_id || void 0
+			client_id: authorizationCode.client_id || void 0,
+			...options.confirmation ? { cnf: options.confirmation } : {},
+			...amrAcr
 		};
 		const [accessToken, accessTokenPayload] = await this.accessTokenIssuer.issue(issuePayload);
 		const [refreshToken, refreshTokenPayload] = await this.refreshTokenIssuer.issue(issuePayload);
@@ -43,9 +44,55 @@ var OAuth2AuthorizeGrant = class extends OAuth2BaseGrant {
 			refreshToken,
 			refreshTokenPayload
 		};
-		if (authorizationCode.scope && hasOAuth2Scopes(authorizationCode.scope, ScopeName.OPEN_ID)) buildContext.idToken = authorizationCode.id_token || void 0;
+		if (authorizationCode.scope && hasOAuth2Scopes(authorizationCode.scope, ScopeName.OPEN_ID)) {
+			const key = await this.keyStore.resolveOrCreate(authorizationCode.realm_id, JWKUse.SIGNATURE);
+			const [idToken] = await this.openIdTokenIssuer.issue({
+				sub: authorizationCode.sub || void 0,
+				sub_kind: authorizationCode.sub_kind,
+				realm_id: authorizationCode.realm_id,
+				realm_name: authorizationCode.realm_name,
+				scope: authorizationCode.scope || void 0,
+				client_id: authorizationCode.client_id || void 0,
+				...authorizationCode.nonce ? { nonce: authorizationCode.nonce } : {},
+				...typeof authorizationCode.auth_time === "number" ? { auth_time: authorizationCode.auth_time } : {},
+				...amrAcr,
+				sid: session.id,
+				at_hash: await buildOAuth2TokenHash(accessToken, key.signature_algorithm)
+			});
+			buildContext.idToken = idToken;
+		}
 		return buildOAuth2BearerTokenResponse(buildContext);
 	}
+	/**
+	* Reuse the bearer's session when the authorization code was issued from an
+	* (interactive) `/authorize` request that carried one — otherwise the
+	* interactive login would create a second session (the abandoned bearer
+	* session that authenticated `POST /authorize`, plus this one).
+	*
+	* The reuse is gated on the session still existing and belonging to the
+	* same subject/realm as the code (defense in depth — the id is
+	* server-derived from the authenticated bearer, never client input). Any
+	* mismatch, or a session-less authorize flow (external IdP, non-interactive
+	* clients), falls back to creating a fresh session — preserving prior
+	* behavior.
+	*/ async resolveSession(authorizationCode, options) {
+		if (authorizationCode.session_id) {
+			const existing = await this.sessionManager.findOneById(authorizationCode.session_id);
+			if (existing && existing.sub === authorizationCode.sub && existing.sub_kind === authorizationCode.sub_kind && existing.realm_id === authorizationCode.realm_id) {
+				existing.client_id = authorizationCode.client_id || null;
+				return this.sessionManager.refresh(existing);
+			}
+		}
+		return this.sessionManager.create({
+			user_agent: options.userAgent,
+			ip_address: options.ipAddress,
+			realm_id: authorizationCode.realm_id,
+			client_id: authorizationCode.client_id,
+			sub_kind: authorizationCode.sub_kind,
+			sub: authorizationCode.sub,
+			auth_method: authorizationCode.auth_method ?? null
+		});
+	}
 };
 //#endregion
 export { OAuth2AuthorizeGrant };

package/dist/core/oauth2/grant-types/authorize.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"authorize.mjs","names":["hasOAuth2Scopes","ScopeName","OAuth2BaseGrant","buildOAuth2BearerTokenResponse","OAuth2AuthorizeGrant","refreshTokenIssuer","ctx","accessTokenIssuer","sessionManager","runWith","authorizationCode","options","session","create","user_agent","userAgent","ip_address","ipAddress","realm_id","client_id","sub_kind","sub","issuePayload","remote_address","session_id","id","undefined","realm_name","scope","accessToken","accessTokenPayload","issue","refreshToken","refreshTokenPayload","buildContext","OPEN_ID","idToken","id_token"],"sources":["../../../../src/core/oauth2/grant-types/authorize.ts"],"sourcesContent":["/*\n * Copyright (c) 2022.\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 { OAuth2TokenGrantResponse, OAuth2TokenPayload } from '@authup/specs';\nimport { hasOAuth2Scopes } from '@authup/specs';\nimport type { OAuth2AuthorizationCode } from '@authup/core-kit';\nimport { ScopeName } from '@authup/core-kit';\nimport type { IOAuth2TokenIssuer } from '../token/index.ts';\nimport { OAuth2BaseGrant } from './base.ts';\nimport type { IOAuth2Grant, OAuth2AuthorizeGrantContext, OAuth2GrantRunWIthOptions } from './types.ts';\nimport type { OAuth2BearerResponseBuildContext } from '../response/index.ts';\nimport { buildOAuth2BearerTokenResponse } from '../response/index.ts';\n\nexport class OAuth2AuthorizeGrant extends OAuth2BaseGrant<OAuth2AuthorizationCode> implements IOAuth2Grant {\n    protected refreshTokenIssuer : IOAuth2TokenIssuer;\n\n    constructor(ctx: OAuth2AuthorizeGrantContext) {\n        super({\n            accessTokenIssuer: ctx.accessTokenIssuer,\n            sessionManager: ctx.sessionManager,\n        });\n\n        this.refreshTokenIssuer = ctx.refreshTokenIssuer;\n    }\n\n    async runWith(\n        authorizationCode: OAuth2AuthorizationCode,\n        options: OAuth2GrantRunWIthOptions = {},\n    ) : Promise<OAuth2TokenGrantResponse> {\n        const session = await this.sessionManager.create({\n            user_agent: options.userAgent,\n            ip_address: options.ipAddress,\n            realm_id: authorizationCode.realm_id,\n            client_id: authorizationCode.client_id,\n            sub_kind: authorizationCode.sub_kind,\n            sub: authorizationCode.sub,\n        });\n\n        const issuePayload : Partial<OAuth2TokenPayload> = {\n            user_agent: options.userAgent,\n            remote_address: options.ipAddress,\n            session_id: session.id,\n            sub: authorizationCode.sub || undefined,\n            sub_kind: authorizationCode.sub_kind,\n            realm_id: authorizationCode.realm_id,\n            realm_name: authorizationCode.realm_name,\n            scope: authorizationCode.scope || undefined,\n            client_id: authorizationCode.client_id || undefined,\n        };\n\n        const [accessToken, accessTokenPayload] = await this.accessTokenIssuer.issue(issuePayload);\n        const [refreshToken, refreshTokenPayload] = await this.refreshTokenIssuer.issue(issuePayload);\n\n        const buildContext : OAuth2BearerResponseBuildContext = {\n            accessToken,\n            accessTokenPayload,\n            refreshToken,\n            refreshTokenPayload,\n        };\n\n        if (\n            authorizationCode.scope &&\n            hasOAuth2Scopes(authorizationCode.scope, ScopeName.OPEN_ID)\n        ) {\n            buildContext.idToken = authorizationCode.id_token || undefined;\n        }\n\n        return buildOAuth2BearerTokenResponse(buildContext);\n    }\n}\n"],"mappings":";;;;;;;;AAiBA,IAAaI,uBAAb,cAA0CF,gBAAAA;CAC5BG;CAEV,YAAYC,KAAkC;EAC1C,MAAM;GACFC,mBAAmBD,IAAIC;GACvBC,gBAAgBF,IAAIE;EACxB,CAAA;EAEA,KAAKH,qBAAqBC,IAAID;CAClC;CAEA,MAAMI,QACFC,mBACAC,UAAqC,CAAC,GACJ;EAClC,MAAMC,UAAU,MAAM,KAAKJ,eAAeK,OAAO;GAC7CC,YAAYH,QAAQI;GACpBC,YAAYL,QAAQM;GACpBC,UAAUR,kBAAkBQ;GAC5BC,WAAWT,kBAAkBS;GAC7BC,UAAUV,kBAAkBU;GAC5BC,KAAKX,kBAAkBW;EAC3B,CAAA;EAEA,MAAMC,eAA6C;GAC/CR,YAAYH,QAAQI;GACpBQ,gBAAgBZ,QAAQM;GACxBO,YAAYZ,QAAQa;GACpBJ,KAAKX,kBAAkBW,OAAOK,KAAAA;GAC9BN,UAAUV,kBAAkBU;GAC5BF,UAAUR,kBAAkBQ;GAC5BS,YAAYjB,kBAAkBiB;GAC9BC,OAAOlB,kBAAkBkB,SAASF,KAAAA;GAClCP,WAAWT,kBAAkBS,aAAaO,KAAAA;EAC9C;EAEA,MAAM,CAACG,aAAaC,sBAAsB,MAAM,KAAKvB,kBAAkBwB,MAAMT,YAAAA;EAC7E,MAAM,CAACU,cAAcC,uBAAuB,MAAM,KAAK5B,mBAAmB0B,MAAMT,YAAAA;EAEhF,MAAMY,eAAkD;GACpDL;GACAC;GACAE;GACAC;EACJ;EAEA,IACIvB,kBAAkBkB,SAClB5B,gBAAgBU,kBAAkBkB,OAAO3B,UAAUkC,OAAO,GAE1DD,aAAaE,UAAU1B,kBAAkB2B,YAAYX,KAAAA;EAGzD,OAAOvB,+BAA+B+B,YAAAA;CAC1C;AACJ"}
+{"version":3,"file":"authorize.mjs","names":["JWKUse","hasOAuth2Scopes","ScopeName","buildOAuth2TokenHash","deriveAmrAcr","OAuth2BaseGrant","buildOAuth2BearerTokenResponse","OAuth2AuthorizeGrant","refreshTokenIssuer","openIdTokenIssuer","keyStore","ctx","accessTokenIssuer","sessionManager","runWith","authorizationCode","options","session","resolveSession","amrAcr","issuePayload","user_agent","userAgent","remote_address","ipAddress","session_id","id","sub","undefined","sub_kind","realm_id","realm_name","scope","client_id","confirmation","cnf","accessToken","accessTokenPayload","issue","refreshToken","refreshTokenPayload","buildContext","OPEN_ID","key","resolveOrCreate","SIGNATURE","idToken","nonce","auth_time","sid","at_hash","signature_algorithm","existing","findOneById","refresh","create","ip_address","auth_method"],"sources":["../../../../src/core/oauth2/grant-types/authorize.ts"],"sourcesContent":["/*\n * Copyright (c) 2022.\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 { OAuth2TokenGrantResponse, OAuth2TokenPayload } from '@authup/specs';\nimport { JWKUse, hasOAuth2Scopes } from '@authup/specs';\nimport type { OAuth2AuthorizationCode, Session } from '@authup/core-kit';\nimport { ScopeName } from '@authup/core-kit';\nimport { buildOAuth2TokenHash, deriveAmrAcr } from '../authorization/helpers.ts';\nimport type { IKeyStore } from '../../key/index.ts';\nimport type { IOAuth2OpenIDTokenIssuer, IOAuth2TokenIssuer } from '../token/index.ts';\nimport { OAuth2BaseGrant } from './base.ts';\nimport type { IOAuth2Grant, OAuth2AuthorizeGrantContext, OAuth2GrantRunWIthOptions } from './types.ts';\nimport type { OAuth2BearerResponseBuildContext } from '../response/index.ts';\nimport { buildOAuth2BearerTokenResponse } from '../response/index.ts';\n\nexport class OAuth2AuthorizeGrant extends OAuth2BaseGrant<OAuth2AuthorizationCode> implements IOAuth2Grant {\n    protected refreshTokenIssuer : IOAuth2TokenIssuer;\n\n    protected openIdTokenIssuer : IOAuth2OpenIDTokenIssuer;\n\n    protected keyStore : IKeyStore;\n\n    constructor(ctx: OAuth2AuthorizeGrantContext) {\n        super({\n            accessTokenIssuer: ctx.accessTokenIssuer,\n            sessionManager: ctx.sessionManager,\n        });\n\n        this.refreshTokenIssuer = ctx.refreshTokenIssuer;\n        this.openIdTokenIssuer = ctx.openIdTokenIssuer;\n        this.keyStore = ctx.keyStore;\n    }\n\n    async runWith(\n        authorizationCode: OAuth2AuthorizationCode,\n        options: OAuth2GrantRunWIthOptions = {},\n    ) : Promise<OAuth2TokenGrantResponse> {\n        const session = await this.resolveSession(authorizationCode, options);\n\n        // amr/acr derive from the RESOLVED session (auth_method + mfa_at) —\n        // deliberately on every token kind, not only the id_token, so\n        // resource servers can read the method without parsing an id_token.\n        const amrAcr = deriveAmrAcr(session);\n\n        const issuePayload : Partial<OAuth2TokenPayload> = {\n            user_agent: options.userAgent,\n            remote_address: options.ipAddress,\n            session_id: session.id,\n            sub: authorizationCode.sub || undefined,\n            sub_kind: authorizationCode.sub_kind,\n            realm_id: authorizationCode.realm_id,\n            realm_name: authorizationCode.realm_name,\n            scope: authorizationCode.scope || undefined,\n            client_id: authorizationCode.client_id || undefined,\n            ...(options.confirmation ? { cnf: options.confirmation } : {}),\n            ...amrAcr,\n        };\n\n        const [accessToken, accessTokenPayload] = await this.accessTokenIssuer.issue(issuePayload);\n        const [refreshToken, refreshTokenPayload] = await this.refreshTokenIssuer.issue(issuePayload);\n\n        const buildContext : OAuth2BearerResponseBuildContext = {\n            accessToken,\n            accessTokenPayload,\n            refreshToken,\n            refreshTokenPayload,\n        };\n\n        // The id_token is minted HERE — after resolveSession — so its `sid`\n        // references the real backing session for the reuse branch, the\n        // fallback branch, and session-less (federated IdP) codes alike.\n        // `auth_time` is the authentication instant captured on the code.\n        if (\n            authorizationCode.scope &&\n            hasOAuth2Scopes(authorizationCode.scope, ScopeName.OPEN_ID)\n        ) {\n            // The at_hash digest follows the id_token's JWS alg (OIDC Core\n            // §3.1.3.6) — the alg of the realm key the openid issuer signs\n            // with. The access token above was signed with the same key, so a\n            // missing key would already have thrown; this resolves the same\n            // active key.\n            const key = await this.keyStore.resolveOrCreate(authorizationCode.realm_id, JWKUse.SIGNATURE);\n\n            const [idToken] = await this.openIdTokenIssuer.issue({\n                sub: authorizationCode.sub || undefined,\n                sub_kind: authorizationCode.sub_kind,\n                realm_id: authorizationCode.realm_id,\n                realm_name: authorizationCode.realm_name,\n                scope: authorizationCode.scope || undefined,\n                client_id: authorizationCode.client_id || undefined,\n                ...(authorizationCode.nonce ? { nonce: authorizationCode.nonce } : {}),\n                ...(typeof authorizationCode.auth_time === 'number' ? { auth_time: authorizationCode.auth_time } : {}),\n                ...amrAcr,\n                sid: session.id,\n                at_hash: await buildOAuth2TokenHash(accessToken, key.signature_algorithm),\n            });\n\n            buildContext.idToken = idToken;\n        }\n\n        return buildOAuth2BearerTokenResponse(buildContext);\n    }\n\n    /**\n     * Reuse the bearer's session when the authorization code was issued from an\n     * (interactive) `/authorize` request that carried one — otherwise the\n     * interactive login would create a second session (the abandoned bearer\n     * session that authenticated `POST /authorize`, plus this one).\n     *\n     * The reuse is gated on the session still existing and belonging to the\n     * same subject/realm as the code (defense in depth — the id is\n     * server-derived from the authenticated bearer, never client input). Any\n     * mismatch, or a session-less authorize flow (external IdP, non-interactive\n     * clients), falls back to creating a fresh session — preserving prior\n     * behavior.\n     */\n    protected async resolveSession(\n        authorizationCode: OAuth2AuthorizationCode,\n        options: OAuth2GrantRunWIthOptions,\n    ) : Promise<Session> {\n        if (authorizationCode.session_id) {\n            const existing = await this.sessionManager.findOneById(authorizationCode.session_id);\n            if (\n                existing &&\n                existing.sub === authorizationCode.sub &&\n                existing.sub_kind === authorizationCode.sub_kind &&\n                existing.realm_id === authorizationCode.realm_id\n            ) {\n                existing.client_id = authorizationCode.client_id || null;\n\n                return this.sessionManager.refresh(existing);\n            }\n        }\n\n        return this.sessionManager.create({\n            user_agent: options.userAgent,\n            ip_address: options.ipAddress,\n            realm_id: authorizationCode.realm_id,\n            client_id: authorizationCode.client_id,\n            sub_kind: authorizationCode.sub_kind,\n            sub: authorizationCode.sub,\n            auth_method: authorizationCode.auth_method ?? null,\n        });\n    }\n}\n"],"mappings":";;;;;;;;;AAmBA,IAAaO,uBAAb,cAA0CF,gBAAAA;CAC5BG;CAEAC;CAEAC;CAEV,YAAYC,KAAkC;EAC1C,MAAM;GACFC,mBAAmBD,IAAIC;GACvBC,gBAAgBF,IAAIE;EACxB,CAAA;EAEA,KAAKL,qBAAqBG,IAAIH;EAC9B,KAAKC,oBAAoBE,IAAIF;EAC7B,KAAKC,WAAWC,IAAID;CACxB;CAEA,MAAMI,QACFC,mBACAC,UAAqC,CAAC,GACJ;EAClC,MAAMC,UAAU,MAAM,KAAKC,eAAeH,mBAAmBC,OAAAA;EAK7D,MAAMG,SAASf,aAAaa,OAAAA;EAE5B,MAAMG,eAA6C;GAC/CC,YAAYL,QAAQM;GACpBC,gBAAgBP,QAAQQ;GACxBC,YAAYR,QAAQS;GACpBC,KAAKZ,kBAAkBY,OAAOC,KAAAA;GAC9BC,UAAUd,kBAAkBc;GAC5BC,UAAUf,kBAAkBe;GAC5BC,YAAYhB,kBAAkBgB;GAC9BC,OAAOjB,kBAAkBiB,SAASJ,KAAAA;GAClCK,WAAWlB,kBAAkBkB,aAAaL,KAAAA;GAC1C,GAAIZ,QAAQkB,eAAe,EAAEC,KAAKnB,QAAQkB,aAAa,IAAI,CAAC;GAC5D,GAAGf;EACP;EAEA,MAAM,CAACiB,aAAaC,sBAAsB,MAAM,KAAKzB,kBAAkB0B,MAAMlB,YAAAA;EAC7E,MAAM,CAACmB,cAAcC,uBAAuB,MAAM,KAAKhC,mBAAmB8B,MAAMlB,YAAAA;EAEhF,MAAMqB,eAAkD;GACpDL;GACAC;GACAE;GACAC;EACJ;EAMA,IACIzB,kBAAkBiB,SAClB/B,gBAAgBc,kBAAkBiB,OAAO9B,UAAUwC,OAAO,GAC5D;GAME,MAAMC,MAAM,MAAM,KAAKjC,SAASkC,gBAAgB7B,kBAAkBe,UAAU9B,OAAO6C,SAAS;GAE5F,MAAM,CAACC,WAAW,MAAM,KAAKrC,kBAAkB6B,MAAM;IACjDX,KAAKZ,kBAAkBY,OAAOC,KAAAA;IAC9BC,UAAUd,kBAAkBc;IAC5BC,UAAUf,kBAAkBe;IAC5BC,YAAYhB,kBAAkBgB;IAC9BC,OAAOjB,kBAAkBiB,SAASJ,KAAAA;IAClCK,WAAWlB,kBAAkBkB,aAAaL,KAAAA;IAC1C,GAAIb,kBAAkBgC,QAAQ,EAAEA,OAAOhC,kBAAkBgC,MAAM,IAAI,CAAC;IACpE,GAAI,OAAOhC,kBAAkBiC,cAAc,WAAW,EAAEA,WAAWjC,kBAAkBiC,UAAU,IAAI,CAAC;IACpG,GAAG7B;IACH8B,KAAKhC,QAAQS;IACbwB,SAAS,MAAM/C,qBAAqBiC,aAAaO,IAAIQ,mBAAmB;GAC5E,CAAA;GAEAV,aAAaK,UAAUA;EAC3B;EAEA,OAAOxC,+BAA+BmC,YAAAA;CAC1C;;;;;;;;;;;;;IAeA,MAAgBvB,eACZH,mBACAC,SACiB;EACjB,IAAID,kBAAkBU,YAAY;GAC9B,MAAM2B,WAAW,MAAM,KAAKvC,eAAewC,YAAYtC,kBAAkBU,UAAU;GACnF,IACI2B,YACAA,SAASzB,QAAQZ,kBAAkBY,OACnCyB,SAASvB,aAAad,kBAAkBc,YACxCuB,SAAStB,aAAaf,kBAAkBe,UAC1C;IACEsB,SAASnB,YAAYlB,kBAAkBkB,aAAa;IAEpD,OAAO,KAAKpB,eAAeyC,QAAQF,QAAAA;GACvC;EACJ;EAEA,OAAO,KAAKvC,eAAe0C,OAAO;GAC9BlC,YAAYL,QAAQM;GACpBkC,YAAYxC,QAAQQ;GACpBM,UAAUf,kBAAkBe;GAC5BG,WAAWlB,kBAAkBkB;GAC7BJ,UAAUd,kBAAkBc;GAC5BF,KAAKZ,kBAAkBY;GACvB8B,aAAa1C,kBAAkB0C,eAAe;EAClD,CAAA;CACJ;AACJ"}

package/dist/core/oauth2/grant-types/client-credentials.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client-credentials.d.ts","sourceRoot":"","sources":["../../../../src/core/oauth2/grant-types/client-credentials.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AAE9D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAK/C,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAE5C,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAC;AAE5D,qBAAa,sBAAuB,SAAQ,eAAe,CAAC,MAAM,CAAC;IACzD,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,GAAE,yBAA8B,GAAI,OAAO,CAAC,wBAAwB,CAAC;CA0B5G"}
+{"version":3,"file":"client-credentials.d.ts","sourceRoot":"","sources":["../../../../src/core/oauth2/grant-types/client-credentials.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AAE9D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAM/C,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAE5C,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAC;AAE5D,qBAAa,sBAAuB,SAAQ,eAAe,CAAC,MAAM,CAAC;IACzD,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,GAAE,yBAA8B,GAAI,OAAO,CAAC,wBAAwB,CAAC;CA4B5G"}

package/dist/core/oauth2/grant-types/client-credentials.mjs

@@ -3,7 +3,7 @@ import "node:url";
 import.meta.url;
 import { OAuth2BaseGrant } from "./base.mjs";
 import { buildOAuth2BearerTokenResponse } from "../response/bearer.mjs";
-import { IdentityType, ScopeName } from "@authup/core-kit";
+import { IdentityType, ScopeName, SessionAuthMethod } from "@authup/core-kit";
 import { OAuth2SubKind } from "@authup/specs";
 //#region src/core/oauth2/grant-types/client-credentials.ts
 var ClientCredentialsGrant = class extends OAuth2BaseGrant {
@@ -13,7 +13,8 @@ var ClientCredentialsGrant = class extends OAuth2BaseGrant {
 			ip_address: options.ipAddress,
 			realm_id: input.realm_id,
 			sub: input.id,
-			sub_kind: IdentityType.CLIENT
+			sub_kind: IdentityType.CLIENT,
+			auth_method: SessionAuthMethod.CLIENT
 		});
 		const [accessToken, accessTokenPayload] = await this.accessTokenIssuer.issue({
 			user_agent: session.user_agent,
@@ -24,7 +25,8 @@ var ClientCredentialsGrant = class extends OAuth2BaseGrant {
 			sub_kind: OAuth2SubKind.CLIENT,
 			realm_id: input.realm.id,
 			realm_name: input.realm.name,
-			client_id: input.id
+			client_id: input.id,
+			...options.confirmation ? { cnf: options.confirmation } : {}
 		});
 		return buildOAuth2BearerTokenResponse({
 			accessToken,

package/dist/core/oauth2/grant-types/client-credentials.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"client-credentials.mjs","names":["OAuth2SubKind","IdentityType","ScopeName","OAuth2BaseGrant","buildOAuth2BearerTokenResponse","ClientCredentialsGrant","runWith","input","options","session","sessionManager","create","user_agent","userAgent","ip_address","ipAddress","realm_id","sub","id","sub_kind","CLIENT","accessToken","accessTokenPayload","accessTokenIssuer","issue","remote_address","session_id","scope","GLOBAL","realm","realm_name","name","client_id"],"sources":["../../../../src/core/oauth2/grant-types/client-credentials.ts"],"sourcesContent":["/*\n * Copyright (c) 2022.\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 { OAuth2TokenGrantResponse } from '@authup/specs';\nimport { OAuth2SubKind } from '@authup/specs';\nimport type { Client } from '@authup/core-kit';\nimport {\n    IdentityType,\n    ScopeName,\n} from '@authup/core-kit';\nimport { OAuth2BaseGrant } from './base.ts';\nimport { buildOAuth2BearerTokenResponse } from '../response/index.ts';\nimport type { OAuth2GrantRunWIthOptions } from './types.ts';\n\nexport class ClientCredentialsGrant extends OAuth2BaseGrant<Client> {\n    async runWith(input: Client, options: OAuth2GrantRunWIthOptions = {}) : Promise<OAuth2TokenGrantResponse> {\n        const session = await this.sessionManager.create({\n            user_agent: options.userAgent,\n            ip_address: options.ipAddress,\n            realm_id: input.realm_id,\n            sub: input.id,\n            sub_kind: IdentityType.CLIENT,\n        });\n\n        const [accessToken, accessTokenPayload] = await this.accessTokenIssuer.issue({\n            user_agent: session.user_agent,\n            remote_address: session.ip_address,\n            session_id: session.id,\n            scope: ScopeName.GLOBAL,\n            sub: input.id,\n            sub_kind: OAuth2SubKind.CLIENT,\n            realm_id: input.realm.id,\n            realm_name: input.realm.name,\n            client_id: input.id,\n        });\n\n        return buildOAuth2BearerTokenResponse({\n            accessToken,\n            accessTokenPayload,\n        });\n    }\n}\n"],"mappings":";;;;;;;;AAkBA,IAAaK,yBAAb,cAA4CF,gBAAAA;CACxC,MAAMG,QAAQC,OAAeC,UAAqC,CAAC,GAAuC;EACtG,MAAMC,UAAU,MAAM,KAAKC,eAAeC,OAAO;GAC7CC,YAAYJ,QAAQK;GACpBC,YAAYN,QAAQO;GACpBC,UAAUT,MAAMS;GAChBC,KAAKV,MAAMW;GACXC,UAAUlB,aAAamB;EAC3B,CAAA;EAEA,MAAM,CAACC,aAAaC,sBAAsB,MAAM,KAAKC,kBAAkBC,MAAM;GACzEZ,YAAYH,QAAQG;GACpBa,gBAAgBhB,QAAQK;GACxBY,YAAYjB,QAAQS;GACpBS,OAAOzB,UAAU0B;GACjBX,KAAKV,MAAMW;GACXC,UAAUnB,cAAcoB;GACxBJ,UAAUT,MAAMsB,MAAMX;GACtBY,YAAYvB,MAAMsB,MAAME;GACxBC,WAAWzB,MAAMW;EACrB,CAAA;EAEA,OAAOd,+BAA+B;GAClCiB;GACAC;EACJ,CAAA;CACJ;AACJ"}
+{"version":3,"file":"client-credentials.mjs","names":["OAuth2SubKind","IdentityType","ScopeName","SessionAuthMethod","OAuth2BaseGrant","buildOAuth2BearerTokenResponse","ClientCredentialsGrant","runWith","input","options","session","sessionManager","create","user_agent","userAgent","ip_address","ipAddress","realm_id","sub","id","sub_kind","CLIENT","auth_method","accessToken","accessTokenPayload","accessTokenIssuer","issue","remote_address","session_id","scope","GLOBAL","realm","realm_name","name","client_id","confirmation","cnf"],"sources":["../../../../src/core/oauth2/grant-types/client-credentials.ts"],"sourcesContent":["/*\n * Copyright (c) 2022.\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 { OAuth2TokenGrantResponse } from '@authup/specs';\nimport { OAuth2SubKind } from '@authup/specs';\nimport type { Client } from '@authup/core-kit';\nimport {\n    IdentityType,\n    ScopeName, \n    SessionAuthMethod,\n} from '@authup/core-kit';\nimport { OAuth2BaseGrant } from './base.ts';\nimport { buildOAuth2BearerTokenResponse } from '../response/index.ts';\nimport type { OAuth2GrantRunWIthOptions } from './types.ts';\n\nexport class ClientCredentialsGrant extends OAuth2BaseGrant<Client> {\n    async runWith(input: Client, options: OAuth2GrantRunWIthOptions = {}) : Promise<OAuth2TokenGrantResponse> {\n        const session = await this.sessionManager.create({\n            user_agent: options.userAgent,\n            ip_address: options.ipAddress,\n            realm_id: input.realm_id,\n            sub: input.id,\n            sub_kind: IdentityType.CLIENT,\n            auth_method: SessionAuthMethod.CLIENT,\n        });\n\n        const [accessToken, accessTokenPayload] = await this.accessTokenIssuer.issue({\n            user_agent: session.user_agent,\n            remote_address: session.ip_address,\n            session_id: session.id,\n            scope: ScopeName.GLOBAL,\n            sub: input.id,\n            sub_kind: OAuth2SubKind.CLIENT,\n            realm_id: input.realm.id,\n            realm_name: input.realm.name,\n            client_id: input.id,\n            ...(options.confirmation ? { cnf: options.confirmation } : {}),\n        });\n\n        return buildOAuth2BearerTokenResponse({\n            accessToken,\n            accessTokenPayload,\n        });\n    }\n}\n"],"mappings":";;;;;;;;AAmBA,IAAaM,yBAAb,cAA4CF,gBAAAA;CACxC,MAAMG,QAAQC,OAAeC,UAAqC,CAAC,GAAuC;EACtG,MAAMC,UAAU,MAAM,KAAKC,eAAeC,OAAO;GAC7CC,YAAYJ,QAAQK;GACpBC,YAAYN,QAAQO;GACpBC,UAAUT,MAAMS;GAChBC,KAAKV,MAAMW;GACXC,UAAUnB,aAAaoB;GACvBC,aAAanB,kBAAkBkB;EACnC,CAAA;EAEA,MAAM,CAACE,aAAaC,sBAAsB,MAAM,KAAKC,kBAAkBC,MAAM;GACzEb,YAAYH,QAAQG;GACpBc,gBAAgBjB,QAAQK;GACxBa,YAAYlB,QAAQS;GACpBU,OAAO3B,UAAU4B;GACjBZ,KAAKV,MAAMW;GACXC,UAAUpB,cAAcqB;GACxBJ,UAAUT,MAAMuB,MAAMZ;GACtBa,YAAYxB,MAAMuB,MAAME;GACxBC,WAAW1B,MAAMW;GACjB,GAAIV,QAAQ0B,eAAe,EAAEC,KAAK3B,QAAQ0B,aAAa,IAAI,CAAC;EAChE,CAAA;EAEA,OAAO9B,+BAA+B;GAClCkB;GACAC;EACJ,CAAA;CACJ;AACJ"}

package/dist/core/oauth2/grant-types/identity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"identity.d.ts","sourceRoot":"","sources":["../../../../src/core/oauth2/grant-types/identity.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,wBAAwB,EAAsB,MAAM,eAAe,CAAC;AAClF,OAAO,KAAK,EAAE,QAAQ,EAAW,MAAM,kBAAkB,CAAC;AAE1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAE5C,OAAO,KAAK,EAAE,yBAAyB,EAAE,0BAA0B,EAAE,MAAM,YAAY,CAAC;AAExF,qBAAa,iBAAkB,SAAQ,eAAe,CAAC,QAAQ,CAAC;IAC5D,SAAS,CAAC,kBAAkB,EAAG,kBAAkB,CAAC;gBAEtC,GAAG,EAAE,0BAA0B;IASrC,OAAO,CACT,QAAQ,EAAE,QAAQ,EAClB,OAAO,GAAE,yBAA8B,GACxC,OAAO,CAAC,wBAAwB,CAAC;CAgCvC"}
+{"version":3,"file":"identity.d.ts","sourceRoot":"","sources":["../../../../src/core/oauth2/grant-types/identity.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,wBAAwB,EAAsB,MAAM,eAAe,CAAC;AAClF,OAAO,KAAK,EAAE,QAAQ,EAAW,MAAM,kBAAkB,CAAC;AAE1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAG5C,OAAO,KAAK,EAAE,yBAAyB,EAAE,0BAA0B,EAAE,MAAM,YAAY,CAAC;AAExF,qBAAa,iBAAkB,SAAQ,eAAe,CAAC,QAAQ,CAAC;IAC5D,SAAS,CAAC,kBAAkB,EAAG,kBAAkB,CAAC;gBAEtC,GAAG,EAAE,0BAA0B;IASrC,OAAO,CACT,QAAQ,EAAE,QAAQ,EAClB,OAAO,GAAE,yBAA8B,GACxC,OAAO,CAAC,wBAAwB,CAAC;CA0CvC"}

package/dist/core/oauth2/grant-types/identity.mjs

@@ -1,9 +1,10 @@
 import "node:path";
 import "node:url";
 import.meta.url;
+import { deriveAmrAcr } from "../authorization/helpers.mjs";
 import { OAuth2BaseGrant } from "./base.mjs";
 import { buildOAuth2BearerTokenResponse } from "../response/bearer.mjs";
-import { ScopeName } from "@authup/core-kit";
+import { ScopeName, SessionAuthMethod } from "@authup/core-kit";
 //#region src/core/oauth2/grant-types/identity.ts
 var IdentityGrantType = class extends OAuth2BaseGrant {
 	refreshTokenIssuer;
@@ -20,9 +21,14 @@ var IdentityGrantType = class extends OAuth2BaseGrant {
 			ip_address: options.ipAddress,
 			realm_id: identity.data.realm_id,
 			sub: identity.data.id,
-			sub_kind: identity.type
+			sub_kind: identity.type,
+			auth_method: SessionAuthMethod.EXTERNAL
 		};
 		const { id: sessionId } = await this.sessionManager.create(session);
+		const amrAcr = deriveAmrAcr({
+			auth_method: session.auth_method ?? null,
+			mfa_at: session.mfa_at ?? null
+		});
 		const issuePayload = {
 			session_id: sessionId,
 			user_agent: session.user_agent,
@@ -31,7 +37,8 @@ var IdentityGrantType = class extends OAuth2BaseGrant {
 			realm_id: identity.data.realm_id,
 			realm_name: identity.data.realm?.name,
 			sub: identity.data.id,
-			sub_kind: identity.type
+			sub_kind: identity.type,
+			...amrAcr
 		};
 		const [accessToken, accessTokenPayload] = await this.accessTokenIssuer.issue(issuePayload);
 		const [refreshToken, refreshTokenPayload] = await this.refreshTokenIssuer.issue(issuePayload);

package/dist/core/oauth2/grant-types/identity.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"identity.mjs","names":["ScopeName","OAuth2BaseGrant","buildOAuth2BearerTokenResponse","IdentityGrantType","refreshTokenIssuer","ctx","accessTokenIssuer","sessionManager","runWith","identity","options","session","user_agent","userAgent","ip_address","ipAddress","realm_id","data","sub","id","sub_kind","type","sessionId","create","issuePayload","session_id","remote_address","scope","GLOBAL","realm_name","realm","name","accessToken","accessTokenPayload","issue","refreshToken","refreshTokenPayload"],"sources":["../../../../src/core/oauth2/grant-types/identity.ts"],"sourcesContent":["/*\n * Copyright (c) 2022.\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 { OAuth2TokenGrantResponse, OAuth2TokenPayload } from '@authup/specs';\nimport type { Identity, Session } from '@authup/core-kit';\nimport { ScopeName } from '@authup/core-kit';\nimport type { IOAuth2TokenIssuer } from '../token/index.ts';\nimport { OAuth2BaseGrant } from './base.ts';\nimport { buildOAuth2BearerTokenResponse } from '../response/index.ts';\nimport type { OAuth2GrantRunWIthOptions, OAuth2IdentityGrantContext } from './types.ts';\n\nexport class IdentityGrantType extends OAuth2BaseGrant<Identity> {\n    protected refreshTokenIssuer : IOAuth2TokenIssuer;\n\n    constructor(ctx: OAuth2IdentityGrantContext) {\n        super({\n            accessTokenIssuer: ctx.accessTokenIssuer,\n            sessionManager: ctx.sessionManager,\n        });\n\n        this.refreshTokenIssuer = ctx.refreshTokenIssuer;\n    }\n\n    async runWith(\n        identity: Identity,\n        options: OAuth2GrantRunWIthOptions = {},\n    ): Promise<OAuth2TokenGrantResponse> {\n        const session : Partial<Session> = {\n            user_agent: options.userAgent,\n            ip_address: options.ipAddress,\n            realm_id: identity.data.realm_id,\n            sub: identity.data.id,\n            sub_kind: identity.type,\n        };\n\n        const { id: sessionId } = await this.sessionManager.create(session);\n\n        const issuePayload : Partial<OAuth2TokenPayload> = {\n            session_id: sessionId,\n            user_agent: session.user_agent,\n            remote_address: session.ip_address,\n            scope: ScopeName.GLOBAL,\n            realm_id: identity.data.realm_id,\n            realm_name: identity.data.realm?.name,\n            sub: identity.data.id,\n            sub_kind: identity.type,\n        };\n\n        const [accessToken, accessTokenPayload] = await this.accessTokenIssuer.issue(issuePayload);\n        const [refreshToken, refreshTokenPayload] = await this.refreshTokenIssuer.issue(issuePayload);\n\n        return buildOAuth2BearerTokenResponse({\n            accessToken,\n            accessTokenPayload,\n            refreshToken,\n            refreshTokenPayload,\n        });\n    }\n}\n"],"mappings":";;;;;;;AAeA,IAAaG,oBAAb,cAAuCF,gBAAAA;CACzBG;CAEV,YAAYC,KAAiC;EACzC,MAAM;GACFC,mBAAmBD,IAAIC;GACvBC,gBAAgBF,IAAIE;EACxB,CAAA;EAEA,KAAKH,qBAAqBC,IAAID;CAClC;CAEA,MAAMI,QACFC,UACAC,UAAqC,CAAC,GACL;EACjC,MAAMC,UAA6B;GAC/BC,YAAYF,QAAQG;GACpBC,YAAYJ,QAAQK;GACpBC,UAAUP,SAASQ,KAAKD;GACxBE,KAAKT,SAASQ,KAAKE;GACnBC,UAAUX,SAASY;EACvB;EAEA,MAAM,EAAEF,IAAIG,cAAc,MAAM,KAAKf,eAAegB,OAAOZ,OAAAA;EAE3D,MAAMa,eAA6C;GAC/CC,YAAYH;GACZV,YAAYD,QAAQC;GACpBc,gBAAgBf,QAAQG;GACxBa,OAAO3B,UAAU4B;GACjBZ,UAAUP,SAASQ,KAAKD;GACxBa,YAAYpB,SAASQ,KAAKa,OAAOC;GACjCb,KAAKT,SAASQ,KAAKE;GACnBC,UAAUX,SAASY;EACvB;EAEA,MAAM,CAACW,aAAaC,sBAAsB,MAAM,KAAK3B,kBAAkB4B,MAAMV,YAAAA;EAC7E,MAAM,CAACW,cAAcC,uBAAuB,MAAM,KAAKhC,mBAAmB8B,MAAMV,YAAAA;EAEhF,OAAOtB,+BAA+B;GAClC8B;GACAC;GACAE;GACAC;EACJ,CAAA;CACJ;AACJ"}
+{"version":3,"file":"identity.mjs","names":["ScopeName","SessionAuthMethod","OAuth2BaseGrant","deriveAmrAcr","buildOAuth2BearerTokenResponse","IdentityGrantType","refreshTokenIssuer","ctx","accessTokenIssuer","sessionManager","runWith","identity","options","session","user_agent","userAgent","ip_address","ipAddress","realm_id","data","sub","id","sub_kind","type","auth_method","EXTERNAL","sessionId","create","amrAcr","mfa_at","issuePayload","session_id","remote_address","scope","GLOBAL","realm_name","realm","name","accessToken","accessTokenPayload","issue","refreshToken","refreshTokenPayload"],"sources":["../../../../src/core/oauth2/grant-types/identity.ts"],"sourcesContent":["/*\n * Copyright (c) 2022.\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 { OAuth2TokenGrantResponse, OAuth2TokenPayload } from '@authup/specs';\nimport type { Identity, Session } from '@authup/core-kit';\nimport { ScopeName, SessionAuthMethod } from '@authup/core-kit';\nimport type { IOAuth2TokenIssuer } from '../token/index.ts';\nimport { OAuth2BaseGrant } from './base.ts';\nimport { deriveAmrAcr } from '../authorization/helpers.ts';\nimport { buildOAuth2BearerTokenResponse } from '../response/index.ts';\nimport type { OAuth2GrantRunWIthOptions, OAuth2IdentityGrantContext } from './types.ts';\n\nexport class IdentityGrantType extends OAuth2BaseGrant<Identity> {\n    protected refreshTokenIssuer : IOAuth2TokenIssuer;\n\n    constructor(ctx: OAuth2IdentityGrantContext) {\n        super({\n            accessTokenIssuer: ctx.accessTokenIssuer,\n            sessionManager: ctx.sessionManager,\n        });\n\n        this.refreshTokenIssuer = ctx.refreshTokenIssuer;\n    }\n\n    async runWith(\n        identity: Identity,\n        options: OAuth2GrantRunWIthOptions = {},\n    ): Promise<OAuth2TokenGrantResponse> {\n        const session : Partial<Session> = {\n            user_agent: options.userAgent,\n            ip_address: options.ipAddress,\n            realm_id: identity.data.realm_id,\n            sub: identity.data.id,\n            sub_kind: identity.type,\n            auth_method: SessionAuthMethod.EXTERNAL,\n        };\n\n        const { id: sessionId } = await this.sessionManager.create(session);\n\n        // amr/acr derive from the session's auth_method + mfa_at — deliberately\n        // on every token kind, so a direct identity grant's tokens advertise the\n        // (external) method the same way the authorization_code exchange does.\n        const amrAcr = deriveAmrAcr({\n            auth_method: session.auth_method ?? null,\n            mfa_at: session.mfa_at ?? null,\n        });\n\n        const issuePayload : Partial<OAuth2TokenPayload> = {\n            session_id: sessionId,\n            user_agent: session.user_agent,\n            remote_address: session.ip_address,\n            scope: ScopeName.GLOBAL,\n            realm_id: identity.data.realm_id,\n            realm_name: identity.data.realm?.name,\n            sub: identity.data.id,\n            sub_kind: identity.type,\n            ...amrAcr,\n        };\n\n        const [accessToken, accessTokenPayload] = await this.accessTokenIssuer.issue(issuePayload);\n        const [refreshToken, refreshTokenPayload] = await this.refreshTokenIssuer.issue(issuePayload);\n\n        return buildOAuth2BearerTokenResponse({\n            accessToken,\n            accessTokenPayload,\n            refreshToken,\n            refreshTokenPayload,\n        });\n    }\n}\n"],"mappings":";;;;;;;;AAgBA,IAAaK,oBAAb,cAAuCH,gBAAAA;CACzBI;CAEV,YAAYC,KAAiC;EACzC,MAAM;GACFC,mBAAmBD,IAAIC;GACvBC,gBAAgBF,IAAIE;EACxB,CAAA;EAEA,KAAKH,qBAAqBC,IAAID;CAClC;CAEA,MAAMI,QACFC,UACAC,UAAqC,CAAC,GACL;EACjC,MAAMC,UAA6B;GAC/BC,YAAYF,QAAQG;GACpBC,YAAYJ,QAAQK;GACpBC,UAAUP,SAASQ,KAAKD;GACxBE,KAAKT,SAASQ,KAAKE;GACnBC,UAAUX,SAASY;GACnBC,aAAavB,kBAAkBwB;EACnC;EAEA,MAAM,EAAEJ,IAAIK,cAAc,MAAM,KAAKjB,eAAekB,OAAOd,OAAAA;EAK3D,MAAMe,SAASzB,aAAa;GACxBqB,aAAaX,QAAQW,eAAe;GACpCK,QAAQhB,QAAQgB,UAAU;EAC9B,CAAA;EAEA,MAAMC,eAA6C;GAC/CC,YAAYL;GACZZ,YAAYD,QAAQC;GACpBkB,gBAAgBnB,QAAQG;GACxBiB,OAAOjC,UAAUkC;GACjBhB,UAAUP,SAASQ,KAAKD;GACxBiB,YAAYxB,SAASQ,KAAKiB,OAAOC;GACjCjB,KAAKT,SAASQ,KAAKE;GACnBC,UAAUX,SAASY;GACnB,GAAGK;EACP;EAEA,MAAM,CAACU,aAAaC,sBAAsB,MAAM,KAAK/B,kBAAkBgC,MAAMV,YAAAA;EAC7E,MAAM,CAACW,cAAcC,uBAAuB,MAAM,KAAKpC,mBAAmBkC,MAAMV,YAAAA;EAEhF,OAAO1B,+BAA+B;GAClCkC;GACAC;GACAE;GACAC;EACJ,CAAA;CACJ;AACJ"}

package/dist/core/oauth2/grant-types/password.d.ts

@@ -1,14 +1,23 @@
 import type { OAuth2TokenGrantResponse } from '@authup/specs';
 import type { Client, User } from '@authup/core-kit';
+import type { IEventService } from '../../entities/index.ts';
+import type { IAuthFlowMetrics } from '../../metrics/index.ts';
 import type { IOAuth2TokenIssuer } from '../token/index.ts';
 import { OAuth2BaseGrant } from './base.ts';
 import type { OAuth2GrantRunWIthOptions, OAuth2PasswordGrantContext } from './types.ts';
 export type OAuth2PasswordGrantInput = {
     user: User;
     client?: Client;
+    /**
+     * Instant the user passed a second-factor challenge alongside the
+     * grant (the `otp` parameter) — stamped onto the session as mfa_at.
+     */
+    mfaVerifiedAt?: string;
 };
 export declare class PasswordGrantType extends OAuth2BaseGrant<OAuth2PasswordGrantInput> {
     protected refreshTokenIssuer: IOAuth2TokenIssuer;
+    protected eventService?: IEventService;
+    protected metrics?: IAuthFlowMetrics;
     constructor(ctx: OAuth2PasswordGrantContext);
     runWith(input: OAuth2PasswordGrantInput, options?: OAuth2GrantRunWIthOptions): Promise<OAuth2TokenGrantResponse>;
 }

package/dist/core/oauth2/grant-types/password.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"password.d.ts","sourceRoot":"","sources":["../../../../src/core/oauth2/grant-types/password.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,wBAAwB,EAAsB,MAAM,eAAe,CAAC;AAElF,OAAO,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAMrD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,KAAK,EAAE,yBAAyB,EAAE,0BAA0B,EAAE,MAAM,YAAY,CAAC;AAExF,MAAM,MAAM,wBAAwB,GAAG;IACnC,IAAI,EAAE,IAAI,CAAC;IACX,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,qBAAa,iBAAkB,SAAQ,eAAe,CAAC,wBAAwB,CAAC;IAC5E,SAAS,CAAC,kBAAkB,EAAG,kBAAkB,CAAC;gBAEtC,GAAG,EAAE,0BAA0B;IASrC,OAAO,CAAC,KAAK,EAAE,wBAAwB,EAAE,OAAO,GAAE,yBAA8B,GAAI,OAAO,CAAC,wBAAwB,CAAC;CAmC9H"}
+{"version":3,"file":"password.d.ts","sourceRoot":"","sources":["../../../../src/core/oauth2/grant-types/password.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,wBAAwB,EAAsB,MAAM,eAAe,CAAC;AAElF,OAAO,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AASrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAG/D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,KAAK,EAAE,yBAAyB,EAAE,0BAA0B,EAAE,MAAM,YAAY,CAAC;AAExF,MAAM,MAAM,wBAAwB,GAAG;IACnC,IAAI,EAAE,IAAI,CAAC;IACX,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,qBAAa,iBAAkB,SAAQ,eAAe,CAAC,wBAAwB,CAAC;IAC5E,SAAS,CAAC,kBAAkB,EAAG,kBAAkB,CAAC;IAElD,SAAS,CAAC,YAAY,CAAC,EAAG,aAAa,CAAC;IAExC,SAAS,CAAC,OAAO,CAAC,EAAG,gBAAgB,CAAC;gBAE1B,GAAG,EAAE,0BAA0B;IAWrC,OAAO,CAAC,KAAK,EAAE,wBAAwB,EAAE,OAAO,GAAE,yBAA8B,GAAI,OAAO,CAAC,wBAAwB,CAAC;CA+D9H"}