@openid4vc/oauth2 0.5.2-alpha-20260701132441 → 0.5.2

package/dist/index.d.mts

@@ -9,6 +9,7 @@ declare const zAuthorizationServerMetadata: z.ZodObject<{
     client_secret_basic: "client_secret_basic";
     client_secret_post: "client_secret_post";
     attest_jwt_client_auth: "attest_jwt_client_auth";
+    attest_jwt_client_auth_dpop: "attest_jwt_client_auth_dpop";
     client_secret_jwt: "client_secret_jwt";
     private_key_jwt: "private_key_jwt";
   }>, z.ZodString]>>>;
@@ -24,6 +25,7 @@ declare const zAuthorizationServerMetadata: z.ZodObject<{
     client_secret_basic: "client_secret_basic";
     client_secret_post: "client_secret_post";
     attest_jwt_client_auth: "attest_jwt_client_auth";
+    attest_jwt_client_auth_dpop: "attest_jwt_client_auth_dpop";
     client_secret_jwt: "client_secret_jwt";
     private_key_jwt: "private_key_jwt";
   }>, z.ZodString]>>>;
@@ -32,6 +34,9 @@ declare const zAuthorizationServerMetadata: z.ZodObject<{
   interactive_authorization_endpoint: z.ZodOptional<z.ZodURL>;
   require_interactive_authorization_request: z.ZodOptional<z.ZodBoolean>;
   'pre-authorized_grant_anonymous_access_supported': z.ZodOptional<z.ZodBoolean>;
+  client_attestation_signing_alg_values_supported: z.ZodOptional<z.ZodArray<z.ZodString>>;
+  client_attestation_pop_signing_alg_values_supported: z.ZodOptional<z.ZodArray<z.ZodString>>;
+  challenge_endpoint: z.ZodOptional<z.ZodURL>;
   client_attestation_pop_nonce_required: z.ZodOptional<z.ZodBoolean>;
   authorization_response_iss_parameter_supported: z.ZodOptional<z.ZodBoolean>;
 }, z.core.$loose>;
