@digitalbazaar/oid4-client 3.8.0 → 4.1.0

package/lib/oid4vp.js

@@ -298,7 +298,7 @@ export async function toVpr({
 
 // converts a VPR to partial "authorization request"
 export function fromVpr({
-  verifiablePresentationRequest, strict = false, prefixJwtVcPath = false
+  verifiablePresentationRequest, strict = false, prefixJwtVcPath
 } = {}) {
   try {
     let {query} = verifiablePresentationRequest;
@@ -571,6 +571,15 @@ function _matchesInputDescriptor({
 
 // exported for testing purposes only
 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'))) {
+    prefixJwtVcPath = true;
+  }
+
   const fields = [];
   const inputDescriptor = {
     id: uuid(),
@@ -590,16 +599,11 @@ export function _fromQueryByExampleQuery({credentialQuery, prefixJwtVcPath}) {
     const filter = {};
     if(Array.isArray(value)) {
       filter.type = 'array';
-      // FIXME: create `allOf`
-      /*filter.allOf = value.map(v => ({
+      filter.allOf = value.map(v => ({
         contains: {
           type: 'string',
           const: v
         }
-      }));*/
-      filter.contains = value.map(v => ({
-        type: 'string',
-        const: v
       }));
     } else if(key === 'type') {
       // special provision for array/string for `type`
@@ -756,7 +760,7 @@ function _adjustErroneousPaths(paths) {
   // presentation submission and adjust any paths that would be part of a
   // JWT-secured VC, such that only actual VC paths remain
   const removed = paths.filter(p => !_isPresentationSubmissionPath(p));
-  return removed.map(p => {
+  return [...new Set(removed.map(p => {
     if(_isJWTPath(p)) {
       return '$' + p.slice('$.vc'.length);
     }
@@ -764,7 +768,7 @@ function _adjustErroneousPaths(paths) {
       return '$' + p.slice('$[\'vc\']'.length);
     }
     return p;
-  });
+  }))];
 }
 
 function _parseOID4VPUrl({url}) {

package/package.json

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