@openid4vc/openid4vp 0.3.0-alpha-20250707121837 → 0.3.0-alpha-20250711120307

package/dist/index.mjs

@@ -1057,10 +1057,10 @@ import { Oauth2ErrorCodes as Oauth2ErrorCodes5, Oauth2ServerErrorResponseError a
 function parseAuthorizationRequestVersion(request) {
   const requirements = [];
   if (request.verifier_info) {
-    requirements.push([">=", 29]);
+    requirements.push([">=", 100]);
   }
   if (request.verifier_attestations) {
-    requirements.push(["<", 29]);
+    requirements.push(["<", 100]);
   }
   if (request.client_metadata?.vp_formats_supported?.mso_mdoc?.deviceauth_alg_values || request.client_metadata?.vp_formats_supported?.mso_mdoc?.deviceauth_alg_values) {
     requirements.push([">=", 28]);
@@ -1145,12 +1145,12 @@ function parseAuthorizationRequestVersion(request) {
   }
   const lessThanVersions = requirements.filter(([operator]) => operator === "<").map(([_, version]) => version);
   const greaterThanVersions = requirements.filter(([operator]) => operator === ">=").map(([_, version]) => version);
-  const highestPossibleVersion = lessThanVersions.length > 0 ? Math.max(Math.min(...lessThanVersions) - 1, 18) : 29;
+  const highestPossibleVersion = lessThanVersions.length > 0 ? Math.max(Math.min(...lessThanVersions) - 1, 18) : 100;
   const lowestRequiredVersion = greaterThanVersions.length > 0 ? Math.max(...greaterThanVersions) : 18;
   if (lowestRequiredVersion > highestPossibleVersion) {
     throw new Oauth2ServerErrorResponseError6({
       error: Oauth2ErrorCodes5.InvalidRequest,
-      error_description: "Could not infer openid4vp version from the openid4vp request payload."
+      error_description: `Could not infer openid4vp version from the openid4vp request payload. Based on specification requirements, lowest required version is ${lowestRequiredVersion} and highest possible version is ${highestPossibleVersion}`
     });
   }
   return highestPossibleVersion;
@@ -1747,18 +1747,24 @@ import { parseIfJson as parseIfJson2, parseWithErrorHandling as parseWithErrorHa
 
 // src/vp-token/z-vp-token.ts
 import { z as z17 } from "zod";
-var zVpTokenPexEntry = z17.union([z17.string(), z17.record(z17.any())], {
-  message: "pex vp_token entry must be a string or object"
+var zVpTokenPresentationEntry = z17.union([z17.string(), z17.record(z17.any())], {
+  message: "vp_token presentation entry must be string or object"
 });
 var zVpTokenPex = z17.union(
-  [zVpTokenPexEntry, z17.array(zVpTokenPexEntry).nonempty("Must have at least entry in vp_token array")],
+  [
+    zVpTokenPresentationEntry,
+    z17.array(zVpTokenPresentationEntry).nonempty("Must have at least entry in vp_token array")
+  ],
   {
-    message: "pex vp_token must be a string, object or array of strings and objects"
+    message: "pex vp_token must be a string, object or non-empty array of strings and objects"
+  }
+);
+var zVpTokenDcql = z17.record(
+  z17.union([z17.array(zVpTokenPresentationEntry).nonempty(), zVpTokenPresentationEntry]),
+  {
+    message: "dcql vp_token must be an object with keys referencing the dcql credential query id, and values a non-empty array of strings and objects, or string, or object"
   }
 );
-var zVpTokenDcql = z17.record(z17.union([z17.string(), z17.record(z17.any())]), {
-  message: "dcql vp_token must be an object with keys referencing the dcql credential query id, and values the encoded (string or object) presentation"
-});
 var zVpToken = zVpTokenDcql.or(zVpTokenPex);
 
 // src/vp-token/parse-vp-token.ts
@@ -1771,11 +1777,17 @@ function parsePexVpToken(vpToken) {
   return Array.isArray(parsedVpToken) ? parsedVpToken : [parsedVpToken];
 }
 function parseDcqlVpToken(vpToken) {
-  return parseWithErrorHandling5(
+  const parsedVpToken = parseWithErrorHandling5(
     zVpTokenDcql,
     parseIfJson2(vpToken),
     "Could not parse dcql vp_token. Expected an object where the values are encoded presentations"
   );
+  return Object.fromEntries(
+    Object.entries(parsedVpToken).map(([queryId, presentations]) => [
+      queryId,
+      Array.isArray(presentations) ? presentations : [presentations]
+    ])
+  );
 }
 
 // src/authorization-response/validate-authorization-response.ts