@digitalbazaar/oid4-client 3.1.0 → 3.2.0

package/lib/oid4vp.js

@@ -296,7 +296,9 @@ export async function toVpr({
 }
 
 // converts a VPR to partial "authorization request"
-export function fromVpr({verifiablePresentationRequest, strict = false} = {}) {
+export function fromVpr({
+  verifiablePresentationRequest, strict = false, prefixJwtVcPath = false
+} = {}) {
   try {
     let {query} = verifiablePresentationRequest;
     if(!Array.isArray(query)) {
@@ -322,7 +324,10 @@ export function fromVpr({verifiablePresentationRequest, strict = false} = {}) {
       response_type: 'vp_token',
       presentation_definition: {
         id: uuid(),
-        input_descriptors: credentialQuery.map(_fromQueryByExampleQuery)
+        input_descriptors: credentialQuery.map(q => _fromQueryByExampleQuery({
+          credentialQuery: q,
+          prefixJwtVcPath
+        }))
       },
       response_mode: 'direct_post'
     };
@@ -557,7 +562,8 @@ function _matchesInputDescriptor({
   return true;
 }
 
-function _fromQueryByExampleQuery(credentialQuery) {
+// exported for testing purposes only
+export function _fromQueryByExampleQuery({credentialQuery, prefixJwtVcPath}) {
   const fields = [];
   const inputDescriptor = {
     id: uuid(),
@@ -592,8 +598,15 @@ function _fromQueryByExampleQuery(credentialQuery) {
       filter.type = 'string',
       filter.const = value;
     }
+    const fieldsPath = [JSONPath.toPathString(path)];
+    // include 'vc' path for queries against JWT payloads instead of VCs
+    if(prefixJwtVcPath) {
+      const vcPath = [...path];
+      vcPath.splice(1, 0, 'vc');
+      fieldsPath.push(JSONPath.toPathString(vcPath));
+    }
     fields.push({
-      path: JSONPath.toPathString(path),
+      path: fieldsPath,
       filter
     });
 
@@ -730,7 +743,13 @@ function _adjustErroneousPaths(paths) {
   // JWT-secured VC, such that only actual VC paths remain
   const removed = paths.filter(p => !_isPresentationSubmissionPath(p));
   return removed.map(p => {
-    return !_isJWTPath(p) ? p : '$' + p.slice('$.vc'.length);
+    if(_isJWTPath(p)) {
+      return '$' + p.slice('$.vc'.length);
+    }
+    if(_isSquareJWTPath(p)) {
+      return '$' + p.slice('$[\'vc\']'.length);
+    }
+    return p;
   });
 }
 
@@ -789,9 +808,15 @@ function _get(sp, name) {
 }
 
 function _isPresentationSubmissionPath(path) {
-  return path.startsWith('$.verifiableCredential[') || path.startsWith('$.vp.');
+  return path.startsWith('$.verifiableCredential[') ||
+    path.startsWith('$.vp.') ||
+    path.startsWith('$[\'verifiableCredential') || path.startsWith('$[\'vp');
 }
 
 function _isJWTPath(path) {
   return path.startsWith('$.vc.');
 }
+
+function _isSquareJWTPath(path) {
+  return path.startsWith('$[\'vc\']');
+}

package/package.json

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