@digitalbazaar/oid4-client 5.6.1 → 5.6.2

package/lib/query/presentationExchange.js

@@ -43,31 +43,32 @@ export function vprGroupsToPresentationDefinition({
     input_descriptors
   };
 
-  // if there is more than one group, create submission requirements that will
-  // be populated for each group
-  let defaultGroupId;
+  // in VPR, each group is an 'AND' and just one group must be selected; to
+  // map this to presentation exchange groups, each `input_descriptor`
+  // represents a VPR group, but they are all part of the same PR group, and
+  // the `submission_requirements` will indicate that just one
+  // `input_descriptor` is to be selected via `{pick: 1, count: 1}`
+  let peGroupId;
   let submission_requirements;
   if(groupMap.size > 1) {
-    defaultGroupId = crypto.randomUUID();
-    submission_requirements = [];
+    peGroupId = crypto.randomUUID();
+    submission_requirements = [{
+      rule: 'pick',
+      count: 1,
+      from: peGroupId
+    }];
   }
 
+  // keep track of whether VPR queries express accepted cryptosuites/envelopes
+  // to add this to `presentation_definition.format` at the end
   let acceptsVpJwt = false;
   let acceptsVcJwt = false;
-
   const ldpVpProofTypes = new Set();
   const ldpVcProofTypes = new Set();
-  // note: same group ID is logical "AND" and different group ID is "OR"
-  for(const [groupId, queries] of groupMap.entries()) {
-    // add to submission_requirements if present
-    if(submission_requirements) {
-      submission_requirements.push({
-        rule: 'pick',
-        count: 1,
-        from: groupId ?? defaultGroupId
-      });
-    }
 
+  // note: same group ID is logical "AND" and different group ID is "OR"
+  const groups = [...groupMap.values()];
+  for(const queries of groups) {
     const queryByExamples = queries.get('QueryByExample');
 
     // for each `QueryByExample`, add another input descriptor (for every
@@ -105,7 +106,7 @@ export function vprGroupsToPresentationDefinition({
         }
 
         if(submission_requirements) {
-          inputDescriptor.group = [submission_requirements.at(-1).from];
+          inputDescriptor.group = [peGroupId];
         }
 
         input_descriptors.push(inputDescriptor);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digitalbazaar/oid4-client",
-  "version": "5.6.1",
+  "version": "5.6.2",
   "description": "An OID4 (VC + VP) client",
   "homepage": "https://github.com/digitalbazaar/oid4-client",
   "author": {