@openid4vc/oauth2 0.5.3-alpha-20260702123119 → 0.5.3

package/dist/index.d.mts

@@ -90,6 +90,13 @@ interface ClientAuthenticationCallbackOptions {
    * You can modify this object
    */
   body: Record<string, unknown>;
+  /**
+   * A fresh Client Attestation challenge provided by the authorization server (draft 09), e.g.
+   * obtained from the `OAuth-Client-Attestation-Challenge` response header when retrying after a
+   * `use_attestation_challenge` error. When set it takes precedence over any statically configured
+   * challenge for methods that include a Client Attestation PoP.
+   */
+  attestationChallenge?: string;
 }
 /**
  * Callback method to determine the client authentication for a request.
@@ -606,6 +613,12 @@ type AccessTokenErrorResponse = z.infer<typeof zAccessTokenErrorResponse>;
 interface RetrieveAccessTokenReturn {
   accessTokenResponse: AccessTokenResponse;
   dpop?: RequestDpopOptions;
+  /**
+   * A fresh Client Attestation challenge provided by the authorization server in the
+   * `OAuth-Client-Attestation-Challenge` response header (draft 09 §6.2). If present, the client
+   * should use this challenge for the next Client Attestation PoP JWT.
+   */
+  attestationChallenge?: string;
 }
 interface RetrieveAccessTokenBaseOptions {
   /**
@@ -772,6 +785,10 @@ declare const zClientAttestationJwtHeader: z.ZodObject<{
   trust_chain: z.ZodOptional<z.ZodTuple<[z.ZodString], z.ZodString>>;
 }, z.core.$loose>;
 type ClientAttestationJwtHeader = z.infer<typeof zClientAttestationJwtHeader>;
+declare const zClientAttestationChallengeResponse: z.ZodObject<{
+  attestation_challenge: z.ZodString;
+}, z.core.$loose>;
+type ClientAttestationChallengeResponse = z.infer<typeof zClientAttestationChallengeResponse>;
 declare const zClientAttestationPopJwtPayload: z.ZodObject<{
   aud: z.ZodUnion<readonly [z.ZodURL, z.ZodArray<z.ZodURL>]>;
   jti: z.ZodString;
@@ -1724,6 +1741,7 @@ declare enum Oauth2ErrorCodes {
   InvalidScope = "invalid_scope",
   InvalidDpopProof = "invalid_dpop_proof",
   UseDpopNonce = "use_dpop_nonce",
+  UseAttestationChallenge = "use_attestation_challenge",
   RedirectToWeb = "redirect_to_web",
   InvalidSession = "invalid_session",
   InsufficientAuthorization = "insufficient_authorization",
@@ -2107,6 +2125,65 @@ declare function verifyAuthorizationResponse({
   authorizationServerMetadata
 }: VerifyAuthorizationResponseOptions): void;
 //#endregion
+//#region src/client-attestation/client-attestation-challenge.d.ts
+interface RequestClientAttestationChallengeOptions {
+  /**
+   * Metadata of the authorization server from which to request the challenge.
+   */
+  authorizationServerMetadata: AuthorizationServerMetadata;
+  /**
+   * Callback context
+   */
+  callbacks: Pick<CallbackContext, 'fetch'>;
+}
+/**
+ * Request a fresh Client Attestation challenge from the authorization server's `challenge_endpoint`.
+ *
+ * @see https://www.ietf.org/archive/id/draft-ietf-oauth-attestation-based-client-auth-09.html#section-6.1
+ *
+ * @throws {Oauth2Error} if the authorization server has no `challenge_endpoint`
+ * @throws {InvalidFetchResponseError} if the request failed
+ * @throws {ValidationError} if the response could not be validated
+ */
+declare function requestClientAttestationChallenge(options: RequestClientAttestationChallengeOptions): Promise<{
+  challenge: string;
+}>;
+/**
+ * Extract the Client Attestation challenge from the `OAuth-Client-Attestation-Challenge` response header.
+ */
+declare function extractClientAttestationChallengeFromHeaders(headers: FetchHeaders): string | null;
+interface ShouldRetryAuthorizationServerRequestWithClientAttestationChallengeOptions {
+  /**
+   * The error response that will be evaluated for the 'use_attestation_challenge' error to determine
+   * whether the request should be retried using a fresh client attestation challenge.
+   */
+  errorResponse: Oauth2ErrorResponse;
+  /**
+   * The headers returned in the response. The 'OAuth-Client-Attestation-Challenge' header will be
+   * extracted if the error response indicates so. Will throw an error if the 'error' in the response is
+   * 'use_attestation_challenge' but the headers do not contain the 'OAuth-Client-Attestation-Challenge'
+   * header value.
+   */
+  responseHeaders: FetchHeaders;
+}
+declare function shouldRetryAuthorizationServerRequestWithClientAttestationChallenge(options: ShouldRetryAuthorizationServerRequestWithClientAttestationChallengeOptions): {
+  readonly retry: false;
+  readonly attestationChallenge?: undefined;
+} | {
+  readonly retry: true;
+  readonly attestationChallenge: string;
+};
+/**
+ * Wraps an authorization server request so that it is retried once with a fresh Client Attestation
+ * challenge when the server responds with the 'use_attestation_challenge' error and provides a
+ * challenge in the 'OAuth-Client-Attestation-Challenge' response header.
+ *
+ * Mirrors {@link authorizationServerRequestWithDpopRetry} for DPoP nonces.
+ */
+declare function authorizationServerRequestWithClientAttestationChallengeRetry<T>(options: {
+  request: (attestationChallenge?: string) => Promise<T>;
+}): Promise<T>;
+//#endregion
 //#region src/common/algorithm/algorithm-transform.d.ts
 /**
  * Algorithm transformation utilities for JWA and COSE
@@ -3591,6 +3668,14 @@ declare class Oauth2Client {
       authorization_code: string;
     };
   }>;
+  /**
+   * Request a fresh Client Attestation challenge from the authorization server's `challenge_endpoint`
+   * (draft 09). The returned challenge can be passed to `clientAuthenticationClientAttestationJwt` so
+   * it is included in the Client Attestation PoP JWT.
+   */
+  requestClientAttestationChallenge(options: Omit<RequestClientAttestationChallengeOptions, 'callbacks'>): Promise<{
+    challenge: string;
+  }>;
   createAuthorizationRequestUrl(options: Omit<CreateAuthorizationRequestUrlOptions, 'callbacks'>): Promise<{
     authorizationRequestUrl: string;
     pkce: CreatePkceReturn | undefined;
@@ -3964,5 +4049,5 @@ declare function verifyResourceRequest(options: VerifyResourceRequestOptions): P
   authorizationServer: string;
 }>;
 //#endregion
