Make vc prefix optional.

lib/oid4vp.js

@@ -296,7 +296,7 @@ export async function toVpr({
 }
 
 // converts a VPR to partial "authorization request"
-export function fromVpr({verifiablePresentationRequest, strict = false} = {}) {
+export function fromVpr({verifiablePresentationRequest, strict = false, prefixVC = false} = {}) {
   try {
     let {query} = verifiablePresentationRequest;
     if(!Array.isArray(query)) {
@@ -322,7 +322,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,
+          prefixVC
+        }))
       },
       response_mode: 'direct_post'
     };
@@ -558,7 +561,7 @@ function _matchesInputDescriptor({
 }
 
 // exported for testing purposes only
-export function _fromQueryByExampleQuery(credentialQuery) {
+export function _fromQueryByExampleQuery({credentialQuery, prefixVC}) {
   const fields = [];
   const inputDescriptor = {
     id: uuid(),
@@ -593,13 +596,16 @@ export function _fromQueryByExampleQuery(credentialQuery) {
       filter.type = 'string',
       filter.const = value;
     }
-    const vcPath = [...path];
-    vcPath.splice(1, 0, 'vc');
+    const fieldsPath = [JSONPath.toPathString(path)];
+    // Include 'vc' path for JWT purposes
+    if(prefixVC) {
+      const vcPath = [...path];
+      vcPath.splice(1, 0, 'vc');
+      fieldsPath.push(JSONPath.toPathString(vcPath));
+    }
+
     fields.push({
-      path: [
-        JSONPath.toPathString(path),
-        JSONPath.toPathString(vcPath)
-      ],
+      path: fieldsPath,
       filter
     });
 
@@ -736,7 +742,12 @@ 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);
+    } else if (_isSquareJWTPath(p)) {
+      return '$' + p.slice('$[\'vc\']'.length);
+    }
+    return p;
   });
 }
 
@@ -795,9 +806,14 @@ 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\']');
+}

tests/unit/oid4vp.spec.js

@@ -11,18 +11,21 @@ describe('OID4VP', () => {
   describe('constructor', () => {
     it('should map a QueryByExample to a Presentation Definition', async () => {
       const presentation_definition = _fromQueryByExampleQuery({
-        reason: 'Please present your Driver\'s License to complete the ' +
-                'verification process.',
-        example: {
-          '@context': [
-            'https://www.w3.org/2018/credentials/v1',
-            'https://w3id.org/vdl/v1',
-            'https://w3id.org/vdl/aamva/v1'
-          ],
-          type: [
-            'Iso18013DriversLicenseCredential'
-          ]
-        }
+        credentialQuery: {
+          reason: 'Please present your Driver\'s License to complete the ' +
+                  'verification process.',
+          example: {
+            '@context': [
+              'https://www.w3.org/2018/credentials/v1',
+              'https://w3id.org/vdl/v1',
+              'https://w3id.org/vdl/aamva/v1'
+            ],
+            type: [
+              'Iso18013DriversLicenseCredential'
+            ]
+          }
+        },
+        prefixVC: true
       });
       expect(presentation_definition.constraints.fields[0].path).to.eql([
         '$[\'@context\']',