@digitalbazaar/oid4-client 5.6.3 → 5.7.0

package/lib/convert/index.js

@@ -84,9 +84,10 @@ export function fromVpr({
       const cryptosuites = new Set();
       const envelopes = new Set();
       for(const query of didAuthnQuery) {
-        query.acceptedCryptosuites?.forEach(
-          ({cryptosuite}) => cryptosuites.add(cryptosuite));
-        query.acceptedEnvelopes?.forEach(envelope => envelopes.add(envelope));
+        _getCryptosuites(query.acceptedCryptosuites)
+          .forEach(cryptosuites.add, cryptosuites);
+        _getEnvelopes(query.acceptedEnvelopes)
+          .forEach(envelopes.add, envelopes);
       }
       // convert last DID authn query w/merged cryptosuites and envelopes
       const query = structuredClone(didAuthnQuery.at(-1));
@@ -269,6 +270,20 @@ function _strictCheckVprGroups({groupMap, queryFormats}) {
   }
 }
 
+function _getCryptosuites(acceptedCryptosuites) {
+  // array elements can be '<cryptosuite>' or {cryptosuite: '<cryptosuite>'}
+  return acceptedCryptosuites
+    ?.filter(e => e && (typeof e === 'string' || e.cryptosuite))
+    ?.map(e => typeof e === 'string' ? e : e.cryptosuite) ?? [];
+}
+
+function _getEnvelopes(acceptedEnvelopes) {
+  // array elements can be '<mediaType>' or {mediaType: '<mediaType>'}
+  return acceptedEnvelopes
+    ?.filter(e => e && (typeof e === 'string' || e.mediaType))
+    ?.map(e => typeof e === 'string' ? e : e.mediaType) ?? [];
+}
+
 function _fromDIDAuthenticationQuery({query, strict = false}) {
   const vp_formats = {};
   const vp_formats_supported = {};
@@ -278,9 +293,8 @@ function _fromDIDAuthenticationQuery({query, strict = false}) {
     vp_formats_supported
   };
 
-  const cryptosuites = query.acceptedCryptosuites?.map(
-    ({cryptosuite}) => cryptosuite);
-  if(cryptosuites?.length > 0) {
+  const cryptosuites = _getCryptosuites(query.acceptedCryptosuites);
+  if(cryptosuites.length > 0) {
     // legacy (before OID4VP 1.0)
     client_metadata.vp_formats.ldp_vp = {
       proof_type: cryptosuites
@@ -297,24 +311,25 @@ function _fromDIDAuthenticationQuery({query, strict = false}) {
     }
   }
 
-  if(query.acceptedEnvelopes?.length > 0) {
-    for(const envelope of query.acceptedEnvelopes) {
-      if(envelope === 'application/jwt') {
+  const envelopes = _getEnvelopes(query.acceptedEnvelopes);
+  if(envelopes.length > 0) {
+    for(const mediaType of envelopes) {
+      if(mediaType === 'application/jwt') {
         // legacy (before OID4VP 1.0)
         vp_formats.jwt_vp = vp_formats.jwt_vp_json = {
           alg: ['EdDSA', 'Ed25519', 'ES256', 'ES384']
         };
         // OID4VP 1.0+
         vp_formats_supported.jwt_vc_json = {};
-      } else if(envelope === 'application/mdl' ||
-        envelope === 'application/mdoc') {
+      } else if(mediaType === 'application/mdl' ||
+        mediaType === 'application/mdoc') {
         // legacy (before OID4VP 1.0)
         vp_formats.mso_mdoc = {
           alg: ['EdDSA', 'ES256']
         };
         // OID4VP 1.0+
         vp_formats_supported.mso_mdoc = {};
-      } else if(envelope === 'application/dc+sd-jwt') {
+      } else if(mediaType === 'application/dc+sd-jwt') {
         // legacy (before OID4VP 1.0)
         vp_formats['dc+sd-jwt'] = {};
         // OID4VP 1.0+

package/lib/query/presentationExchange.js

@@ -84,19 +84,21 @@ export function vprGroupsToPresentationDefinition({
         });
 
         const {acceptedEnvelopes, acceptedCryptosuites} = credentialQuery;
-        const shouldAddFormat = acceptedEnvelopes || acceptedCryptosuites;
+        const envelopes = _getEnvelopes(acceptedEnvelopes);
+        const cryptosuites = _getCryptosuites(acceptedCryptosuites);
+
+        const shouldAddFormat =
+          envelopes?.length > 0 || cryptosuites?.length > 0;
         if(shouldAddFormat && !inputDescriptor.format) {
           inputDescriptor.format = {};
         }
-        if(acceptedEnvelopes?.includes('application/jwt')) {
+        if(envelopes?.includes('application/jwt')) {
           inputDescriptor.format.jwt_vc_json = {
             alg: SUPPORTED_JWT_ALGS
           };
           acceptsVcJwt = true;
         }
-        if(acceptedCryptosuites) {
-          const cryptosuites = acceptedCryptosuites
-            .map(({cryptosuite}) => cryptosuite);
+        if(cryptosuites?.length > 0) {
           inputDescriptor.format.ldp_vc = {
             proof_type: cryptosuites
           };
@@ -116,13 +118,13 @@ export function vprGroupsToPresentationDefinition({
     const didAuthentications = queries.get('DIDAuthentication') ?? [];
     for(const didAuthentication of didAuthentications) {
       const {acceptedEnvelopes, acceptedCryptosuites} = didAuthentication;
+      const envelopes = _getEnvelopes(acceptedEnvelopes);
+      const cryptosuites = _getCryptosuites(acceptedCryptosuites);
 
-      if(acceptedEnvelopes?.includes('application/jwt')) {
+      if(envelopes?.includes('application/jwt')) {
         acceptsVpJwt = true;
       }
-      if(acceptedCryptosuites) {
-        const cryptosuites = acceptedCryptosuites
-          .map(({cryptosuite}) => cryptosuite);
+      if(cryptosuites?.length > 0) {
         for(const cryptosuite of cryptosuites) {
           ldpVpProofTypes.add(cryptosuite);
         }
@@ -233,9 +235,10 @@ export function _fromQueryByExampleQuery({credentialQuery, prefixJwtVcPath}) {
   // determine `prefixJwtVcPath` default:
   // if `credentialQuery` specifies `acceptedEnvelopes: ['application/jwt']`,
   // then default `prefixJwtVcPath` to `true`
-  if(prefixJwtVcPath === undefined &&
-    (Array.isArray(credentialQuery.acceptedEnvelopes) &&
-    credentialQuery.acceptedEnvelopes.includes?.('application/jwt'))) {
+  const envelopes = credentialQuery.acceptedEnvelopes
+    ?.filter(e => e && (typeof e === 'string' || e.mediaType))
+    .map(e => typeof e === 'string' ? e : e.mediaType);
+  if(prefixJwtVcPath === undefined && envelopes?.includes('application/jwt')) {
     prefixJwtVcPath = true;
   }
 
@@ -408,3 +411,17 @@ function _primitiveValueToFilter(value) {
   }
   return filter;
 }
+
+function _getCryptosuites(acceptedCryptosuites) {
+  // array elements can be '<cryptosuite>' or {cryptosuite: '<cryptosuite>'}
+  return acceptedCryptosuites
+    ?.filter(e => e && (typeof e === 'string' || e.cryptosuite))
+    ?.map(e => typeof e === 'string' ? e : e.cryptosuite) ?? [];
+}
+
+function _getEnvelopes(acceptedEnvelopes) {
+  // array elements can be '<mediaType>' or {mediaType: '<mediaType>'}
+  return acceptedEnvelopes
+    ?.filter(e => e && (typeof e === 'string' || e.mediaType))
+    ?.map(e => typeof e === 'string' ? e : e.mediaType) ?? [];
+}

package/lib/query/util.js

@@ -48,7 +48,7 @@ export function toNumberIfNumber(x) {
   return x;
 }
 
-export function _fromPointers({map} = {}) {
+function _fromPointers({map} = {}) {
   const result = {};
 
   for(const [pointer, value] of map) {

package/package.json

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