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

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

@@ -57,7 +57,7 @@ var OAuth2AuthorizeGrant = class extends OAuth2BaseGrant {
 				...typeof authorizationCode.auth_time === "number" ? { auth_time: authorizationCode.auth_time } : {},
 				...amrAcr,
 				sid: session.id,
-				at_hash: await buildOAuth2TokenHash(accessToken, key.signature_algorithm)
+				at_hash: await buildOAuth2TokenHash(accessToken, key.signatureAlgorithm)
 			});
 			buildContext.idToken = idToken;
 		}
@@ -78,19 +78,19 @@ var OAuth2AuthorizeGrant = class extends OAuth2BaseGrant {
 	*/ 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;
+			if (existing && existing.sub === authorizationCode.sub && existing.subKind === authorizationCode.sub_kind && existing.realmId === authorizationCode.realm_id) {
+				existing.clientId = 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,
+			userAgent: options.userAgent,
+			ipAddress: options.ipAddress,
+			realmId: authorizationCode.realm_id,
+			clientId: authorizationCode.client_id,
+			subKind: authorizationCode.sub_kind,
 			sub: authorizationCode.sub,
-			auth_method: authorizationCode.auth_method ?? null
+			authMethod: authorizationCode.auth_method ?? null
 		});
 	}
 };

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

@@ -1 +1 @@
-{"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"}
+{"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","signatureAlgorithm","existing","findOneById","subKind","realmId","clientId","refresh","create","authMethod","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 (authMethod + mfaAt) —\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.signatureAlgorithm),\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.subKind === authorizationCode.sub_kind &&\n                existing.realmId === authorizationCode.realm_id\n            ) {\n                existing.clientId = authorizationCode.client_id || null;\n\n                return this.sessionManager.refresh(existing);\n            }\n        }\n\n        return this.sessionManager.create({\n            userAgent: options.userAgent,\n            ipAddress: options.ipAddress,\n            realmId: authorizationCode.realm_id,\n            clientId: authorizationCode.client_id,\n            subKind: authorizationCode.sub_kind,\n            sub: authorizationCode.sub,\n            authMethod: 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,kBAAkB;GAC3E,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,SAASE,YAAYvC,kBAAkBc,YACvCuB,SAASG,YAAYxC,kBAAkBe,UACzC;IACEsB,SAASI,WAAWzC,kBAAkBkB,aAAa;IAEnD,OAAO,KAAKpB,eAAe4C,QAAQL,QAAAA;GACvC;EACJ;EAEA,OAAO,KAAKvC,eAAe6C,OAAO;GAC9BpC,WAAWN,QAAQM;GACnBE,WAAWR,QAAQQ;GACnB+B,SAASxC,kBAAkBe;GAC3B0B,UAAUzC,kBAAkBkB;GAC5BqB,SAASvC,kBAAkBc;GAC3BF,KAAKZ,kBAAkBY;GACvBgC,YAAY5C,kBAAkB6C,eAAe;EACjD,CAAA;CACJ;AACJ"}

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