-export { type AccessTokenErrorResponse, type AccessTokenProfileJwtPayload, type AccessTokenResponse, type AuthorizationChallengeErrorResponse, type AuthorizationChallengeRequest, type AuthorizationChallengeResponse, type AuthorizationCodeGrantIdentifier, AuthorizationErrorResponse, type AuthorizationRequest, AuthorizationResponse, type AuthorizationServerMetadata, type CalculateJwkThumbprintOptions, type CallbackContext, type ClientAttestationJwtHeader, type ClientAttestationJwtPayload, type ClientAttestationPopJwtHeader, type ClientAttestationPopJwtPayload, type ClientAuthenticationCallback, type ClientAuthenticationCallbackOptions, type ClientAuthenticationClientAttestationJwtOptions, type ClientAuthenticationClientSecretBasicOptions, type ClientAuthenticationClientSecretPostOptions, type ClientAuthenticationDynamicOptions, type ClientAuthenticationNoneOptions, type ClientCredentialsGrantIdentifier, type CreateAuthorizationRequestUrlOptions, type CreateClientAttestationJwtOptions, type CreateJarAuthorizationRequestOptions, type CreatePkceReturn, type CreatePushedAuthorizationErrorResponseOptions, type CreatePushedAuthorizationResponseOptions, type DecodeJwtHeaderResult, type DecodeJwtOptions, type DecodeJwtResult, type DecryptJweCallback, type DecryptJweCallbackOptions, type EncryptJweCallback, type GenerateRandomCallback, HashAlgorithm, type HashCallback, type HttpMethod, IdTokenJwtHeader, IdTokenJwtPayload, InvalidFetchResponseError, type JarAuthorizationRequest, type JarRequestObjectPayload, type JweEncryptor, type Jwk, type JwkSet, type JwtHeader, type JwtPayload, type JwtSigner, type JwtSignerCustom, type JwtSignerDid, type JwtSignerJwk, type JwtSignerWithJwk, type JwtSignerX5c, Oauth2AuthorizationServer, type Oauth2AuthorizationServerOptions, Oauth2Client, Oauth2ClientAuthorizationChallengeError, Oauth2ClientErrorResponseError, type Oauth2ClientOptions, Oauth2Error, Oauth2ErrorCodes, type Oauth2ErrorOptions, type Oauth2ErrorResponse, Oauth2JwtParseError, Oauth2JwtVerificationError, Oauth2ResourceServer, type Oauth2ResourceServerOptions, Oauth2ResourceUnauthorizedError, Oauth2ServerErrorResponseError, type Oid4vcTsConfig, type ParseAuthorizationChallengeRequestOptions, type ParseAuthorizationChallengeRequestResult, type ParseAuthorizationRequestOptions, type ParseAuthorizationRequestResult, ParseAuthorizationResponseOptions, type ParsePushedAuthorizationRequestOptions, type ParsePushedAuthorizationRequestResult, type ParsedJarRequest, type ParsedJarRequestOptions, PkceCodeChallengeMethod, type PreAuthorizedCodeGrantIdentifier, type PushedAuthorizationRequestUriPrefix, type RefreshTokenGrantIdentifier, type RequestClientAttestationOptions, type RequestDpopOptions, type RequestLike, type ResourceRequestOptions, type ResourceRequestResponseNotOk, type ResourceRequestResponseOk, type RetrieveAuthorizationCodeAccessTokenOptions, type RetrieveClientCredentialsAccessTokenOptions, type RetrievePreAuthorizedCodeAccessTokenOptions, type SignJwtCallback, SupportedAuthenticationScheme, SupportedClientAuthenticationMethod, type TokenIntrospectionResponse, type VerifiedClientAttestationJwt, type VerifiedJarRequest, type VerifyAccessTokenRequestReturn, type VerifyAuthorizationChallengeRequestOptions, type VerifyAuthorizationChallengeRequestReturn, type VerifyAuthorizationRequestOptions, type VerifyAuthorizationRequestReturn, VerifyAuthorizationResponseOptions, type VerifyDataIntegrityProofCallback, VerifyIdTokenJwtOptions, type VerifyJarRequestOptions, type VerifyJwtCallback, type VerifyPushedAuthorizationRequestOptions, type VerifyPushedAuthorizationRequestReturn, type VerifyResourceRequestOptions, type WwwAuthenticateHeaderChallenge, authorizationCodeGrantIdentifier, authorizationServerRequestWithDpopRetry, calculateJwkThumbprint, clientAuthenticationAnonymous, clientAuthenticationClientAttestationJwt, clientAuthenticationClientSecretBasic, clientAuthenticationClientSecretPost, clientAuthenticationDynamic, clientAuthenticationNone, clientCredentialsGrantIdentifier, createClientAttestationJwt, createDpopHeadersForRequest, createJarAuthorizationRequest, createPkce, decodeJwt, decodeJwtHeader, defaultGrantTypesSupported, extractDpopNonceFromHeaders, fetchAuthorizationServerMetadata, fetchJwks, fetchWellKnownMetadata, fullySpecifiedCoseAlgorithmArrayToJwaSignatureAlgorithmArray, fullySpecifiedCoseAlgorithmToJwaSignatureAlgorithm, getAuthorizationServerMetadataFromList, getGlobalConfig, getGrantTypesSupported, isJarAuthorizationRequest, isJwkInSet, jwaSignatureAlgorithmArrayToFullySpecifiedCoseAlgorithmArray, jwaSignatureAlgorithmToFullySpecifiedCoseAlgorithm, jwtAuthorizationRequestJwtHeaderTyp, jwtHeaderFromJwtSigner, jwtSignerFromJwt, parseAuthorizationRequest, parseAuthorizationResponseRedirectUrl, parseJarRequest, parsePushedAuthorizationRequestUriReferenceValue, preAuthorizedCodeGrantIdentifier, pushedAuthorizationRequestUriPrefix, refreshTokenGrantIdentifier, resourceRequest, setGlobalConfig, signedAuthorizationRequestJwtHeaderTyp, validateJarRequestParams, verifyAuthorizationRequest, verifyAuthorizationResponse, verifyClientAttestationJwt, verifyIdTokenJwt, verifyJarRequest, verifyJwt, verifyResourceRequest, zAlgValueNotNone, zAuthorizationCodeGrantIdentifier, zAuthorizationErrorResponse, zAuthorizationRequest, zAuthorizationResponse, zAuthorizationResponseFromUriParams, zAuthorizationServerMetadata, zClientCredentialsGrantIdentifier, zCompactJwe, zCompactJwt, zIdTokenJwtHeader, zIdTokenJwtPayload, zJarAuthorizationRequest, zJarRequestObjectPayload, zJwk, zJwkSet, zJwtHeader, zJwtPayload, zOauth2ErrorResponse, zPreAuthorizedCodeGrantIdentifier, zPushedAuthorizationRequestUriPrefix, zRefreshTokenGrantIdentifier };
+export { type AccessTokenErrorResponse, type AccessTokenProfileJwtPayload, type AccessTokenResponse, type AuthorizationChallengeErrorResponse, type AuthorizationChallengeRequest, type AuthorizationChallengeResponse, type AuthorizationCodeGrantIdentifier, AuthorizationErrorResponse, type AuthorizationRequest, AuthorizationResponse, type AuthorizationServerMetadata, type CalculateJwkThumbprintOptions, type CallbackContext, type ClientAttestationChallengeResponse, type ClientAttestationJwtHeader, type ClientAttestationJwtPayload, type ClientAttestationPopJwtHeader, type ClientAttestationPopJwtPayload, type ClientAuthenticationCallback, type ClientAuthenticationCallbackOptions, type ClientAuthenticationClientAttestationJwtOptions, type ClientAuthenticationClientSecretBasicOptions, type ClientAuthenticationClientSecretPostOptions, type ClientAuthenticationDynamicOptions, type ClientAuthenticationNoneOptions, type ClientCredentialsGrantIdentifier, type CreateAuthorizationRequestUrlOptions, type CreateClientAttestationJwtOptions, type CreateJarAuthorizationRequestOptions, type CreatePkceReturn, type CreatePushedAuthorizationErrorResponseOptions, type CreatePushedAuthorizationResponseOptions, type DecodeJwtHeaderResult, type DecodeJwtOptions, type DecodeJwtResult, type DecryptJweCallback, type DecryptJweCallbackOptions, type EncryptJweCallback, type GenerateRandomCallback, HashAlgorithm, type HashCallback, type HttpMethod, IdTokenJwtHeader, IdTokenJwtPayload, InvalidFetchResponseError, type JarAuthorizationRequest, type JarRequestObjectPayload, type JweEncryptor, type Jwk, type JwkSet, type JwtHeader, type JwtPayload, type JwtSigner, type JwtSignerCustom, type JwtSignerDid, type JwtSignerJwk, type JwtSignerWithJwk, type JwtSignerX5c, Oauth2AuthorizationServer, type Oauth2AuthorizationServerOptions, Oauth2Client, Oauth2ClientAuthorizationChallengeError, Oauth2ClientErrorResponseError, type Oauth2ClientOptions, Oauth2Error, Oauth2ErrorCodes, type Oauth2ErrorOptions, type Oauth2ErrorResponse, Oauth2JwtParseError, Oauth2JwtVerificationError, Oauth2ResourceServer, type Oauth2ResourceServerOptions, Oauth2ResourceUnauthorizedError, Oauth2ServerErrorResponseError, type Oid4vcTsConfig, type ParseAuthorizationChallengeRequestOptions, type ParseAuthorizationChallengeRequestResult, type ParseAuthorizationRequestOptions, type ParseAuthorizationRequestResult, ParseAuthorizationResponseOptions, type ParsePushedAuthorizationRequestOptions, type ParsePushedAuthorizationRequestResult, type ParsedJarRequest, type ParsedJarRequestOptions, PkceCodeChallengeMethod, type PreAuthorizedCodeGrantIdentifier, type PushedAuthorizationRequestUriPrefix, type RefreshTokenGrantIdentifier, type RequestClientAttestationChallengeOptions, type RequestClientAttestationOptions, type RequestDpopOptions, type RequestLike, type ResourceRequestOptions, type ResourceRequestResponseNotOk, type ResourceRequestResponseOk, type RetrieveAuthorizationCodeAccessTokenOptions, type RetrieveClientCredentialsAccessTokenOptions, type RetrievePreAuthorizedCodeAccessTokenOptions, type ShouldRetryAuthorizationServerRequestWithClientAttestationChallengeOptions, type SignJwtCallback, SupportedAuthenticationScheme, SupportedClientAuthenticationMethod, type TokenIntrospectionResponse, type VerifiedClientAttestationJwt, type VerifiedJarRequest, type VerifyAccessTokenRequestReturn, type VerifyAuthorizationChallengeRequestOptions, type VerifyAuthorizationChallengeRequestReturn, type VerifyAuthorizationRequestOptions, type VerifyAuthorizationRequestReturn, VerifyAuthorizationResponseOptions, type VerifyDataIntegrityProofCallback, VerifyIdTokenJwtOptions, type VerifyJarRequestOptions, type VerifyJwtCallback, type VerifyPushedAuthorizationRequestOptions, type VerifyPushedAuthorizationRequestReturn, type VerifyResourceRequestOptions, type WwwAuthenticateHeaderChallenge, authorizationCodeGrantIdentifier, authorizationServerRequestWithClientAttestationChallengeRetry, authorizationServerRequestWithDpopRetry, calculateJwkThumbprint, clientAuthenticationAnonymous, clientAuthenticationClientAttestationJwt, clientAuthenticationClientSecretBasic, clientAuthenticationClientSecretPost, clientAuthenticationDynamic, clientAuthenticationNone, clientCredentialsGrantIdentifier, createClientAttestationJwt, createDpopHeadersForRequest, createJarAuthorizationRequest, createPkce, decodeJwt, decodeJwtHeader, defaultGrantTypesSupported, extractClientAttestationChallengeFromHeaders, extractDpopNonceFromHeaders, fetchAuthorizationServerMetadata, fetchJwks, fetchWellKnownMetadata, fullySpecifiedCoseAlgorithmArrayToJwaSignatureAlgorithmArray, fullySpecifiedCoseAlgorithmToJwaSignatureAlgorithm, getAuthorizationServerMetadataFromList, getGlobalConfig, getGrantTypesSupported, isJarAuthorizationRequest, isJwkInSet, jwaSignatureAlgorithmArrayToFullySpecifiedCoseAlgorithmArray, jwaSignatureAlgorithmToFullySpecifiedCoseAlgorithm, jwtAuthorizationRequestJwtHeaderTyp, jwtHeaderFromJwtSigner, jwtSignerFromJwt, parseAuthorizationRequest, parseAuthorizationResponseRedirectUrl, parseJarRequest, parsePushedAuthorizationRequestUriReferenceValue, preAuthorizedCodeGrantIdentifier, pushedAuthorizationRequestUriPrefix, refreshTokenGrantIdentifier, requestClientAttestationChallenge, resourceRequest, setGlobalConfig, shouldRetryAuthorizationServerRequestWithClientAttestationChallenge, signedAuthorizationRequestJwtHeaderTyp, validateJarRequestParams, verifyAuthorizationRequest, verifyAuthorizationResponse, verifyClientAttestationJwt, verifyIdTokenJwt, verifyJarRequest, verifyJwt, verifyResourceRequest, zAlgValueNotNone, zAuthorizationCodeGrantIdentifier, zAuthorizationErrorResponse, zAuthorizationRequest, zAuthorizationResponse, zAuthorizationResponseFromUriParams, zAuthorizationServerMetadata, zClientAttestationChallengeResponse, zClientCredentialsGrantIdentifier, zCompactJwe, zCompactJwt, zIdTokenJwtHeader, zIdTokenJwtPayload, zJarAuthorizationRequest, zJarRequestObjectPayload, zJwk, zJwkSet, zJwtHeader, zJwtPayload, zOauth2ErrorResponse, zPreAuthorizedCodeGrantIdentifier, zPushedAuthorizationRequestUriPrefix, zRefreshTokenGrantIdentifier };
 //# sourceMappingURL=index.d.mts.map

