@openid4vc/openid4vp 0.3.0-alpha-20250321115806 → 0.3.0-alpha-20250321120839

package/dist/index.mjs

@@ -158,11 +158,10 @@ var zOpenid4vpAuthorizationRequestDcApi = zOpenid4vpAuthorizationRequest.pick({
   scope: z5.never().optional()
   // TODO: should we disallow any properties specifically, such as redirect_uri and response_uri?
 });
-function isOpenid4vpResponseModeDcApi(responseMode) {
-  return responseMode !== void 0 && zOpenid4vpResponseModeDcApi.options.includes(responseMode);
-}
 function isOpenid4vpAuthorizationRequestDcApi(request) {
-  return typeof request.response_mode === "string" && isOpenid4vpResponseModeDcApi(request.response_mode);
+  return request.response_mode !== void 0 && zOpenid4vpResponseModeDcApi.options.includes(
+    request.response_mode
+  );
 }
 
 // src/client-identifier-scheme/z-client-id-scheme.ts
@@ -189,13 +188,7 @@ var zLegacyClientIdScheme = z6.enum([
 
 // src/client-identifier-scheme/parse-client-identifier-scheme.ts
 function getOpenid4vpClientId(options) {
-  if (isOpenid4vpResponseModeDcApi(options.responseMode)) {
-    if (options.legacyClientIdScheme) {
-      throw new Oauth2ServerErrorResponseError({
-        error: Oauth2ErrorCodes.InvalidRequest,
-        error_description: `Failed to parse client identifier. response_mode '${options.responseMode}' is not supported in combination with 'client_id_scheme'`
-      });
-    }
+  if (isOpenid4vpAuthorizationRequestDcApi(options.authorizationRequestPayload)) {
     if (!options.origin) {
       throw new Oauth2ServerErrorResponseError({
         error: Oauth2ErrorCodes.InvalidRequest,
@@ -203,45 +196,44 @@ function getOpenid4vpClientId(options) {
       });
     }
     return {
-      clientId: options.clientId ?? `web-origin:${options.origin}`
+      clientId: options.authorizationRequestPayload.client_id ?? `web-origin:${options.origin}`
     };
   }
-  if (!options.clientId) {
+  if (!options.authorizationRequestPayload.client_id) {
     throw new Oauth2ServerErrorResponseError({
       error: Oauth2ErrorCodes.InvalidRequest,
-      error_description: `Failed to parse client identifier. Missing required client_id parameter for response_mode '${options.responseMode}'.`
+      error_description: `Failed to parse client identifier. Missing required client_id parameter for response_mode '${options.authorizationRequestPayload.response_mode}'.`
     });
   }
-  if (options.legacyClientIdScheme) {
-    const parsedClientIdScheme = zLegacyClientIdScheme.safeParse(options.legacyClientIdScheme);
+  if (options.authorizationRequestPayload.client_id_scheme) {
+    const parsedClientIdScheme = zLegacyClientIdScheme.safeParse(options.authorizationRequestPayload.client_id_scheme);
     if (!parsedClientIdScheme.success) {
       throw new Oauth2ServerErrorResponseError({
         error: Oauth2ErrorCodes.InvalidRequest,
-        error_description: `Failed to parse client identifier. Unsupported client_id_scheme value '${options.legacyClientIdScheme}'.`
+        error_description: `Failed to parse client identifier. Unsupported client_id_scheme value '${options.authorizationRequestPayload.client_id_scheme}'.`
       });
     }
     const clientIdScheme = parsedClientIdScheme.data === "entity_id" ? "https" : parsedClientIdScheme.data;
     if (clientIdScheme === "https" || clientIdScheme === "did" || clientIdScheme === "pre-registered") {
-      return { clientId: options.clientId };
+      return { clientId: options.authorizationRequestPayload.client_id };
     }
     return {
-      clientId: `${clientIdScheme}:${options.clientId}`,
-      legacyClientId: options.clientId
+      clientId: `${clientIdScheme}:${options.authorizationRequestPayload.client_id}`,
+      legacyClientId: options.authorizationRequestPayload.client_id
     };
   }
   return {
-    clientId: options.clientId
+    clientId: options.authorizationRequestPayload.client_id
   };
 }
 function parseClientIdentifier(options, parserConfig) {
-  const { authorizationRequestPayload, jar } = options;
+  const { authorizationRequestPayload, jar, origin } = options;
   const parserConfigWithDefaults = {
     supportedSchemes: parserConfig?.supportedSchemes || Object.values(zClientIdScheme.options)
   };
   const { clientId, legacyClientId } = getOpenid4vpClientId({
-    responseMode: authorizationRequestPayload.response_mode,
-    clientId: authorizationRequestPayload.client_id,
-    legacyClientIdScheme: authorizationRequestPayload.client_id_scheme
+    authorizationRequestPayload,
+    origin
   });
   const colonIndex = clientId.indexOf(":");
   if (colonIndex === -1) {
@@ -1598,9 +1590,7 @@ async function parseOpenid4vpAuthorizationResponse(options) {
   const { authorizationResponse, callbacks, authorizationRequestPayload, origin } = options;
   const expectedClientId = getOpenid4vpClientId({
     origin,
-    responseMode: authorizationRequestPayload.response_mode,
-    clientId: authorizationRequestPayload.client_id,
-    legacyClientIdScheme: authorizationRequestPayload.client_id_scheme
+    authorizationRequestPayload
   });
   if (authorizationResponse.response) {
     return parseJarmAuthorizationResponse({