@@ -42,6 +47,7 @@ declare enum SupportedClientAuthenticationMethod {
   ClientSecretBasic = "client_secret_basic",
   ClientSecretPost = "client_secret_post",
   ClientAttestationJwt = "attest_jwt_client_auth",
+  ClientAttestationJwtDpop = "attest_jwt_client_auth_dpop",
   None = "none"
 }
 interface ClientAuthenticationDynamicOptions {
@@ -119,6 +125,11 @@ declare function clientAuthenticationAnonymous(): ClientAuthenticationCallback;
 interface ClientAuthenticationClientAttestationJwtOptions {
   clientAttestationJwt: string;
   callbacks: Pick<CallbackContext, 'signJwt' | 'generateRandom'>;
+  /**
+   * Challenge provided by the authorization server (e.g. obtained from its `challenge_endpoint`)
+   * to include in the Client Attestation PoP JWT.
+   */
+  challenge?: string;
 }
 /**
  * Client authentication using `attest_jwt_client_auth` option.
@@ -667,7 +678,6 @@ declare enum SupportedAuthenticationScheme {
 //#endregion
 //#region src/client-attestation/z-client-attestation.d.ts
 declare const zClientAttestationJwtPayload: z.ZodObject<{
-  iss: z.ZodString;
   sub: z.ZodString;
   exp: z.ZodNumber;
   cnf: z.ZodObject<{
@@ -703,6 +713,7 @@ declare const zClientAttestationJwtPayload: z.ZodObject<{
   }, z.core.$loose>;
   wallet_name: z.ZodOptional<z.ZodString>;
   wallet_link: z.ZodOptional<z.ZodURL>;
+  iss: z.ZodOptional<z.ZodString>;
   aud: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodArray<z.ZodString>]>>;
   iat: z.ZodOptional<z.ZodNumber>;
   nbf: z.ZodOptional<z.ZodNumber>;
@@ -750,10 +761,11 @@ declare const zClientAttestationJwtHeader: z.ZodObject<{
 }, z.core.$loose>;
 type ClientAttestationJwtHeader = z.infer<typeof zClientAttestationJwtHeader>;
 declare const zClientAttestationPopJwtPayload: z.ZodObject<{
-  iss: z.ZodString;
   aud: z.ZodUnion<readonly [z.ZodURL, z.ZodArray<z.ZodURL>]>;
   jti: z.ZodString;
+  challenge: z.ZodOptional<z.ZodString>;
   nonce: z.ZodOptional<z.ZodString>;
+  iss: z.ZodOptional<z.ZodString>;
   iat: z.ZodOptional<z.ZodNumber>;
   exp: z.ZodOptional<z.ZodNumber>;
   nbf: z.ZodOptional<z.ZodNumber>;
@@ -897,7 +909,6 @@ declare function verifyClientAttestationJwt(options: VerifyClientAttestationJwtO
   };
   payload: {
     [x: string]: unknown;
-    iss: string;
     sub: string;
     exp: number;
     cnf: {
@@ -936,6 +947,7 @@ declare function verifyClientAttestationJwt(options: VerifyClientAttestationJwtO
     };
     wallet_name?: string | undefined;
     wallet_link?: string | undefined;
+    iss?: string | undefined;
     aud?: string | string[] | undefined;
     iat?: number | undefined;
     nbf?: number | undefined;
@@ -956,9 +968,13 @@ interface CreateClientAttestationJwtOptions {
    */
   expiresAt: Date;
   /**
-   * Issuer of the client attestation, usually identifier of the client backend
+   * Issuer of the client attestation, usually the identifier of the client backend (attester).
+   *
+   * The `iss` claim was removed from the Client Attestation JWT in draft 08, so it is only
+   * included in the payload when this option is provided. It is also useful for interoperability
+   * with <= draft 07 verifiers and when the KID is a relative DID URL to the issuer.
    */
-  issuer: string;
+  issuer?: string;
   /**
    * The client id of the client instance.
    */
@@ -1003,15 +1019,13 @@ interface VerifyClientAttestationOptions {
 //#region src/client-attestation/client-attestation-pop.d.ts
 interface RequestClientAttestationOptions {
   /**
-   * Dpop nonce to use for constructing the client attestation pop jwt
+   * The challenge provided by the authorization server to include in the client attestation pop jwt.
    */
-  nonce?: string;
+  challenge?: string;
   /**
-   * Expiration time of the client attestation pop jwt.
-   *
-   * @default 5 minutes after issuance date
+   * @deprecated Renamed to `challenge` in draft 06. If `challenge` is not set, this value is used.
    */
-  expiresAt?: Date;
+  nonce?: string;
   /**
    * The client attestation jwt to create the pop for.
    */
@@ -1029,11 +1043,26 @@ interface VerifyClientAttestationPopJwtOptions {
    */
   clientAttestationPopJwt: string;
   /**
-   * The issuer identifier of the authorization server handling the client attestation
+   * The issuer identifier of the authorization server handling the client attestation.
    */
   authorizationServer: string;
   /**
-   * Expected nonce in the payload. If not provided the nonce won't be validated.
+   * The expected value of the `aud` claim. Defaults to `authorizationServer`.
+   *
+   * draft 09 allows the audience to be a Resource Server identifier URL in addition to the
+   * authorization server issuer URL; set this when verifying a PoP JWT at a resource server.
+   */
+  expectedAudience?: string;
+  /**
+   * Expected challenge in the payload. If not provided the challenge won't be validated.
+   *
+   * Matched against the `challenge` claim (draft 06+) and, for backwards compatibility,
+   * the legacy `nonce` claim.
+   */
+  expectedChallenge?: string;
+  /**
+   * @deprecated Renamed to `expectedChallenge` in draft 06. If `expectedChallenge` is not set,
+   * this value is used.
    */
   expectedNonce?: string;
   /**
@@ -1102,10 +1131,11 @@ declare function verifyClientAttestationPopJwt(options: VerifyClientAttestationP
   };
   payload: {
     [x: string]: unknown;
-    iss: string;
     aud: string | string[];
     jti: string;
+    challenge?: string | undefined;
     nonce?: string | undefined;
+    iss?: string | undefined;
     iat?: number | undefined;
     exp?: number | undefined;
     nbf?: number | undefined;
@@ -2773,6 +2803,9 @@ declare function getAuthorizationServerMetadataFromList(authorizationServersMeta
   interactive_authorization_endpoint?: string | undefined;
   require_interactive_authorization_request?: boolean | undefined;
   'pre-authorized_grant_anonymous_access_supported'?: boolean | undefined;
+  client_attestation_signing_alg_values_supported?: string[] | undefined;
+  client_attestation_pop_signing_alg_values_supported?: string[] | undefined;
+  challenge_endpoint?: string | undefined;
   client_attestation_pop_nonce_required?: boolean | undefined;
   authorization_response_iss_parameter_supported?: boolean | undefined;
 };
@@ -2981,6 +3014,9 @@ declare class Oauth2AuthorizationServer {
     interactive_authorization_endpoint?: string | undefined;
     require_interactive_authorization_request?: boolean | undefined;
     'pre-authorized_grant_anonymous_access_supported'?: boolean | undefined;
+    client_attestation_signing_alg_values_supported?: string[] | undefined;
+    client_attestation_pop_signing_alg_values_supported?: string[] | undefined;
+    challenge_endpoint?: string | undefined;
     client_attestation_pop_nonce_required?: boolean | undefined;
     authorization_response_iss_parameter_supported?: boolean | undefined;
   };
@@ -3220,7 +3256,6 @@ declare class Oauth2AuthorizationServer {
       };
       payload: {
         [x: string]: unknown;
-        iss: string;
         sub: string;
         exp: number;
         cnf: {
@@ -3259,6 +3294,7 @@ declare class Oauth2AuthorizationServer {
         };
         wallet_name?: string | undefined;
         wallet_link?: string | undefined;
+        iss?: string | undefined;
         aud?: string | string[] | undefined;
         iat?: number | undefined;
         nbf?: number | undefined;
@@ -3311,10 +3347,11 @@ declare class Oauth2AuthorizationServer {
       };
       payload: {
         [x: string]: unknown;
-        iss: string;
         aud: string | string[];
         jti: string;
+        challenge?: string | undefined;
         nonce?: string | undefined;
+        iss?: string | undefined;
         iat?: number | undefined;
         exp?: number | undefined;
         nbf?: number | undefined;
@@ -3507,6 +3544,9 @@ declare class Oauth2Client {
     interactive_authorization_endpoint?: string | undefined;
     require_interactive_authorization_request?: boolean | undefined;
     'pre-authorized_grant_anonymous_access_supported'?: boolean | undefined;
+    client_attestation_signing_alg_values_supported?: string[] | undefined;
+    client_attestation_pop_signing_alg_values_supported?: string[] | undefined;
+    challenge_endpoint?: string | undefined;
     client_attestation_pop_nonce_required?: boolean | undefined;
     authorization_response_iss_parameter_supported?: boolean | undefined;
   } | null>;

package/dist/index.mjs

@@ -1021,7 +1021,6 @@ var Oauth2ServerErrorResponseError = class extends Oauth2Error {
 const oauthClientAttestationHeader = z.literal("OAuth-Client-Attestation").value;
 const zClientAttestationJwtPayload = z.object({
 	...zJwtPayload.shape,
-	iss: z.string(),
 	sub: z.string(),
 	exp: zNumericDate,
 	cnf: z.object({ jwk: zJwk }).loose(),
@@ -1033,11 +1032,12 @@ const zClientAttestationJwtHeader = z.object({
 	typ: z.literal("oauth-client-attestation+jwt")
 }).loose();
 const oauthClientAttestationPopHeader = z.literal("OAuth-Client-Attestation-PoP").value;
+z.literal("OAuth-Client-Attestation-Challenge").value;
 const zClientAttestationPopJwtPayload = z.object({
 	...zJwtPayload.shape,
-	iss: z.string(),
 	aud: z.union([zHttpsUrl, z.array(zHttpsUrl)]),
 	jti: z.string(),
+	challenge: z.optional(z.string()),
 	nonce: z.optional(z.string())
 }).loose();
 const zClientAttestationPopJwtHeader = z.object({
@@ -1052,7 +1052,9 @@ async function verifyClientAttestationPopJwt(options) {
 		headerSchema: zClientAttestationPopJwtHeader,
 		payloadSchema: zClientAttestationPopJwtPayload
 	});
-	if (payload.iss !== options.clientAttestation.payload.sub) throw new Oauth2Error(`Client Attestation Pop jwt contains 'iss' (client_id) value '${payload.iss}', but expected 'sub' value from client attestation '${options.clientAttestation.payload.sub}'`);
+	if (payload.iss !== void 0 && payload.iss !== options.clientAttestation.payload.sub) throw new Oauth2Error(`Client Attestation Pop jwt contains 'iss' (client_id) value '${payload.iss}', but expected 'sub' value from client attestation '${options.clientAttestation.payload.sub}'`);
+	const expectedChallenge = options.expectedChallenge ?? options.expectedNonce;
+	if (expectedChallenge !== void 0 && expectedChallenge !== (payload.challenge ?? payload.nonce)) throw new Oauth2Error("Client Attestation Pop jwt 'challenge' does not match expected value.");
 	const { signer } = await verifyJwt({
 		signer: {
 			alg: header.alg,
@@ -1061,9 +1063,8 @@ async function verifyClientAttestationPopJwt(options) {
 		},
 		now: options.now,
 		header,
-		expectedNonce: options.expectedNonce,
 		payload,
-		expectedAudience: options.authorizationServer,
+		expectedAudience: options.expectedAudience ?? options.authorizationServer,
 		compact: options.clientAttestationPopJwt,
 		verifyJwtCallback: options.callbacks.verifyJwt,
 		errorMessage: "client attestation pop jwt verification failed",
@@ -1090,14 +1091,11 @@ async function createClientAttestationPopJwt(options) {
 		typ: "oauth-client-attestation-pop+jwt",
 		alg: signer.alg
 	});
-	const expiresAt = options.expiresAt ?? addSecondsToDate(options.issuedAt ?? /* @__PURE__ */ new Date(), 60);
 	const payload = parseWithErrorHandling(zClientAttestationPopJwtPayload, {
 		aud: options.authorizationServer,
-		iss: clientAttestation.payload.sub,
-		iat: dateToSeconds(options.issuedAt),
-		exp: dateToSeconds(expiresAt),
+		iat: dateToSeconds(options.issuedAt ?? /* @__PURE__ */ new Date()),
 		jti: encodeToBase64Url(await options.callbacks.generateRandom(32)),
-		nonce: options.nonce,
+		challenge: options.challenge ?? options.nonce,
 		...options.additionalPayload
 	});
 	const { jwt } = await options.callbacks.signJwt(signer, {
@@ -1138,7 +1136,7 @@ async function createClientAttestationJwt(options) {
 		...jwtHeaderFromJwtSigner(options.signer)
 	});
 	const payload = parseWithErrorHandling(zClientAttestationJwtPayload, {
-		iss: options.issuer,
+		...options.issuer ? { iss: options.issuer } : {},
 		iat: dateToSeconds(options.issuedAt),
 		exp: dateToSeconds(options.expiresAt),
 		sub: options.clientId,
@@ -1706,6 +1704,7 @@ let SupportedClientAuthenticationMethod = /* @__PURE__ */ function(SupportedClie
 	SupportedClientAuthenticationMethod["ClientSecretBasic"] = "client_secret_basic";
 	SupportedClientAuthenticationMethod["ClientSecretPost"] = "client_secret_post";
 	SupportedClientAuthenticationMethod["ClientAttestationJwt"] = "attest_jwt_client_auth";
+	SupportedClientAuthenticationMethod["ClientAttestationJwtDpop"] = "attest_jwt_client_auth_dpop";
 	SupportedClientAuthenticationMethod["None"] = "none";
 	return SupportedClientAuthenticationMethod;
 }({});
@@ -1785,7 +1784,8 @@ function clientAuthenticationClientAttestationJwt(options) {
 		const clientAttestationPop = await createClientAttestationPopJwt({
 			authorizationServer: authorizationServerMetadata.issuer,
 			callbacks: options.callbacks,
-			clientAttestation: options.clientAttestationJwt
+			clientAttestation: options.clientAttestationJwt,
+			challenge: options.challenge
 		});
 		headers.set(oauthClientAttestationHeader, options.clientAttestationJwt);
 		headers.set(oauthClientAttestationPopHeader, clientAttestationPop);
@@ -2169,6 +2169,7 @@ const knownClientAuthenticationMethod = z.enum([
 	"client_secret_basic",
 	"client_secret_post",
 	"attest_jwt_client_auth",
+	"attest_jwt_client_auth_dpop",
 	"client_secret_jwt",
 	"private_key_jwt"
 ]);
@@ -2190,6 +2191,9 @@ const zAuthorizationServerMetadata = z.object({
 	interactive_authorization_endpoint: z.optional(zHttpsUrl),
 	require_interactive_authorization_request: z.optional(z.boolean()),
 	"pre-authorized_grant_anonymous_access_supported": z.optional(z.boolean()),
+	client_attestation_signing_alg_values_supported: z.optional(z.array(zAlgValueNotNone)),
+	client_attestation_pop_signing_alg_values_supported: z.optional(z.array(zAlgValueNotNone)),
+	challenge_endpoint: z.optional(zHttpsUrl),
 	client_attestation_pop_nonce_required: z.boolean().optional(),
 	authorization_response_iss_parameter_supported: z.boolean().optional()
 }).loose().refine(({ introspection_endpoint_auth_methods_supported: methodsSupported, introspection_endpoint_auth_signing_alg_values_supported: algValuesSupported }) => {