package/dist/index.mjs

@@ -977,6 +977,7 @@ let Oauth2ErrorCodes = /* @__PURE__ */ function(Oauth2ErrorCodes) {
 	Oauth2ErrorCodes["InvalidScope"] = "invalid_scope";
 	Oauth2ErrorCodes["InvalidDpopProof"] = "invalid_dpop_proof";
 	Oauth2ErrorCodes["UseDpopNonce"] = "use_dpop_nonce";
+	Oauth2ErrorCodes["UseAttestationChallenge"] = "use_attestation_challenge";
 	Oauth2ErrorCodes["RedirectToWeb"] = "redirect_to_web";
 	Oauth2ErrorCodes["InvalidSession"] = "invalid_session";
 	Oauth2ErrorCodes["InsufficientAuthorization"] = "insufficient_authorization";
@@ -1032,7 +1033,8 @@ 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 oauthClientAttestationChallengeHeader = z.literal("OAuth-Client-Attestation-Challenge").value;
+const zClientAttestationChallengeResponse = z.object({ attestation_challenge: z.string() }).loose();
 const zClientAttestationPopJwtPayload = z.object({
 	...zJwtPayload.shape,
 	aud: z.union([zHttpsUrl, z.array(zHttpsUrl)]),
@@ -1677,6 +1679,72 @@ function verifyAuthorizationResponse({ authorizationResponse, authorizationServe
 	});
 }
 //#endregion
+//#region src/error/Oauth2ClientErrorResponseError.ts
+var Oauth2ClientErrorResponseError = class extends Oauth2Error {
+	constructor(message, errorResponse, response) {
+		super(`${message}\n${JSON.stringify(errorResponse, null, 2)}`);
+		this.errorResponse = errorResponse;
+		this.response = response.clone();
+	}
+};
+//#endregion
+//#region src/client-attestation/client-attestation-challenge.ts
+/**
+* Request a fresh Client Attestation challenge from the authorization server's `challenge_endpoint`.
+*
+* @see https://www.ietf.org/archive/id/draft-ietf-oauth-attestation-based-client-auth-09.html#section-6.1
+*
+* @throws {Oauth2Error} if the authorization server has no `challenge_endpoint`
+* @throws {InvalidFetchResponseError} if the request failed
+* @throws {ValidationError} if the response could not be validated
+*/
+async function requestClientAttestationChallenge(options) {
+	const fetchWithZod = createZodFetcher(options.callbacks.fetch);
+	const { authorizationServerMetadata } = options;
+	const challengeEndpoint = authorizationServerMetadata.challenge_endpoint;
+	if (!challengeEndpoint) throw new Oauth2Error(`Unable to request client attestation challenge. Authorization server '${authorizationServerMetadata.issuer}' has no 'challenge_endpoint'`);
+	const { response, result } = await fetchWithZod(zClientAttestationChallengeResponse, ContentType.Json, challengeEndpoint, { method: "POST" });
+	if (!response.ok || !result) throw new InvalidFetchResponseError$1(`Unable to request client attestation challenge from challenge endpoint '${challengeEndpoint}'. Received response with status ${response.status}`, await response.clone().text(), response);
+	if (!result.success) throw new ValidationError("Error validating client attestation challenge response", result.error);
+	return { challenge: result.data.attestation_challenge };
+}
+/**
+* Extract the Client Attestation challenge from the `OAuth-Client-Attestation-Challenge` response header.
+*/
+function extractClientAttestationChallengeFromHeaders(headers) {
+	return headers.get(oauthClientAttestationChallengeHeader);
+}
+function shouldRetryAuthorizationServerRequestWithClientAttestationChallenge(options) {
+	if (options.errorResponse.error !== "use_attestation_challenge") return { retry: false };
+	const attestationChallenge = extractClientAttestationChallengeFromHeaders(options.responseHeaders);
+	if (!attestationChallenge) throw new Oauth2Error(`Error response error contains error 'use_attestation_challenge' but the response headers do not include a valid '${oauthClientAttestationChallengeHeader}' header value.`);
+	return {
+		retry: true,
+		attestationChallenge
+	};
+}
+/**
+* Wraps an authorization server request so that it is retried once with a fresh Client Attestation
+* challenge when the server responds with the 'use_attestation_challenge' error and provides a
+* challenge in the 'OAuth-Client-Attestation-Challenge' response header.
+*
+* Mirrors {@link authorizationServerRequestWithDpopRetry} for DPoP nonces.
+*/
+async function authorizationServerRequestWithClientAttestationChallengeRetry(options) {
+	try {
+		return await options.request();
+	} catch (error) {
+		if (error instanceof Oauth2ClientErrorResponseError) {
+			const challengeRetry = shouldRetryAuthorizationServerRequestWithClientAttestationChallenge({
+				responseHeaders: error.response.headers,
+				errorResponse: error.errorResponse
+			});
+			if (challengeRetry.retry) return options.request(challengeRetry.attestationChallenge);
+		}
+		throw error;
+	}
+}
+//#endregion
 //#region src/z-grant-type.ts
 const zPreAuthorizedCodeGrantIdentifier = z.literal("urn:ietf:params:oauth:grant-type:pre-authorized_code");
 const preAuthorizedCodeGrantIdentifier = zPreAuthorizedCodeGrantIdentifier.value;
@@ -1780,12 +1848,12 @@ function clientAuthenticationAnonymous() {
 * Client authentication using `attest_jwt_client_auth` option.
 */
 function clientAuthenticationClientAttestationJwt(options) {
-	return async ({ headers, authorizationServerMetadata }) => {
+	return async ({ headers, authorizationServerMetadata, attestationChallenge }) => {
 		const clientAttestationPop = await createClientAttestationPopJwt({
 			authorizationServer: authorizationServerMetadata.issuer,
 			callbacks: options.callbacks,
 			clientAttestation: options.clientAttestationJwt,
-			challenge: options.challenge
+			challenge: attestationChallenge ?? options.challenge
 		});
 		headers.set(oauthClientAttestationHeader, options.clientAttestationJwt);
 		headers.set(oauthClientAttestationPopHeader, clientAttestationPop);
@@ -1929,15 +1997,6 @@ function fullySpecifiedCoseAlgorithmArrayToJwaSignatureAlgorithmArray(coseAlgs,
 	}).filter((alg) => alg !== void 0);
 }
 //#endregion
-//#region src/error/Oauth2ClientErrorResponseError.ts
-var Oauth2ClientErrorResponseError = class extends Oauth2Error {
-	constructor(message, errorResponse, response) {
-		super(`${message}\n${JSON.stringify(errorResponse, null, 2)}`);
-		this.errorResponse = errorResponse;
-		this.response = response.clone();
-	}
-};
-//#endregion
 //#region src/dpop/dpop-retry.ts
 async function authorizationServerRequestWithDpopRetry(options) {
 	try {
@@ -2923,7 +2982,7 @@ async function retrieveAccessToken(options) {
 	const supportedGrantTypes = getGrantTypesSupported(options.authorizationServerMetadata.grant_types_supported);
 	if (!supportedGrantTypes.includes(accessTokenRequest.grant_type)) throw new Oauth2Error(`The authorization server '${options.authorizationServerMetadata.issuer}' does not support the '${accessTokenRequest.grant_type}' grant type. Supported grant types are: ${supportedGrantTypes.join(", ")}`);
 	if (accessTokenRequest.tx_code) accessTokenRequest.user_pin = accessTokenRequest.tx_code;
-	return await authorizationServerRequestWithDpopRetry({
+	return await authorizationServerRequestWithClientAttestationChallengeRetry({ request: (attestationChallenge) => authorizationServerRequestWithDpopRetry({
 		dpop: options.dpop,
 		request: async (dpop) => {
 			const dpopHeaders = dpop ? await createDpopHeadersForRequest({
@@ -2945,7 +3004,8 @@ async function retrieveAccessToken(options) {
 				authorizationServerMetadata: options.authorizationServerMetadata,
 				body: accessTokenRequest,
 				contentType: ContentType.XWwwFormUrlencoded,
-				headers
+				headers,
+				attestationChallenge
 			});
 			const { response, result } = await fetchWithZod(zAccessTokenResponse, ContentType.Json, options.authorizationServerMetadata.token_endpoint, {
 				body: objectToQueryParams(accessTokenRequest).toString(),
@@ -2964,10 +3024,11 @@ async function retrieveAccessToken(options) {
 					...dpop,
 					nonce: dpopNonce
 				} : void 0,
+				attestationChallenge: extractClientAttestationChallengeFromHeaders(response.headers) ?? void 0,
 				accessTokenResponse: result.data
 			};
 		}
-	});
+	}) });
 }
 //#endregion
 //#region src/authorization-challenge/send-authorization-challenge.ts
@@ -3284,6 +3345,17 @@ var Oauth2Client = class {
 			callbacks: this.options.callbacks
 		});
 	}
+	/**
+	* Request a fresh Client Attestation challenge from the authorization server's `challenge_endpoint`
+	* (draft 09). The returned challenge can be passed to `clientAuthenticationClientAttestationJwt` so
+	* it is included in the Client Attestation PoP JWT.
+	*/
+	requestClientAttestationChallenge(options) {
+		return requestClientAttestationChallenge({
+			...options,
+			callbacks: this.options.callbacks
+		});
+	}
 	async createAuthorizationRequestUrl(options) {
 		return createAuthorizationRequestUrl({
 			authorizationServerMetadata: options.authorizationServerMetadata,
@@ -3510,6 +3582,6 @@ async function verifyResourceRequest(options) {
 	};
 }
 //#endregion
-export { HashAlgorithm, InvalidFetchResponseError, Oauth2AuthorizationServer, Oauth2Client, Oauth2ClientAuthorizationChallengeError, Oauth2ClientErrorResponseError, Oauth2Error, Oauth2ErrorCodes, Oauth2JwtParseError, Oauth2JwtVerificationError, Oauth2ResourceServer, Oauth2ResourceUnauthorizedError, Oauth2ServerErrorResponseError, PkceCodeChallengeMethod, SupportedAuthenticationScheme, SupportedClientAuthenticationMethod, authorizationCodeGrantIdentifier, authorizationServerRequestWithDpopRetry, calculateJwkThumbprint, clientAuthenticationAnonymous, clientAuthenticationClientAttestationJwt, clientAuthenticationClientSecretBasic, clientAuthenticationClientSecretPost, clientAuthenticationDynamic, clientAuthenticationNone, clientCredentialsGrantIdentifier, createClientAttestationJwt, createDpopHeadersForRequest, createJarAuthorizationRequest, createPkce, decodeJwt, decodeJwtHeader, defaultGrantTypesSupported, extractDpopNonceFromHeaders, fetchAuthorizationServerMetadata, fetchJwks, fetchWellKnownMetadata, fullySpecifiedCoseAlgorithmArrayToJwaSignatureAlgorithmArray, fullySpecifiedCoseAlgorithmToJwaSignatureAlgorithm, getAuthorizationServerMetadataFromList, getGlobalConfig, getGrantTypesSupported, isJarAuthorizationRequest, isJwkInSet, jwaSignatureAlgorithmArrayToFullySpecifiedCoseAlgorithmArray, jwaSignatureAlgorithmToFullySpecifiedCoseAlgorithm, jwtAuthorizationRequestJwtHeaderTyp, jwtHeaderFromJwtSigner, jwtSignerFromJwt, parseAuthorizationRequest, parseAuthorizationResponseRedirectUrl, parseJarRequest, parsePushedAuthorizationRequestUriReferenceValue, preAuthorizedCodeGrantIdentifier, pushedAuthorizationRequestUriPrefix, refreshTokenGrantIdentifier, resourceRequest, setGlobalConfig, signedAuthorizationRequestJwtHeaderTyp, validateJarRequestParams, verifyAuthorizationRequest, verifyAuthorizationResponse, verifyClientAttestationJwt, verifyIdTokenJwt, verifyJarRequest, verifyJwt, verifyResourceRequest, zAlgValueNotNone, zAuthorizationCodeGrantIdentifier, zAuthorizationErrorResponse, zAuthorizationRequest, zAuthorizationResponse, zAuthorizationResponseFromUriParams, zAuthorizationServerMetadata, zClientCredentialsGrantIdentifier, zCompactJwe, zCompactJwt, zIdTokenJwtHeader, zIdTokenJwtPayload, zJarAuthorizationRequest, zJarRequestObjectPayload, zJwk, zJwkSet, zJwtHeader, zJwtPayload, zOauth2ErrorResponse, zPreAuthorizedCodeGrantIdentifier, zPushedAuthorizationRequestUriPrefix, zRefreshTokenGrantIdentifier };
+export { HashAlgorithm, InvalidFetchResponseError, Oauth2AuthorizationServer, Oauth2Client, Oauth2ClientAuthorizationChallengeError, Oauth2ClientErrorResponseError, Oauth2Error, Oauth2ErrorCodes, Oauth2JwtParseError, Oauth2JwtVerificationError, Oauth2ResourceServer, Oauth2ResourceUnauthorizedError, Oauth2ServerErrorResponseError, PkceCodeChallengeMethod, SupportedAuthenticationScheme, SupportedClientAuthenticationMethod, authorizationCodeGrantIdentifier, authorizationServerRequestWithClientAttestationChallengeRetry, authorizationServerRequestWithDpopRetry, calculateJwkThumbprint, clientAuthenticationAnonymous, clientAuthenticationClientAttestationJwt, clientAuthenticationClientSecretBasic, clientAuthenticationClientSecretPost, clientAuthenticationDynamic, clientAuthenticationNone, clientCredentialsGrantIdentifier, createClientAttestationJwt, createDpopHeadersForRequest, createJarAuthorizationRequest, createPkce, decodeJwt, decodeJwtHeader, defaultGrantTypesSupported, extractClientAttestationChallengeFromHeaders, extractDpopNonceFromHeaders, fetchAuthorizationServerMetadata, fetchJwks, fetchWellKnownMetadata, fullySpecifiedCoseAlgorithmArrayToJwaSignatureAlgorithmArray, fullySpecifiedCoseAlgorithmToJwaSignatureAlgorithm, getAuthorizationServerMetadataFromList, getGlobalConfig, getGrantTypesSupported, isJarAuthorizationRequest, isJwkInSet, jwaSignatureAlgorithmArrayToFullySpecifiedCoseAlgorithmArray, jwaSignatureAlgorithmToFullySpecifiedCoseAlgorithm, jwtAuthorizationRequestJwtHeaderTyp, jwtHeaderFromJwtSigner, jwtSignerFromJwt, parseAuthorizationRequest, parseAuthorizationResponseRedirectUrl, parseJarRequest, parsePushedAuthorizationRequestUriReferenceValue, preAuthorizedCodeGrantIdentifier, pushedAuthorizationRequestUriPrefix, refreshTokenGrantIdentifier, requestClientAttestationChallenge, resourceRequest, setGlobalConfig, shouldRetryAuthorizationServerRequestWithClientAttestationChallenge, signedAuthorizationRequestJwtHeaderTyp, validateJarRequestParams, verifyAuthorizationRequest, verifyAuthorizationResponse, verifyClientAttestationJwt, verifyIdTokenJwt, verifyJarRequest, verifyJwt, verifyResourceRequest, zAlgValueNotNone, zAuthorizationCodeGrantIdentifier, zAuthorizationErrorResponse, zAuthorizationRequest, zAuthorizationResponse, zAuthorizationResponseFromUriParams, zAuthorizationServerMetadata, zClientAttestationChallengeResponse, zClientCredentialsGrantIdentifier, zCompactJwe, zCompactJwt, zIdTokenJwtHeader, zIdTokenJwtPayload, zJarAuthorizationRequest, zJarRequestObjectPayload, zJwk, zJwkSet, zJwtHeader, zJwtPayload, zOauth2ErrorResponse, zPreAuthorizedCodeGrantIdentifier, zPushedAuthorizationRequestUriPrefix, zRefreshTokenGrantIdentifier };
 
 //# sourceMappingURL=index.mjs.map