@@ -9,16 +9,16 @@ import { OAuth2SubKind } from "@authup/specs";
 var ClientCredentialsGrant = class extends OAuth2BaseGrant {
 	async runWith(input, options = {}) {
 		const session = await this.sessionManager.create({
-			user_agent: options.userAgent,
-			ip_address: options.ipAddress,
-			realm_id: input.realm_id,
+			userAgent: options.userAgent,
+			ipAddress: options.ipAddress,
+			realmId: input.realmId,
 			sub: input.id,
-			sub_kind: IdentityType.CLIENT,
-			auth_method: SessionAuthMethod.CLIENT
+			subKind: IdentityType.CLIENT,
+			authMethod: SessionAuthMethod.CLIENT
 		});
 		const [accessToken, accessTokenPayload] = await this.accessTokenIssuer.issue({
-			user_agent: session.user_agent,
-			remote_address: session.ip_address,
+			user_agent: session.userAgent,
+			remote_address: session.ipAddress,
 			session_id: session.id,
 			scope: ScopeName.GLOBAL,
 			sub: input.id,

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

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"client-credentials.mjs","names":["OAuth2SubKind","IdentityType","ScopeName","SessionAuthMethod","OAuth2BaseGrant","buildOAuth2BearerTokenResponse","ClientCredentialsGrant","runWith","input","options","session","sessionManager","create","userAgent","ipAddress","realmId","sub","id","subKind","CLIENT","authMethod","accessToken","accessTokenPayload","accessTokenIssuer","issue","user_agent","remote_address","session_id","scope","GLOBAL","sub_kind","realm_id","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            userAgent: options.userAgent,\n            ipAddress: options.ipAddress,\n            realmId: input.realmId,\n            sub: input.id,\n            subKind: IdentityType.CLIENT,\n            authMethod: SessionAuthMethod.CLIENT,\n        });\n\n        const [accessToken, accessTokenPayload] = await this.accessTokenIssuer.issue({\n            user_agent: session.userAgent,\n            remote_address: session.ipAddress,\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,WAAWJ,QAAQI;GACnBC,WAAWL,QAAQK;GACnBC,SAASP,MAAMO;GACfC,KAAKR,MAAMS;GACXC,SAASjB,aAAakB;GACtBC,YAAYjB,kBAAkBgB;EAClC,CAAA;EAEA,MAAM,CAACE,aAAaC,sBAAsB,MAAM,KAAKC,kBAAkBC,MAAM;GACzEC,YAAYf,QAAQG;GACpBa,gBAAgBhB,QAAQI;GACxBa,YAAYjB,QAAQO;GACpBW,OAAO1B,UAAU2B;GACjBb,KAAKR,MAAMS;GACXa,UAAU9B,cAAcmB;GACxBY,UAAUvB,MAAMwB,MAAMf;GACtBgB,YAAYzB,MAAMwB,MAAME;GACxBC,WAAW3B,MAAMS;GACjB,GAAIR,QAAQ2B,eAAe,EAAEC,KAAK5B,QAAQ2B,aAAa,IAAI,CAAC;EAChE,CAAA;EAEA,OAAO/B,+BAA+B;GAClCgB;GACAC;EACJ,CAAA;CACJ;AACJ"}

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

@@ -17,24 +17,24 @@ var IdentityGrantType = class extends OAuth2BaseGrant {
 	}
 	async runWith(identity, options = {}) {
 		const session = {
-			user_agent: options.userAgent,
-			ip_address: options.ipAddress,
-			realm_id: identity.data.realm_id,
+			userAgent: options.userAgent,
+			ipAddress: options.ipAddress,
+			realmId: identity.data.realmId,
 			sub: identity.data.id,
-			sub_kind: identity.type,
-			auth_method: SessionAuthMethod.EXTERNAL
+			subKind: identity.type,
+			authMethod: 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
+			authMethod: session.authMethod ?? null,
+			mfaAt: session.mfaAt ?? null
 		});
 		const issuePayload = {
 			session_id: sessionId,
-			user_agent: session.user_agent,
-			remote_address: session.ip_address,
+			user_agent: session.userAgent,
+			remote_address: session.ipAddress,
 			scope: ScopeName.GLOBAL,
-			realm_id: identity.data.realm_id,
+			realm_id: identity.data.realmId,
 			realm_name: identity.data.realm?.name,
 			sub: identity.data.id,
 			sub_kind: identity.type,

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

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"identity.mjs","names":["ScopeName","SessionAuthMethod","OAuth2BaseGrant","deriveAmrAcr","buildOAuth2BearerTokenResponse","IdentityGrantType","refreshTokenIssuer","ctx","accessTokenIssuer","sessionManager","runWith","identity","options","session","userAgent","ipAddress","realmId","data","sub","id","subKind","type","authMethod","EXTERNAL","sessionId","create","amrAcr","mfaAt","issuePayload","session_id","user_agent","remote_address","scope","GLOBAL","realm_id","realm_name","realm","name","sub_kind","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            userAgent: options.userAgent,\n            ipAddress: options.ipAddress,\n            realmId: identity.data.realmId,\n            sub: identity.data.id,\n            subKind: identity.type,\n            authMethod: SessionAuthMethod.EXTERNAL,\n        };\n\n        const { id: sessionId } = await this.sessionManager.create(session);\n\n        // amr/acr derive from the session's authMethod + mfaAt — 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            authMethod: session.authMethod ?? null,\n            mfaAt: session.mfaAt ?? null,\n        });\n\n        const issuePayload : Partial<OAuth2TokenPayload> = {\n            session_id: sessionId,\n            user_agent: session.userAgent,\n            remote_address: session.ipAddress,\n            scope: ScopeName.GLOBAL,\n            realm_id: identity.data.realmId,\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,WAAWF,QAAQE;GACnBC,WAAWH,QAAQG;GACnBC,SAASL,SAASM,KAAKD;GACvBE,KAAKP,SAASM,KAAKE;GACnBC,SAAST,SAASU;GAClBC,YAAYrB,kBAAkBsB;EAClC;EAEA,MAAM,EAAEJ,IAAIK,cAAc,MAAM,KAAKf,eAAegB,OAAOZ,OAAAA;EAK3D,MAAMa,SAASvB,aAAa;GACxBmB,YAAYT,QAAQS,cAAc;GAClCK,OAAOd,QAAQc,SAAS;EAC5B,CAAA;EAEA,MAAMC,eAA6C;GAC/CC,YAAYL;GACZM,YAAYjB,QAAQC;GACpBiB,gBAAgBlB,QAAQE;GACxBiB,OAAOhC,UAAUiC;GACjBC,UAAUvB,SAASM,KAAKD;GACxBmB,YAAYxB,SAASM,KAAKmB,OAAOC;GACjCnB,KAAKP,SAASM,KAAKE;GACnBmB,UAAU3B,SAASU;GACnB,GAAGK;EACP;EAEA,MAAM,CAACa,aAAaC,sBAAsB,MAAM,KAAKhC,kBAAkBiC,MAAMb,YAAAA;EAC7E,MAAM,CAACc,cAAcC,uBAAuB,MAAM,KAAKrC,mBAAmBmC,MAAMb,YAAAA;EAEhF,OAAOxB,+BAA+B;GAClCmC;GACAC;GACAE;GACAC;EACJ,CAAA;CACJ;AACJ"}

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

@@ -3,6 +3,5 @@ export * from './client-credentials.ts';
 export * from './identity.ts';
 export * from './password.ts';
 export * from './refresh-token.ts';
-export * from './robot-credentials.ts';
 export * from './types.ts';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/core/oauth2/grant-types/index.ts"],"names":[],"mappings":"AAOA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,yBAAyB,CAAC;AACxC,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,oBAAoB,CAAC;AACnC,cAAc,wBAAwB,CAAC;AACvC,cAAc,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/core/oauth2/grant-types/index.ts"],"names":[],"mappings":"AAOA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,yBAAyB,CAAC;AACxC,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,oBAAoB,CAAC;AACnC,cAAc,YAAY,CAAC"}

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

@@ -6,5 +6,4 @@ import { ClientCredentialsGrant } from "./client-credentials.mjs";
 import { IdentityGrantType } from "./identity.mjs";
 import { PasswordGrantType } from "./password.mjs";
 import { OAuth2RefreshTokenGrant } from "./refresh-token.mjs";
-import { RobotCredentialsGrant } from "./robot-credentials.mjs";
-export { ClientCredentialsGrant, IdentityGrantType, OAuth2AuthorizeGrant, OAuth2RefreshTokenGrant, PasswordGrantType, RobotCredentialsGrant };
+export { ClientCredentialsGrant, IdentityGrantType, OAuth2AuthorizeGrant, OAuth2RefreshTokenGrant, PasswordGrantType };

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

@@ -10,7 +10,7 @@ export type OAuth2PasswordGrantInput = {
     client?: Client;
     /**
      * Instant the user passed a second-factor challenge alongside the
-     * grant (the `otp` parameter) — stamped onto the session as mfa_at.
+     * grant (the `otp` parameter) — stamped onto the session as mfaAt.
      */
     mfaVerifiedAt?: string;
 };

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

@@ -24,25 +24,25 @@ var PasswordGrantType = class extends OAuth2BaseGrant {
 		const { user, client } = input;
 		const clientId = client?.id;
 		const session = await this.sessionManager.create({
-			user_agent: options.userAgent,
-			ip_address: options.ipAddress,
-			realm_id: user.realm_id,
-			client_id: clientId,
+			userAgent: options.userAgent,
+			ipAddress: options.ipAddress,
+			realmId: user.realmId,
+			clientId,
 			sub: user.id,
-			sub_kind: IdentityType.USER,
-			mfa_at: input.mfaVerifiedAt ?? null,
-			auth_method: SessionAuthMethod.PASSWORD
+			subKind: IdentityType.USER,
+			mfaAt: input.mfaVerifiedAt ?? null,
+			authMethod: SessionAuthMethod.PASSWORD
 		});
 		const amrAcr = deriveAmrAcr(session);
 		const issuePayload = {
 			client_id: clientId,
 			session_id: session.id,
-			user_agent: session.user_agent,
-			remote_address: session.ip_address,
+			user_agent: session.userAgent,
+			remote_address: session.ipAddress,
 			scope: ScopeName.GLOBAL,
 			sub: user.id,
 			sub_kind: OAuth2SubKind.USER,
-			realm_id: user.realm_id,
+			realm_id: user.realmId,
 			realm_name: user.realm?.name,
 			...options.confirmation ? { cnf: options.confirmation } : {},
 			...amrAcr
@@ -58,12 +58,12 @@ var PasswordGrantType = class extends OAuth2BaseGrant {
 			actorType: IdentityType.USER,
 			actorId: user.id,
 			actorName: user.name,
-			realmId: user.realm_id,
+			realmId: user.realmId,
 			requestIpAddress: options.ipAddress ?? null,
 			requestUserAgent: options.userAgent ?? null,
 			data: {
-				grant_type: OAuth2TokenGrant.PASSWORD,
-				session_id: session.id
+				grantType: OAuth2TokenGrant.PASSWORD,
+				sessionId: session.id
 			}
 		});
 		this.metrics?.recordLogin("success");

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

@@ -1 +1 @@
-{"version":3,"file":"password.mjs","names":["OAuth2SubKind","OAuth2TokenGrant","EventName","EventRefType","EventScope","IdentityType","ScopeName","SessionAuthMethod","deriveAmrAcr","buildOAuth2BearerTokenResponse","OAuth2BaseGrant","PasswordGrantType","refreshTokenIssuer","eventService","metrics","ctx","accessTokenIssuer","sessionManager","runWith","input","options","user","client","clientId","id","session","create","user_agent","userAgent","ip_address","ipAddress","realm_id","client_id","sub","sub_kind","USER","mfa_at","mfaVerifiedAt","auth_method","PASSWORD","amrAcr","issuePayload","session_id","remote_address","scope","GLOBAL","realm_name","realm","name","confirmation","cnf","accessToken","accessTokenPayload","issue","refreshToken","refreshTokenPayload","record","OAUTH2","LOGIN","refType","SESSION","refId","actorType","actorId","actorName","realmId","requestIpAddress","requestUserAgent","data","grant_type","recordLogin"],"sources":["../../../../src/core/oauth2/grant-types/password.ts"],"sourcesContent":["/*\n * Copyright (c) 2022-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 { OAuth2TokenGrantResponse, OAuth2TokenPayload } from '@authup/specs';\nimport { OAuth2SubKind, OAuth2TokenGrant } from '@authup/specs';\nimport type { Client, User } from '@authup/core-kit';\nimport {\n    EventName,\n    EventRefType,\n    EventScope,\n    IdentityType,\n    ScopeName,\n    SessionAuthMethod,\n} from '@authup/core-kit';\nimport type { IEventService } from '../../entities/index.ts';\nimport type { IAuthFlowMetrics } from '../../metrics/index.ts';\nimport { deriveAmrAcr } from '../authorization/helpers.ts';\nimport { buildOAuth2BearerTokenResponse } from '../response/index.ts';\nimport type { IOAuth2TokenIssuer } from '../token/index.ts';\nimport { OAuth2BaseGrant } from './base.ts';\nimport type { OAuth2GrantRunWIthOptions, OAuth2PasswordGrantContext } from './types.ts';\n\nexport type OAuth2PasswordGrantInput = {\n    user: User,\n    client?: Client,\n    /**\n     * Instant the user passed a second-factor challenge alongside the\n     * grant (the `otp` parameter) — stamped onto the session as mfa_at.\n     */\n    mfaVerifiedAt?: string,\n};\n\nexport class PasswordGrantType extends OAuth2BaseGrant<OAuth2PasswordGrantInput> {\n    protected refreshTokenIssuer : IOAuth2TokenIssuer;\n\n    protected eventService? : IEventService;\n\n    protected metrics? : IAuthFlowMetrics;\n\n    constructor(ctx: OAuth2PasswordGrantContext) {\n        super({\n            accessTokenIssuer: ctx.accessTokenIssuer,\n            sessionManager: ctx.sessionManager,\n        });\n\n        this.refreshTokenIssuer = ctx.refreshTokenIssuer;\n        this.eventService = ctx.eventService;\n        this.metrics = ctx.metrics;\n    }\n\n    async runWith(input: OAuth2PasswordGrantInput, options: OAuth2GrantRunWIthOptions = {}) : Promise<OAuth2TokenGrantResponse> {\n        const { user, client } = input;\n        const clientId = client?.id;\n\n        const session = await this.sessionManager.create({\n            user_agent: options.userAgent,\n            ip_address: options.ipAddress,\n            realm_id: user.realm_id,\n            client_id: clientId,\n            sub: user.id,\n            sub_kind: IdentityType.USER,\n            mfa_at: input.mfaVerifiedAt ?? null,\n            auth_method: SessionAuthMethod.PASSWORD,\n        });\n\n        // amr/acr derive from the session's auth_method + mfa_at — deliberately\n        // on every token kind, so a direct password grant's tokens advertise the\n        // method the same way the authorization_code exchange does.\n        const amrAcr = deriveAmrAcr(session);\n\n        const issuePayload : Partial<OAuth2TokenPayload> = {\n            client_id: clientId,\n            session_id: session.id,\n            user_agent: session.user_agent,\n            remote_address: session.ip_address,\n            scope: ScopeName.GLOBAL,\n            sub: user.id,\n            sub_kind: OAuth2SubKind.USER,\n            realm_id: user.realm_id,\n            realm_name: user.realm?.name,\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        await this.eventService?.record({\n            scope: EventScope.OAUTH2,\n            name: EventName.LOGIN,\n            refType: EventRefType.SESSION,\n            refId: session.id,\n            clientId: clientId ?? null,\n            actorType: IdentityType.USER,\n            actorId: user.id,\n            actorName: user.name,\n            realmId: user.realm_id,\n            requestIpAddress: options.ipAddress ?? null,\n            requestUserAgent: options.userAgent ?? null,\n            data: {\n                grant_type: OAuth2TokenGrant.PASSWORD,\n                session_id: session.id,\n            },\n        });\n        this.metrics?.recordLogin('success');\n\n        return buildOAuth2BearerTokenResponse({\n            accessToken,\n            accessTokenPayload,\n            refreshToken,\n            refreshTokenPayload,\n        });\n    }\n}\n"],"mappings":";;;;;;;;;AAoCA,IAAaW,oBAAb,cAAuCD,gBAAAA;CACzBE;CAEAC;CAEAC;CAEV,YAAYC,KAAiC;EACzC,MAAM;GACFC,mBAAmBD,IAAIC;GACvBC,gBAAgBF,IAAIE;EACxB,CAAA;EAEA,KAAKL,qBAAqBG,IAAIH;EAC9B,KAAKC,eAAeE,IAAIF;EACxB,KAAKC,UAAUC,IAAID;CACvB;CAEA,MAAMI,QAAQC,OAAiCC,UAAqC,CAAC,GAAuC;EACxH,MAAM,EAAEC,MAAMC,WAAWH;EACzB,MAAMI,WAAWD,QAAQE;EAEzB,MAAMC,UAAU,MAAM,KAAKR,eAAeS,OAAO;GAC7CC,YAAYP,QAAQQ;GACpBC,YAAYT,QAAQU;GACpBC,UAAUV,KAAKU;GACfC,WAAWT;GACXU,KAAKZ,KAAKG;GACVU,UAAU7B,aAAa8B;GACvBC,QAAQjB,MAAMkB,iBAAiB;GAC/BC,aAAa/B,kBAAkBgC;EACnC,CAAA;EAKA,MAAMC,SAAShC,aAAaiB,OAAAA;EAE5B,MAAMgB,eAA6C;GAC/CT,WAAWT;GACXmB,YAAYjB,QAAQD;GACpBG,YAAYF,QAAQE;GACpBgB,gBAAgBlB,QAAQI;GACxBe,OAAOtC,UAAUuC;GACjBZ,KAAKZ,KAAKG;GACVU,UAAUlC,cAAcmC;GACxBJ,UAAUV,KAAKU;GACfe,YAAYzB,KAAK0B,OAAOC;GACxB,GAAI5B,QAAQ6B,eAAe,EAAEC,KAAK9B,QAAQ6B,aAAa,IAAI,CAAC;GAC5D,GAAGT;EACP;EAEA,MAAM,CAACW,aAAaC,sBAAsB,MAAM,KAAKpC,kBAAkBqC,MAAMZ,YAAAA;EAC7E,MAAM,CAACa,cAAcC,uBAAuB,MAAM,KAAK3C,mBAAmByC,MAAMZ,YAAAA;EAEhF,MAAM,KAAK5B,cAAc2C,OAAO;GAC5BZ,OAAOxC,WAAWqD;GAClBT,MAAM9C,UAAUwD;GAChBC,SAASxD,aAAayD;GACtBC,OAAOpC,QAAQD;GACfD,UAAUA,YAAY;GACtBuC,WAAWzD,aAAa8B;GACxB4B,SAAS1C,KAAKG;GACdwC,WAAW3C,KAAK2B;GAChBiB,SAAS5C,KAAKU;GACdmC,kBAAkB9C,QAAQU,aAAa;GACvCqC,kBAAkB/C,QAAQQ,aAAa;GACvCwC,MAAM;IACFC,YAAYpE,iBAAiBsC;IAC7BG,YAAYjB,QAAQD;GACxB;EACJ,CAAA;EACA,KAAKV,SAASwD,YAAY,SAAA;EAE1B,OAAO7D,+BAA+B;GAClC0C;GACAC;GACAE;GACAC;EACJ,CAAA;CACJ;AACJ"}
+{"version":3,"file":"password.mjs","names":["OAuth2SubKind","OAuth2TokenGrant","EventName","EventRefType","EventScope","IdentityType","ScopeName","SessionAuthMethod","deriveAmrAcr","buildOAuth2BearerTokenResponse","OAuth2BaseGrant","PasswordGrantType","refreshTokenIssuer","eventService","metrics","ctx","accessTokenIssuer","sessionManager","runWith","input","options","user","client","clientId","id","session","create","userAgent","ipAddress","realmId","sub","subKind","USER","mfaAt","mfaVerifiedAt","authMethod","PASSWORD","amrAcr","issuePayload","client_id","session_id","user_agent","remote_address","scope","GLOBAL","sub_kind","realm_id","realm_name","realm","name","confirmation","cnf","accessToken","accessTokenPayload","issue","refreshToken","refreshTokenPayload","record","OAUTH2","LOGIN","refType","SESSION","refId","actorType","actorId","actorName","requestIpAddress","requestUserAgent","data","grantType","sessionId","recordLogin"],"sources":["../../../../src/core/oauth2/grant-types/password.ts"],"sourcesContent":["/*\n * Copyright (c) 2022-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 { OAuth2TokenGrantResponse, OAuth2TokenPayload } from '@authup/specs';\nimport { OAuth2SubKind, OAuth2TokenGrant } from '@authup/specs';\nimport type { Client, User } from '@authup/core-kit';\nimport {\n    EventName,\n    EventRefType,\n    EventScope,\n    IdentityType,\n    ScopeName,\n    SessionAuthMethod,\n} from '@authup/core-kit';\nimport type { IEventService } from '../../entities/index.ts';\nimport type { IAuthFlowMetrics } from '../../metrics/index.ts';\nimport { deriveAmrAcr } from '../authorization/helpers.ts';\nimport { buildOAuth2BearerTokenResponse } from '../response/index.ts';\nimport type { IOAuth2TokenIssuer } from '../token/index.ts';\nimport { OAuth2BaseGrant } from './base.ts';\nimport type { OAuth2GrantRunWIthOptions, OAuth2PasswordGrantContext } from './types.ts';\n\nexport type OAuth2PasswordGrantInput = {\n    user: User,\n    client?: Client,\n    /**\n     * Instant the user passed a second-factor challenge alongside the\n     * grant (the `otp` parameter) — stamped onto the session as mfaAt.\n     */\n    mfaVerifiedAt?: string,\n};\n\nexport class PasswordGrantType extends OAuth2BaseGrant<OAuth2PasswordGrantInput> {\n    protected refreshTokenIssuer : IOAuth2TokenIssuer;\n\n    protected eventService? : IEventService;\n\n    protected metrics? : IAuthFlowMetrics;\n\n    constructor(ctx: OAuth2PasswordGrantContext) {\n        super({\n            accessTokenIssuer: ctx.accessTokenIssuer,\n            sessionManager: ctx.sessionManager,\n        });\n\n        this.refreshTokenIssuer = ctx.refreshTokenIssuer;\n        this.eventService = ctx.eventService;\n        this.metrics = ctx.metrics;\n    }\n\n    async runWith(input: OAuth2PasswordGrantInput, options: OAuth2GrantRunWIthOptions = {}) : Promise<OAuth2TokenGrantResponse> {\n        const { user, client } = input;\n        const clientId = client?.id;\n\n        const session = await this.sessionManager.create({\n            userAgent: options.userAgent,\n            ipAddress: options.ipAddress,\n            realmId: user.realmId,\n            clientId,\n            sub: user.id,\n            subKind: IdentityType.USER,\n            mfaAt: input.mfaVerifiedAt ?? null,\n            authMethod: SessionAuthMethod.PASSWORD,\n        });\n\n        // amr/acr derive from the session's authMethod + mfaAt — deliberately\n        // on every token kind, so a direct password grant's tokens advertise the\n        // method the same way the authorization_code exchange does.\n        const amrAcr = deriveAmrAcr(session);\n\n        const issuePayload : Partial<OAuth2TokenPayload> = {\n            client_id: clientId,\n            session_id: session.id,\n            user_agent: session.userAgent,\n            remote_address: session.ipAddress,\n            scope: ScopeName.GLOBAL,\n            sub: user.id,\n            sub_kind: OAuth2SubKind.USER,\n            realm_id: user.realmId,\n            realm_name: user.realm?.name,\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        await this.eventService?.record({\n            scope: EventScope.OAUTH2,\n            name: EventName.LOGIN,\n            refType: EventRefType.SESSION,\n            refId: session.id,\n            clientId: clientId ?? null,\n            actorType: IdentityType.USER,\n            actorId: user.id,\n            actorName: user.name,\n            realmId: user.realmId,\n            requestIpAddress: options.ipAddress ?? null,\n            requestUserAgent: options.userAgent ?? null,\n            data: {\n                grantType: OAuth2TokenGrant.PASSWORD,\n                sessionId: session.id,\n            },\n        });\n        this.metrics?.recordLogin('success');\n\n        return buildOAuth2BearerTokenResponse({\n            accessToken,\n            accessTokenPayload,\n            refreshToken,\n            refreshTokenPayload,\n        });\n    }\n}\n"],"mappings":";;;;;;;;;AAoCA,IAAaW,oBAAb,cAAuCD,gBAAAA;CACzBE;CAEAC;CAEAC;CAEV,YAAYC,KAAiC;EACzC,MAAM;GACFC,mBAAmBD,IAAIC;GACvBC,gBAAgBF,IAAIE;EACxB,CAAA;EAEA,KAAKL,qBAAqBG,IAAIH;EAC9B,KAAKC,eAAeE,IAAIF;EACxB,KAAKC,UAAUC,IAAID;CACvB;CAEA,MAAMI,QAAQC,OAAiCC,UAAqC,CAAC,GAAuC;EACxH,MAAM,EAAEC,MAAMC,WAAWH;EACzB,MAAMI,WAAWD,QAAQE;EAEzB,MAAMC,UAAU,MAAM,KAAKR,eAAeS,OAAO;GAC7CC,WAAWP,QAAQO;GACnBC,WAAWR,QAAQQ;GACnBC,SAASR,KAAKQ;GACdN;GACAO,KAAKT,KAAKG;GACVO,SAAS1B,aAAa2B;GACtBC,OAAOd,MAAMe,iBAAiB;GAC9BC,YAAY5B,kBAAkB6B;EAClC,CAAA;EAKA,MAAMC,SAAS7B,aAAaiB,OAAAA;EAE5B,MAAMa,eAA6C;GAC/CC,WAAWhB;GACXiB,YAAYf,QAAQD;GACpBiB,YAAYhB,QAAQE;GACpBe,gBAAgBjB,QAAQG;GACxBe,OAAOrC,UAAUsC;GACjBd,KAAKT,KAAKG;GACVqB,UAAU7C,cAAcgC;GACxBc,UAAUzB,KAAKQ;GACfkB,YAAY1B,KAAK2B,OAAOC;GACxB,GAAI7B,QAAQ8B,eAAe,EAAEC,KAAK/B,QAAQ8B,aAAa,IAAI,CAAC;GAC5D,GAAGb;EACP;EAEA,MAAM,CAACe,aAAaC,sBAAsB,MAAM,KAAKrC,kBAAkBsC,MAAMhB,YAAAA;EAC7E,MAAM,CAACiB,cAAcC,uBAAuB,MAAM,KAAK5C,mBAAmB0C,MAAMhB,YAAAA;EAEhF,MAAM,KAAKzB,cAAc4C,OAAO;GAC5Bd,OAAOvC,WAAWsD;GAClBT,MAAM/C,UAAUyD;GAChBC,SAASzD,aAAa0D;GACtBC,OAAOrC,QAAQD;GACfD,UAAUA,YAAY;GACtBwC,WAAW1D,aAAa2B;GACxBgC,SAAS3C,KAAKG;GACdyC,WAAW5C,KAAK4B;GAChBpB,SAASR,KAAKQ;GACdqC,kBAAkB9C,QAAQQ,aAAa;GACvCuC,kBAAkB/C,QAAQO,aAAa;GACvCyC,MAAM;IACFC,WAAWpE,iBAAiBmC;IAC5BkC,WAAW7C,QAAQD;GACvB;EACJ,CAAA;EACA,KAAKV,SAASyD,YAAY,SAAA;EAE1B,OAAO9D,+BAA+B;GAClC2C;GACAC;GACAE;GACAC;EACJ,CAAA;CACJ;AACJ"}

package/dist/core/oauth2/grant-types/refresh-token.mjs

@@ -38,13 +38,13 @@ var OAuth2RefreshTokenGrant = class extends OAuth2BaseGrant {
 		if (payload.kind && payload.kind !== OAuth2TokenKind.REFRESH) throw OAuth2GrantError.invalid("unexpected token kind");
 		const row = await this.sessionTokenRepository.findOneById(payload.jti);
 		if (!row || row.kind !== "refresh") throw OAuth2GrantError.invalid("refresh token is unknown");
-		if (row.revoked_at) throw OAuth2GrantError.invalid("refresh token has been revoked");
-		if (row.session_id !== payload.session_id) throw OAuth2GrantError.invalid("refresh token session mismatch");
+		if (row.revokedAt) throw OAuth2GrantError.invalid("refresh token has been revoked");
+		if (row.sessionId !== payload.session_id) throw OAuth2GrantError.invalid("refresh token session mismatch");
 		const now = /* @__PURE__ */ new Date();
 		const nowISO = now.toISOString();
 		if (!await this.sessionTokenRepository.markRefreshConsumed(payload.jti, nowISO)) {
 			if (!await this.isWithinGraceWindow(payload.jti, now)) {
-				await this.revokeFamily(row.session_id, payload.jti, nowISO);
+				await this.revokeFamily(row.sessionId, payload.jti, nowISO);
 				throw OAuth2GrantError.invalid("refresh token replay detected; session revoked");
 			}
 		}
@@ -52,22 +52,22 @@ var OAuth2RefreshTokenGrant = class extends OAuth2BaseGrant {
 		const session = await this.sessionManager.findOneById(payload.session_id);
 		if (!session) throw JWTError.payloadPropertyInvalid("session_id");
 		await this.sessionManager.verify(session);
-		if (options.userAgent) session.user_agent = options.userAgent;
-		if (options.ipAddress) session.ip_address = options.ipAddress;
+		if (options.userAgent) session.userAgent = options.userAgent;
+		if (options.ipAddress) session.ipAddress = options.ipAddress;
 		await this.sessionManager.refresh(session);
 		const [refreshToken, refreshTokenPayload] = await this.refreshTokenIssuer.issue({
 			...payload,
 			...options.confirmation ? { cnf: options.confirmation } : {},
-			user_agent: session.user_agent,
-			remote_address: session.ip_address,
+			user_agent: session.userAgent,
+			remote_address: session.ipAddress,
 			exp: this.refreshTokenIssuer.buildExp(),
 			parent_id: payload.jti
 		});
 		const [accessToken, accessTokenPayload] = await this.accessTokenIssuer.issue({
 			...payload,
 			...options.confirmation ? { cnf: options.confirmation } : {},
-			user_agent: session.user_agent,
-			remote_address: session.ip_address,
+			user_agent: session.userAgent,
+			remote_address: session.ipAddress,
 			exp: this.accessTokenIssuer.buildExp(),
 			refresh_token_id: refreshTokenPayload.jti
 		});
@@ -86,7 +86,7 @@ var OAuth2RefreshTokenGrant = class extends OAuth2BaseGrant {
 	*/ async isWithinGraceWindow(jti, now) {
 		if (this.gracePeriod <= 0) return false;
 		const current = await this.sessionTokenRepository.findOneById(jti);
-		if (!current || current.revoked_at !== null || current.consumed_at === null || now.getTime() - new Date(current.consumed_at).getTime() > this.gracePeriod * 1e3) return false;
+		if (!current || current.revokedAt !== null || current.consumedAt === null || now.getTime() - new Date(current.consumedAt).getTime() > this.gracePeriod * 1e3) return false;
 		return !await this.sessionTokenRepository.hasConsumedChild(jti);
 	}
 	/**
@@ -96,7 +96,7 @@ var OAuth2RefreshTokenGrant = class extends OAuth2BaseGrant {
 	* tokens stop verifying on authup's own API.
 	*/ async revokeFamily(sessionId, jti, at) {
 		this.logger?.warn("OAuth2 refresh token replay detected; revoking session", {
-			session_id: sessionId,
+			sessionId,
 			jti
 		});
 		await this.eventService?.record({
@@ -108,7 +108,7 @@ var OAuth2RefreshTokenGrant = class extends OAuth2BaseGrant {
 		});
 		this.metrics?.recordRefreshReplay();
 		const rows = await this.sessionTokenRepository.revokeBySessionId(sessionId, at);
-		await Promise.allSettled(rows.map((row) => this.tokenRepository.setInactive(row.id, Math.floor(new Date(row.expires_at).getTime() / 1e3))));
+		await Promise.allSettled(rows.map((row) => this.tokenRepository.setInactive(row.id, Math.floor(new Date(row.expiresAt).getTime() / 1e3))));
 		await this.sessionManager.revoke(sessionId);
 	}
 };

package/dist/core/oauth2/grant-types/refresh-token.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"refresh-token.mjs","names":["JWTError","OAuth2GrantError","OAuth2TokenKind","EventName","EventRefType","EventScope","buildOAuth2BearerTokenResponse","OAuth2BaseGrant","OAuth2RefreshTokenGrant","refreshTokenIssuer","tokenVerifier","tokenRepository","sessionTokenRepository","eventService","metrics","logger","gracePeriod","ctx","accessTokenIssuer","sessionManager","options","runWith","input","payload","verify","skipActiveCheck","jti","payloadPropertyInvalid","session_id","kind","REFRESH","invalid","row","findOneById","revoked_at","now","Date","nowISO","toISOString","consumed","markRefreshConsumed","withinGrace","isWithinGraceWindow","revokeFamily","setInactive","exp","session","userAgent","user_agent","ipAddress","ip_address","refresh","refreshToken","refreshTokenPayload","issue","confirmation","cnf","remote_address","buildExp","parent_id","accessToken","accessTokenPayload","refresh_token_id","current","consumed_at","getTime","chainAdvanced","hasConsumedChild","sessionId","at","warn","record","scope","OAUTH2","name","REFRESH_REPLAY_DETECTED","refType","SESSION","refId","data","recordRefreshReplay","rows","revokeBySessionId","Promise","allSettled","map","id","Math","floor","expires_at","revoke"],"sources":["../../../../src/core/oauth2/grant-types/refresh-token.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 { JWTError, OAuth2GrantError, OAuth2TokenKind } from '@authup/specs';\nimport { EventName, EventRefType, EventScope } from '@authup/core-kit';\nimport type { Logger } from '@authup/server-kit';\nimport type { IEventService } from '../../entities/index.ts';\nimport type { IAuthFlowMetrics } from '../../metrics/index.ts';\nimport { buildOAuth2BearerTokenResponse } from '../response/index.ts';\nimport type { ISessionTokenRepository } from '../session-token/index.ts';\nimport type { IOAuth2TokenIssuer, IOAuth2TokenRepository, IOAuth2TokenVerifier } from '../token/index.ts';\nimport { OAuth2BaseGrant } from './base.ts';\nimport type { IOAuth2Grant, OAuth2GrantRunWIthOptions, OAuth2RefreshTokenGrantContext } from './types.ts';\n\nexport class OAuth2RefreshTokenGrant extends OAuth2BaseGrant<string | OAuth2TokenPayload> implements IOAuth2Grant {\n    protected refreshTokenIssuer : IOAuth2TokenIssuer;\n\n    protected tokenVerifier : IOAuth2TokenVerifier;\n\n    protected tokenRepository : IOAuth2TokenRepository;\n\n    protected sessionTokenRepository : ISessionTokenRepository;\n\n    protected eventService? : IEventService;\n\n    protected metrics? : IAuthFlowMetrics;\n\n    protected logger? : Logger;\n\n    protected gracePeriod : number;\n\n    constructor(ctx: OAuth2RefreshTokenGrantContext) {\n        super({\n            accessTokenIssuer: ctx.accessTokenIssuer,\n            sessionManager: ctx.sessionManager,\n        });\n\n        this.refreshTokenIssuer = ctx.refreshTokenIssuer;\n        this.tokenVerifier = ctx.tokenVerifier;\n        this.tokenRepository = ctx.tokenRepository;\n        this.sessionTokenRepository = ctx.sessionTokenRepository;\n        this.eventService = ctx.eventService;\n        this.metrics = ctx.metrics;\n        this.logger = ctx.logger;\n        this.gracePeriod = ctx.options?.gracePeriod ?? 0;\n    }\n\n    async runWith(\n        input: string | OAuth2TokenPayload,\n        options: OAuth2GrantRunWIthOptions = {},\n    ) : Promise<OAuth2TokenGrantResponse> {\n        let payload : OAuth2TokenPayload;\n        if (typeof input === 'string') {\n            // The auth_session_tokens row — not the cache blocklist — is the\n            // authority for refresh-token validity, so skip the active check.\n            payload = await this.tokenVerifier.verify(input, { skipActiveCheck: true });\n        } else {\n            payload = input;\n        }\n\n        if (!payload.jti) {\n            throw JWTError.payloadPropertyInvalid('jti');\n        }\n        if (!payload.session_id) {\n            throw JWTError.payloadPropertyInvalid('session_id');\n        }\n\n        // Explicit kind guard (defense in depth). Authup signs access tokens\n        // and the MFA-pending login ticket with the same keys; only a refresh\n        // token may be exchanged here. The ticket is also rejected implicitly\n        // (it writes no auth_session_tokens row), but do not rely on that\n        // second-order fact alone.\n        if (payload.kind && payload.kind !== OAuth2TokenKind.REFRESH) {\n            throw OAuth2GrantError.invalid('unexpected token kind');\n        }\n\n        const row = await this.sessionTokenRepository.findOneById(payload.jti);\n        if (!row || row.kind !== 'refresh') {\n            // Row missing = expired-and-swept or a pre-rotation legacy token\n            // (hard cutover). Either way the client must re-authenticate.\n            throw OAuth2GrantError.invalid('refresh token is unknown');\n        }\n        if (row.revoked_at) {\n            throw OAuth2GrantError.invalid('refresh token has been revoked');\n        }\n        if (row.session_id !== payload.session_id) {\n            // The row is written with the token's own session_id and jti is\n            // globally unique, so a mismatch means corruption / jti reuse — fail\n            // closed rather than refresh or revoke against the wrong session.\n            throw OAuth2GrantError.invalid('refresh token session mismatch');\n        }\n\n        const now = new Date();\n        const nowISO = now.toISOString();\n\n        const consumed = await this.sessionTokenRepository.markRefreshConsumed(payload.jti, nowISO);\n        if (!consumed) {\n            // Lost the atomic consume — either a replay of an already-rotated\n            // token, or a benign concurrent-refresh race the grace window\n            // absorbs.\n            const withinGrace = await this.isWithinGraceWindow(payload.jti, now);\n            if (!withinGrace) {\n                await this.revokeFamily(row.session_id, payload.jti, nowISO);\n                throw OAuth2GrantError.invalid('refresh token replay detected; session revoked');\n            }\n        }\n\n        // Blocklist the presented refresh token in the cache so introspection\n        // reports it inactive. Deliberately NOT a DB revoke — that would set\n        // revoked_at and break the grace window.\n        await this.tokenRepository.setInactive(payload.jti, payload.exp);\n\n        const session = await this.sessionManager.findOneById(payload.session_id);\n        if (!session) {\n            throw JWTError.payloadPropertyInvalid('session_id');\n        }\n\n        await this.sessionManager.verify(session);\n\n        if (options.userAgent) {\n            session.user_agent = options.userAgent;\n        }\n        if (options.ipAddress) {\n            session.ip_address = options.ipAddress;\n        }\n        await this.sessionManager.refresh(session);\n\n        const [refreshToken, refreshTokenPayload] = await this.refreshTokenIssuer.issue({\n            ...payload,\n            ...(options.confirmation ? { cnf: options.confirmation } : {}),\n            user_agent: session.user_agent,\n            remote_address: session.ip_address,\n            exp: this.refreshTokenIssuer.buildExp(),\n            parent_id: payload.jti,\n        });\n\n        const [accessToken, accessTokenPayload] = await this.accessTokenIssuer.issue({\n            ...payload,\n            ...(options.confirmation ? { cnf: options.confirmation } : {}),\n            user_agent: session.user_agent,\n            remote_address: session.ip_address,\n            exp: this.accessTokenIssuer.buildExp(),\n            refresh_token_id: refreshTokenPayload.jti,\n        });\n\n        return buildOAuth2BearerTokenResponse({\n            accessToken,\n            accessTokenPayload,\n            refreshToken,\n            refreshTokenPayload,\n        });\n    }\n\n    /**\n     * The grace window (opt-in via `tokenRefreshGracePeriod`) absorbs benign\n     * concurrent / multi-tab refreshes of the SAME still-current token. It is\n     * scoped to the chain tip: a token whose descendant has already been\n     * consumed is a stale ancestor (a real replay), never a grace re-use.\n     */\n    protected async isWithinGraceWindow(jti: string, now: Date) : Promise<boolean> {\n        if (this.gracePeriod <= 0) {\n            return false;\n        }\n\n        const current = await this.sessionTokenRepository.findOneById(jti);\n        if (\n            !current ||\n            current.revoked_at !== null ||\n            current.consumed_at === null ||\n            (now.getTime() - new Date(current.consumed_at).getTime()) > this.gracePeriod * 1_000\n        ) {\n            return false;\n        }\n\n        // Grace applies ONLY to the most-recent consumed token: a consumed\n        // descendant proves the rotation advanced past this one (stale replay).\n        const chainAdvanced = await this.sessionTokenRepository.hasConsumedChild(jti);\n        return !chainAdvanced;\n    }\n\n    /**\n     * RFC 6819 §5.2.2.3 reaction strategy — revoke the whole token family\n     * (the auth_sessions row) on replay: soft-revoke every session-token row,\n     * blocklist their jtis in the cache, and delete the session so its access\n     * tokens stop verifying on authup's own API.\n     */\n    protected async revokeFamily(sessionId: string, jti: string, at: string) : Promise<void> {\n        this.logger?.warn('OAuth2 refresh token replay detected; revoking session', {\n            session_id: sessionId,\n            jti,\n        });\n\n        await this.eventService?.record({\n            scope: EventScope.OAUTH2,\n            name: EventName.REFRESH_REPLAY_DETECTED,\n            refType: EventRefType.SESSION,\n            refId: sessionId,\n            data: { jti },\n        });\n        this.metrics?.recordRefreshReplay();\n\n        // Blocklisting is best-effort (cache) — settle all of them so one cache\n        // failure cannot skip the rest or, worse, abort the session delete\n        // below (the load-bearing part of the revocation). Pin each TTL to the\n        // token's real expiry (unix seconds) so a long-lived refresh token\n        // cannot resurface as active via introspection after the fallback 1h.\n        const rows = await this.sessionTokenRepository.revokeBySessionId(sessionId, at);\n        await Promise.allSettled(rows.map((row) => this.tokenRepository.setInactive(\n            row.id,\n            Math.floor(new Date(row.expires_at).getTime() / 1_000),\n        )));\n\n        await this.sessionManager.revoke(sessionId);\n    }\n}\n"],"mappings":"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"}
+{"version":3,"file":"refresh-token.mjs","names":["JWTError","OAuth2GrantError","OAuth2TokenKind","EventName","EventRefType","EventScope","buildOAuth2BearerTokenResponse","OAuth2BaseGrant","OAuth2RefreshTokenGrant","refreshTokenIssuer","tokenVerifier","tokenRepository","sessionTokenRepository","eventService","metrics","logger","gracePeriod","ctx","accessTokenIssuer","sessionManager","options","runWith","input","payload","verify","skipActiveCheck","jti","payloadPropertyInvalid","session_id","kind","REFRESH","invalid","row","findOneById","revokedAt","sessionId","now","Date","nowISO","toISOString","consumed","markRefreshConsumed","withinGrace","isWithinGraceWindow","revokeFamily","setInactive","exp","session","userAgent","ipAddress","refresh","refreshToken","refreshTokenPayload","issue","confirmation","cnf","user_agent","remote_address","buildExp","parent_id","accessToken","accessTokenPayload","refresh_token_id","current","consumedAt","getTime","chainAdvanced","hasConsumedChild","at","warn","record","scope","OAUTH2","name","REFRESH_REPLAY_DETECTED","refType","SESSION","refId","data","recordRefreshReplay","rows","revokeBySessionId","Promise","allSettled","map","id","Math","floor","expiresAt","revoke"],"sources":["../../../../src/core/oauth2/grant-types/refresh-token.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 { JWTError, OAuth2GrantError, OAuth2TokenKind } from '@authup/specs';\nimport { EventName, EventRefType, EventScope } from '@authup/core-kit';\nimport type { Logger } from '@authup/server-kit';\nimport type { IEventService } from '../../entities/index.ts';\nimport type { IAuthFlowMetrics } from '../../metrics/index.ts';\nimport { buildOAuth2BearerTokenResponse } from '../response/index.ts';\nimport type { ISessionTokenRepository } from '../session-token/index.ts';\nimport type { IOAuth2TokenIssuer, IOAuth2TokenRepository, IOAuth2TokenVerifier } from '../token/index.ts';\nimport { OAuth2BaseGrant } from './base.ts';\nimport type { IOAuth2Grant, OAuth2GrantRunWIthOptions, OAuth2RefreshTokenGrantContext } from './types.ts';\n\nexport class OAuth2RefreshTokenGrant extends OAuth2BaseGrant<string | OAuth2TokenPayload> implements IOAuth2Grant {\n    protected refreshTokenIssuer : IOAuth2TokenIssuer;\n\n    protected tokenVerifier : IOAuth2TokenVerifier;\n\n    protected tokenRepository : IOAuth2TokenRepository;\n\n    protected sessionTokenRepository : ISessionTokenRepository;\n\n    protected eventService? : IEventService;\n\n    protected metrics? : IAuthFlowMetrics;\n\n    protected logger? : Logger;\n\n    protected gracePeriod : number;\n\n    constructor(ctx: OAuth2RefreshTokenGrantContext) {\n        super({\n            accessTokenIssuer: ctx.accessTokenIssuer,\n            sessionManager: ctx.sessionManager,\n        });\n\n        this.refreshTokenIssuer = ctx.refreshTokenIssuer;\n        this.tokenVerifier = ctx.tokenVerifier;\n        this.tokenRepository = ctx.tokenRepository;\n        this.sessionTokenRepository = ctx.sessionTokenRepository;\n        this.eventService = ctx.eventService;\n        this.metrics = ctx.metrics;\n        this.logger = ctx.logger;\n        this.gracePeriod = ctx.options?.gracePeriod ?? 0;\n    }\n\n    async runWith(\n        input: string | OAuth2TokenPayload,\n        options: OAuth2GrantRunWIthOptions = {},\n    ) : Promise<OAuth2TokenGrantResponse> {\n        let payload : OAuth2TokenPayload;\n        if (typeof input === 'string') {\n            // The auth_session_tokens row — not the cache blocklist — is the\n            // authority for refresh-token validity, so skip the active check.\n            payload = await this.tokenVerifier.verify(input, { skipActiveCheck: true });\n        } else {\n            payload = input;\n        }\n\n        if (!payload.jti) {\n            throw JWTError.payloadPropertyInvalid('jti');\n        }\n        if (!payload.session_id) {\n            throw JWTError.payloadPropertyInvalid('session_id');\n        }\n\n        // Explicit kind guard (defense in depth). Authup signs access tokens\n        // and the MFA-pending login ticket with the same keys; only a refresh\n        // token may be exchanged here. The ticket is also rejected implicitly\n        // (it writes no auth_session_tokens row), but do not rely on that\n        // second-order fact alone.\n        if (payload.kind && payload.kind !== OAuth2TokenKind.REFRESH) {\n            throw OAuth2GrantError.invalid('unexpected token kind');\n        }\n\n        const row = await this.sessionTokenRepository.findOneById(payload.jti);\n        if (!row || row.kind !== 'refresh') {\n            // Row missing = expired-and-swept or a pre-rotation legacy token\n            // (hard cutover). Either way the client must re-authenticate.\n            throw OAuth2GrantError.invalid('refresh token is unknown');\n        }\n        if (row.revokedAt) {\n            throw OAuth2GrantError.invalid('refresh token has been revoked');\n        }\n        if (row.sessionId !== payload.session_id) {\n            // The row is written with the token's own session_id and jti is\n            // globally unique, so a mismatch means corruption / jti reuse — fail\n            // closed rather than refresh or revoke against the wrong session.\n            throw OAuth2GrantError.invalid('refresh token session mismatch');\n        }\n\n        const now = new Date();\n        const nowISO = now.toISOString();\n\n        const consumed = await this.sessionTokenRepository.markRefreshConsumed(payload.jti, nowISO);\n        if (!consumed) {\n            // Lost the atomic consume — either a replay of an already-rotated\n            // token, or a benign concurrent-refresh race the grace window\n            // absorbs.\n            const withinGrace = await this.isWithinGraceWindow(payload.jti, now);\n            if (!withinGrace) {\n                await this.revokeFamily(row.sessionId, payload.jti, nowISO);\n                throw OAuth2GrantError.invalid('refresh token replay detected; session revoked');\n            }\n        }\n\n        // Blocklist the presented refresh token in the cache so introspection\n        // reports it inactive. Deliberately NOT a DB revoke — that would set\n        // revoked_at and break the grace window.\n        await this.tokenRepository.setInactive(payload.jti, payload.exp);\n\n        const session = await this.sessionManager.findOneById(payload.session_id);\n        if (!session) {\n            throw JWTError.payloadPropertyInvalid('session_id');\n        }\n\n        await this.sessionManager.verify(session);\n\n        if (options.userAgent) {\n            session.userAgent = options.userAgent;\n        }\n        if (options.ipAddress) {\n            session.ipAddress = options.ipAddress;\n        }\n        await this.sessionManager.refresh(session);\n\n        const [refreshToken, refreshTokenPayload] = await this.refreshTokenIssuer.issue({\n            ...payload,\n            ...(options.confirmation ? { cnf: options.confirmation } : {}),\n            user_agent: session.userAgent,\n            remote_address: session.ipAddress,\n            exp: this.refreshTokenIssuer.buildExp(),\n            parent_id: payload.jti,\n        });\n\n        const [accessToken, accessTokenPayload] = await this.accessTokenIssuer.issue({\n            ...payload,\n            ...(options.confirmation ? { cnf: options.confirmation } : {}),\n            user_agent: session.userAgent,\n            remote_address: session.ipAddress,\n            exp: this.accessTokenIssuer.buildExp(),\n            refresh_token_id: refreshTokenPayload.jti,\n        });\n\n        return buildOAuth2BearerTokenResponse({\n            accessToken,\n            accessTokenPayload,\n            refreshToken,\n            refreshTokenPayload,\n        });\n    }\n\n    /**\n     * The grace window (opt-in via `tokenRefreshGracePeriod`) absorbs benign\n     * concurrent / multi-tab refreshes of the SAME still-current token. It is\n     * scoped to the chain tip: a token whose descendant has already been\n     * consumed is a stale ancestor (a real replay), never a grace re-use.\n     */\n    protected async isWithinGraceWindow(jti: string, now: Date) : Promise<boolean> {\n        if (this.gracePeriod <= 0) {\n            return false;\n        }\n\n        const current = await this.sessionTokenRepository.findOneById(jti);\n        if (\n            !current ||\n            current.revokedAt !== null ||\n            current.consumedAt === null ||\n            (now.getTime() - new Date(current.consumedAt).getTime()) > this.gracePeriod * 1_000\n        ) {\n            return false;\n        }\n\n        // Grace applies ONLY to the most-recent consumed token: a consumed\n        // descendant proves the rotation advanced past this one (stale replay).\n        const chainAdvanced = await this.sessionTokenRepository.hasConsumedChild(jti);\n        return !chainAdvanced;\n    }\n\n    /**\n     * RFC 6819 §5.2.2.3 reaction strategy — revoke the whole token family\n     * (the auth_sessions row) on replay: soft-revoke every session-token row,\n     * blocklist their jtis in the cache, and delete the session so its access\n     * tokens stop verifying on authup's own API.\n     */\n    protected async revokeFamily(sessionId: string, jti: string, at: string) : Promise<void> {\n        this.logger?.warn('OAuth2 refresh token replay detected; revoking session', {\n            sessionId,\n            jti,\n        });\n\n        await this.eventService?.record({\n            scope: EventScope.OAUTH2,\n            name: EventName.REFRESH_REPLAY_DETECTED,\n            refType: EventRefType.SESSION,\n            refId: sessionId,\n            data: { jti },\n        });\n        this.metrics?.recordRefreshReplay();\n\n        // Blocklisting is best-effort (cache) — settle all of them so one cache\n        // failure cannot skip the rest or, worse, abort the session delete\n        // below (the load-bearing part of the revocation). Pin each TTL to the\n        // token's real expiry (unix seconds) so a long-lived refresh token\n        // cannot resurface as active via introspection after the fallback 1h.\n        const rows = await this.sessionTokenRepository.revokeBySessionId(sessionId, at);\n        await Promise.allSettled(rows.map((row) => this.tokenRepository.setInactive(\n            row.id,\n            Math.floor(new Date(row.expiresAt).getTime() / 1_000),\n        )));\n\n        await this.sessionManager.revoke(sessionId);\n    }\n}\n"],"mappings":"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"}

package/dist/core/oauth2/index.mjs

@@ -23,7 +23,6 @@ import { ClientCredentialsGrant } from "./grant-types/client-credentials.mjs";
 import { IdentityGrantType } from "./grant-types/identity.mjs";
 import { PasswordGrantType } from "./grant-types/password.mjs";
 import { OAuth2RefreshTokenGrant } from "./grant-types/refresh-token.mjs";
-import { RobotCredentialsGrant } from "./grant-types/robot-credentials.mjs";
 import "./grant-types/index.mjs";
 import { OAuth2MfaLoginService } from "./mfa-login/module.mjs";
 import "./mfa-login/index.mjs";
@@ -39,4 +38,4 @@ import { OAuth2TokenRevoker } from "./token/revoker/module.mjs";
 import { OAuth2TokenSigner } from "./token/signer/module.mjs";
 import { OAuth2TokenVerifier } from "./token/verifier/module.mjs";
 import "./token/index.mjs";
-export { ClientCredentialsGrant, IdentityGrantType, OAuth2AccessPolicyEvaluator, OAuth2AccessTokenIssuer, OAuth2Authorization, OAuth2AuthorizationCodeIssuer, OAuth2AuthorizationCodeRequestValidator, OAuth2AuthorizationCodeRequestVerifier, OAuth2AuthorizationCodeVerifier, OAuth2AuthorizationStateManager, OAuth2AuthorizeGrant, OAuth2ClientAuthenticator, OAuth2EndSessionRequestValidator, OAuth2EndSessionService, OAuth2MfaLoginService, OAuth2MfaTokenIssuer, OAuth2OpenIDClaimsBuilder, OAuth2OpenIDTokenIssuer, OAuth2RefreshTokenGrant, OAuth2RefreshTokenIssuer, OAuth2ScopeAttributesResolver, OAuth2TokenRevoker, OAuth2TokenSigner, OAuth2TokenVerifier, PasswordGrantType, RobotCredentialsGrant, assertClientGrantAllowed, base64URLEncode, buildOAuth2BearerTokenResponse, buildOAuth2CodeChallenge, buildOAuth2TokenHash, deriveAmrAcr, generateOAuth2CodeVerifier };
+export { ClientCredentialsGrant, IdentityGrantType, OAuth2AccessPolicyEvaluator, OAuth2AccessTokenIssuer, OAuth2Authorization, OAuth2AuthorizationCodeIssuer, OAuth2AuthorizationCodeRequestValidator, OAuth2AuthorizationCodeRequestVerifier, OAuth2AuthorizationCodeVerifier, OAuth2AuthorizationStateManager, OAuth2AuthorizeGrant, OAuth2ClientAuthenticator, OAuth2EndSessionRequestValidator, OAuth2EndSessionService, OAuth2MfaLoginService, OAuth2MfaTokenIssuer, OAuth2OpenIDClaimsBuilder, OAuth2OpenIDTokenIssuer, OAuth2RefreshTokenGrant, OAuth2RefreshTokenIssuer, OAuth2ScopeAttributesResolver, OAuth2TokenRevoker, OAuth2TokenSigner, OAuth2TokenVerifier, PasswordGrantType, assertClientGrantAllowed, base64URLEncode, buildOAuth2BearerTokenResponse, buildOAuth2CodeChallenge, buildOAuth2TokenHash, deriveAmrAcr, generateOAuth2CodeVerifier };

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

@@ -28,24 +28,24 @@ var OAuth2MfaLoginService = class {
 		const clientId = input.clientId ?? void 0;
 		const expiresAt = this.ticketIssuer.buildExp();
 		const session = await this.sessionManager.create({
-			user_agent: options.userAgent,
-			ip_address: options.ipAddress,
-			realm_id: user.realm_id,
-			client_id: clientId,
+			userAgent: options.userAgent,
+			ipAddress: options.ipAddress,
+			realmId: user.realmId,
+			clientId,
 			sub: user.id,
-			sub_kind: IdentityType.USER,
-			mfa_at: null,
-			auth_method: SessionAuthMethod.PASSWORD,
-			expires_at: (/* @__PURE__ */ new Date(expiresAt * 1e3)).toISOString()
+			subKind: IdentityType.USER,
+			mfaAt: null,
+			authMethod: SessionAuthMethod.PASSWORD,
+			expiresAt: (/* @__PURE__ */ new Date(expiresAt * 1e3)).toISOString()
 		});
 		const [token, payload] = await this.ticketIssuer.issue({
 			client_id: clientId,
 			session_id: session.id,
-			user_agent: session.user_agent,
-			remote_address: session.ip_address,
+			user_agent: session.userAgent,
+			remote_address: session.ipAddress,
 			sub: user.id,
 			sub_kind: OAuth2SubKind.USER,
-			realm_id: user.realm_id,
+			realm_id: user.realmId,
 			realm_name: user.realm?.name,
 			...input.confirmation ? { cnf: input.confirmation } : {},
 			exp: expiresAt
@@ -63,14 +63,14 @@ var OAuth2MfaLoginService = class {
 			if (!await this.tokenRepository.claimInactive(ticket.jti, ticket.exp)) throw OAuth2GrantError.invalid("mfa login ticket has already been used");
 		}
 		const issuePayload = {
-			client_id: session.client_id ?? void 0,
+			client_id: session.clientId ?? void 0,
 			session_id: session.id,
-			user_agent: session.user_agent,
-			remote_address: session.ip_address,
+			user_agent: session.userAgent,
+			remote_address: session.ipAddress,
 			scope: ScopeName.GLOBAL,
 			sub: session.sub,
 			sub_kind: OAuth2SubKind.USER,
-			realm_id: session.realm_id,
+			realm_id: session.realmId,
 			realm_name: ticket.realm_name,
 			...ticket.cnf ? { cnf: ticket.cnf } : {},
 			...amrAcr
@@ -82,16 +82,16 @@ var OAuth2MfaLoginService = class {
 			name: EventName.LOGIN,
 			refType: EventRefType.SESSION,
 			refId: session.id,
-			clientId: session.client_id ?? null,
+			clientId: session.clientId ?? null,
 			actorType: IdentityType.USER,
 			actorId: session.sub,
 			actorName: input.userName ?? null,
-			realmId: session.realm_id,
-			requestIpAddress: session.ip_address ?? null,
-			requestUserAgent: session.user_agent ?? null,
+			realmId: session.realmId,
+			requestIpAddress: session.ipAddress ?? null,
+			requestUserAgent: session.userAgent ?? null,
 			data: {
-				grant_type: OAuth2TokenGrant.PASSWORD,
-				session_id: session.id
+				grantType: OAuth2TokenGrant.PASSWORD,
+				sessionId: session.id
 			}
 		});
 		this.metrics?.recordLogin("success");