@openid4vc/oauth2 0.4.2-alpha-20251208111456 → 0.4.2-alpha-20251209051809

package/dist/index.d.mts

@@ -1427,9 +1427,9 @@ declare const zAuthorizationChallengeRequest: z$1.ZodObject<{
   client_id: z$1.ZodOptional<z$1.ZodString>;
   auth_session: z$1.ZodOptional<z$1.ZodString>;
   presentation_during_issuance_session: z$1.ZodOptional<z$1.ZodString>;
+  scope: z$1.ZodOptional<z$1.ZodString>;
   redirect_uri: z$1.ZodOptional<z$1.ZodURL>;
   resource: z$1.ZodOptional<z$1.ZodURL>;
-  scope: z$1.ZodOptional<z$1.ZodString>;
   state: z$1.ZodOptional<z$1.ZodString>;
   issuer_state: z$1.ZodOptional<z$1.ZodString>;
   dpop_jkt: z$1.ZodOptional<z$1.ZodBase64URL>;

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { ContentType, Headers, InvalidFetchResponseError, InvalidFetchResponseError as InvalidFetchResponseError$1, URL, ValidationError, addSecondsToDate, createFetcher, createZodFetcher, dateToSeconds, decodeBase64, decodeUtf8String, encodeToBase64Url, encodeToUtf8String, encodeWwwAuthenticateHeader, formatZodError, getGlobalConfig, joinUriParts, objectToQueryParams, parseWithErrorHandling, parseWwwAuthenticateHeader, setGlobalConfig, stringToJsonWithErrorHandling, zHttpMethod, zHttpsUrl, zInteger } from "@openid4vc/utils";
+import { ContentType, Headers, InvalidFetchResponseError, InvalidFetchResponseError as InvalidFetchResponseError$1, OpenId4VcBaseError, URL, ValidationError, addSecondsToDate, createFetcher, createZodFetcher, dateToSeconds, decodeBase64, decodeUtf8String, encodeToBase64Url, encodeToUtf8String, encodeWwwAuthenticateHeader, formatZodError, getGlobalConfig, joinUriParts, objectToQueryParams, parseWithErrorHandling, parseWwwAuthenticateHeader, setGlobalConfig, stringToJsonWithErrorHandling, zHttpMethod, zHttpsUrl, zInteger } from "@openid4vc/utils";
 import z$1, { z } from "zod";
 
 //#region src/callbacks.ts
@@ -347,9 +347,13 @@ async function verifyJwt(options) {
 	} };
 }
 
+//#endregion
+//#region ../utils/src/error/OpenId4VcBaseError.ts
+var OpenId4VcBaseError$1 = class extends Error {};
+
 //#endregion
 //#region ../utils/src/error/ValidationError.ts
-var ValidationError$1 = class extends Error {
+var ValidationError$1 = class extends OpenId4VcBaseError$1 {
 	constructor(message, zodError) {
 		super(message);
 		this.message = `${message}\n${zodError ? z$1.prettifyError(zodError) : ""}`;
@@ -1606,9 +1610,17 @@ async function fetchAuthorizationServerMetadata(issuer, fetch) {
 	const openIdConfigurationWellKnownMetadataUrl = joinUriParts(issuer, [wellKnownOpenIdConfigurationServerSuffix]);
 	const authorizationServerWellKnownMetadataUrl = joinUriParts(parsedIssuerUrl.origin, [wellKnownAuthorizationServerSuffix, parsedIssuerUrl.pathname]);
 	const nonCompliantAuthorizationServerWellKnownMetadataUrl = joinUriParts(issuer, [wellKnownAuthorizationServerSuffix]);
-	let authorizationServerResult = await fetchWellKnownMetadata(authorizationServerWellKnownMetadataUrl, zAuthorizationServerMetadata, { fetch });
-	if (!authorizationServerResult && nonCompliantAuthorizationServerWellKnownMetadataUrl !== authorizationServerWellKnownMetadataUrl) authorizationServerResult = await fetchWellKnownMetadata(nonCompliantAuthorizationServerWellKnownMetadataUrl, zAuthorizationServerMetadata, { fetch });
-	if (!authorizationServerResult) authorizationServerResult = await fetchWellKnownMetadata(openIdConfigurationWellKnownMetadataUrl, zAuthorizationServerMetadata, { fetch });
+	let firstError = null;
+	let authorizationServerResult = await fetchWellKnownMetadata(authorizationServerWellKnownMetadataUrl, zAuthorizationServerMetadata, { fetch }).catch((error) => {
+		if (error instanceof OpenId4VcBaseError) throw error;
+		firstError = error;
+	});
+	if (!authorizationServerResult && nonCompliantAuthorizationServerWellKnownMetadataUrl !== authorizationServerWellKnownMetadataUrl) authorizationServerResult = await fetchWellKnownMetadata(nonCompliantAuthorizationServerWellKnownMetadataUrl, zAuthorizationServerMetadata, { fetch }).catch((error) => {
+		if (error instanceof OpenId4VcBaseError) throw error;
+	});
+	if (!authorizationServerResult) authorizationServerResult = await fetchWellKnownMetadata(openIdConfigurationWellKnownMetadataUrl, zAuthorizationServerMetadata, { fetch }).catch((error) => {
+		throw firstError ?? error;
+	});
 	if (authorizationServerResult && authorizationServerResult.issuer !== issuer) throw new Oauth2Error(`The 'issuer' parameter '${authorizationServerResult.issuer}' in the well known authorization server metadata at '${authorizationServerWellKnownMetadataUrl}' does not match the provided issuer '${issuer}'.`);
 	return authorizationServerResult;
 }