@bedrock/vc-delivery 7.3.0 → 7.4.0

package/lib/helpers.js

@@ -4,6 +4,7 @@
 import * as bedrock from '@bedrock/core';
 import * as vcjwt from './vcjwt.js';
 import {decodeId, generateId} from 'bnid';
+import {compile} from '@bedrock/validation';
 import {Ed25519Signature2020} from '@digitalbazaar/ed25519-signature-2020';
 import {httpClient} from '@digitalbazaar/http-client';
 import {httpsAgent} from '@bedrock/https-agent';
@@ -352,3 +353,11 @@ function _getEnvelope({envelope, format}) {
       details: {httpStatusCode: 400, public: true}
     });
 }
+
+export function validateVerifiablePresentation({schema, presentation}) {
+  const validate = compile({schema});
+  const {valid, error} = validate(presentation);
+  if(!valid) {
+    throw error;
+  }
+}

package/lib/vcapi.js

@@ -4,13 +4,10 @@
 import * as bedrock from '@bedrock/core';
 import * as exchanges from './exchanges.js';
 import {createChallenge as _createChallenge, verify} from './verify.js';
-import {
-  buildPresentationFromResults, emitExchangeUpdated,
-  evaluateTemplate, generateRandom,
-  unenvelopePresentation, validateStep
+import {buildPresentationFromResults, emitExchangeUpdated, evaluateTemplate,
+  generateRandom, validateStep, validateVerifiablePresentation
 } from './helpers.js';
 import {exportJWK, generateKeyPair, importJWK} from 'jose';
-import {compile} from '@bedrock/validation';
 import {issue} from './issue.js';
 import {logger} from './logger.js';
 
@@ -173,24 +170,15 @@ export async function processExchange({req, res, workflow, exchangeRecord}) {
         }
 
         const {presentationSchema} = step;
-        if(presentationSchema) {
-          // if the VP is enveloped, get the presentation from the envelope
-          let presentation;
-          if(receivedPresentation?.type === 'EnvelopedVerifiablePresentation') {
-            ({presentation} = await unenvelopePresentation({
-              envelopedPresentation: receivedPresentation
-            }));
-          } else {
-            presentation = receivedPresentation;
-          }
 
-          // validate the received VP
-          const {jsonSchema: schema} = presentationSchema;
-          const validate = compile({schema});
-          const {valid, error} = validate(presentation);
-          if(!valid) {
-            throw error;
-          }
+        const isEnvelopedVP =
+          receivedPresentation?.type === 'EnvelopedVerifiablePresentation';
+
+        if(presentationSchema && !isEnvelopedVP) {
+          validateVerifiablePresentation({
+            schema: presentationSchema.jsonSchema,
+            presentation: receivedPresentation
+          });
         }
 
         // verify the received VP
@@ -210,6 +198,14 @@ export async function processExchange({req, res, workflow, exchangeRecord}) {
           expectedChallenge
         });
 
+        // validate enveloped VP after verification
+        if(presentationSchema && isEnvelopedVP) {
+          validateVerifiablePresentation({
+            schema: presentationSchema.jsonSchema,
+            presentation: verifyResult?.presentationResult?.presentation ?? {}
+          });
+        }
+
         // store VP results in variables associated with current step
         if(!exchange.variables.results) {
           exchange.variables.results = {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bedrock/vc-delivery",
-  "version": "7.3.0",
+  "version": "7.4.0",
   "type": "module",
   "description": "Bedrock Verifiable Credential Delivery",
   "main": "./lib/index.js",

package/schemas/bedrock-vc-workflow.js

@@ -116,6 +116,26 @@ const envelopedVerifiableCredential = {
   ]
 };
 
+const envelopedVerifiablePresentation = {
+  title: 'Enveloped Verifiable Presentation',
+  type: 'object',
+  additionalProperties: true,
+  properties: {
+    '@context': vcContext2StringOrArray,
+    id: {
+      type: 'string'
+    },
+    type: {
+      const: 'EnvelopedVerifiablePresentation'
+    }
+  },
+  required: [
+    '@context',
+    'id',
+    'type'
+  ]
+};
+
 export function verifiablePresentation() {
   return {
     title: 'Verifiable Presentation',
@@ -543,7 +563,12 @@ export function useExchangeBody() {
     type: 'object',
     additionalProperties: false,
     properties: {
-      verifiablePresentation: verifiablePresentation()
+      verifiablePresentation: {
+        anyOf: [
+          envelopedVerifiablePresentation,
+          verifiablePresentation()
+        ]
+      }
     }
   };
 }