@digitalbazaar/oid4-client 5.5.0 → 5.6.1

package/lib/query/presentationExchange.js

@@ -7,6 +7,7 @@ import {JSONPath} from 'jsonpath-plus';
 import jsonpointer from 'json-pointer';
 
 const VALUE_TYPES = new Set(['string', 'number', 'boolean']);
+const SUPPORTED_JWT_ALGS = ['EdDSA', 'Ed25519', 'ES256', 'ES384'];
 
 export function presentationDefinitionToVprGroups({
   presentation_definition, strict = false
@@ -42,27 +43,45 @@ export function vprGroupsToPresentationDefinition({
     input_descriptors
   };
 
+  // if there is more than one group, create submission requirements that will
+  // be populated for each group
+  let defaultGroupId;
+  let submission_requirements;
+  if(groupMap.size > 1) {
+    defaultGroupId = crypto.randomUUID();
+    submission_requirements = [];
+  }
+
+  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"
-  const groups = [...groupMap.values()];
-  for(const queries of groups) {
-    // only `QueryByExample` is convertible
-    const queryByExamples = queries.get('QueryByExample');
-    if(!queryByExamples) {
-      continue;
+  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
+      });
     }
 
+    const queryByExamples = queries.get('QueryByExample');
+
     // for each `QueryByExample`, add another input descriptor (for every
     // "credentialQuery" within it
     for(const queryByExample of queryByExamples) {
       // should only be one `credentialQuery` but handle each one as a new
-      // set of input descriptors
+      // input descriptor
       const all = Array.isArray(queryByExample.credentialQuery) ?
         queryByExample.credentialQuery : [queryByExample.credentialQuery];
       for(const credentialQuery of all) {
         const inputDescriptor = _fromQueryByExampleQuery({
           credentialQuery, prefixJwtVcPath
         });
-        input_descriptors.push(inputDescriptor);
+
         const {acceptedEnvelopes, acceptedCryptosuites} = credentialQuery;
         const shouldAddFormat = acceptedEnvelopes || acceptedCryptosuites;
         if(shouldAddFormat && !inputDescriptor.format) {
@@ -70,18 +89,74 @@ export function vprGroupsToPresentationDefinition({
         }
         if(acceptedEnvelopes?.includes('application/jwt')) {
           inputDescriptor.format.jwt_vc_json = {
-            alg: ['EdDSA', 'Ed25519', 'ES256', 'ES384']
+            alg: SUPPORTED_JWT_ALGS
           };
+          acceptsVcJwt = true;
         }
         if(acceptedCryptosuites) {
+          const cryptosuites = acceptedCryptosuites
+            .map(({cryptosuite}) => cryptosuite);
           inputDescriptor.format.ldp_vc = {
-            proof_type: acceptedCryptosuites.map(({cryptosuite}) => cryptosuite)
+            proof_type: cryptosuites
           };
+          for(const cryptosuite of cryptosuites) {
+            ldpVcProofTypes.add(cryptosuite);
+          }
+        }
+
+        if(submission_requirements) {
+          inputDescriptor.group = [submission_requirements.at(-1).from];
+        }
+
+        input_descriptors.push(inputDescriptor);
+      }
+    }
+
+    const didAuthentications = queries.get('DIDAuthentication');
+    for(const didAuthentication of didAuthentications) {
+      const {acceptedEnvelopes, acceptedCryptosuites} = didAuthentication;
+
+      if(acceptedEnvelopes?.includes('application/jwt')) {
+        acceptsVpJwt = true;
+      }
+      if(acceptedCryptosuites) {
+        const cryptosuites = acceptedCryptosuites
+          .map(({cryptosuite}) => cryptosuite);
+        for(const cryptosuite of cryptosuites) {
+          ldpVpProofTypes.add(cryptosuite);
         }
       }
     }
   }
 
+  // add `submission_requirements` if
+  if(submission_requirements) {
+    presentationDefinition.submission_requirements = submission_requirements;
+  }
+
+  const shouldAddFormat = acceptsVcJwt || acceptsVpJwt ||
+    ldpVcProofTypes.size > 0 || ldpVpProofTypes.size > 0;
+  if(shouldAddFormat && !presentationDefinition.format) {
+    presentationDefinition.format = {};
+  }
+
+  if(acceptsVcJwt) {
+    presentationDefinition.format.jwt_vc_json = {alg: SUPPORTED_JWT_ALGS};
+  }
+  if(acceptsVpJwt) {
+    presentationDefinition.format.jwt_vp = {alg: SUPPORTED_JWT_ALGS};
+    presentationDefinition.format.jwt_vp_json = {alg: SUPPORTED_JWT_ALGS};
+  }
+
+  if(ldpVcProofTypes.size > 0) {
+    const proof_type = [...ldpVcProofTypes];
+    presentationDefinition.format.ldp_vc = {proof_type};
+  }
+  if(ldpVpProofTypes.size > 0) {
+    const proof_type = [...ldpVpProofTypes];
+    presentationDefinition.format.ldp_vp = {proof_type};
+  }
+
   return presentationDefinition;
 }
 

package/package.json

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