@bedrock/vc-delivery 7.0.2 → 7.1.1

package/lib/helpers.js

@@ -28,6 +28,31 @@ const JWT_FORMAT_ALIASES = new Set([
   'jwt_vc_json'
 ]);
 
+export function buildPresentationFromResults({
+  presentation, verifyResult
+}) {
+  // build VP w/all envelopes removed (if any)
+  const vp = {
+    ...(verifyResult?.presentationResult?.presentation ?? presentation)
+  };
+  let credentials = vp.verifiableCredential;
+  const {credentialResults} = verifyResult;
+  if(credentials && credentialResults) {
+    if(!Array.isArray(credentials)) {
+      credentials = [credentials];
+    }
+    const hasEnvelopedVC = credentials.some(
+      vc => vc.type === 'EnvelopedVerifiableCredential');
+    if(!hasEnvelopedVC) {
+      // no enveloped VCs to update, return early
+      return vp;
+    }
+    // walk credential results and produce unenveloped output
+    vp.verifiableCredential = credentialResults.map(r => r.credential);
+  }
+  return vp;
+}
+
 export async function evaluateTemplate({
   workflow, exchange, typedTemplate, variables
 } = {}) {

package/lib/index.js

@@ -1,12 +1,11 @@
 /*!
- * Copyright (c) 2022-2024 Digital Bazaar, Inc. All rights reserved.
+ * Copyright (c) 2022-2025 Digital Bazaar, Inc. All rights reserved.
  */
 import * as bedrock from '@bedrock/core';
 import * as workflowSchemas from '../schemas/bedrock-vc-workflow.js';
 import {createService, schemas} from '@bedrock/service-core';
 import {addRoutes} from './http.js';
 import {initializeServiceAgent} from '@bedrock/service-agent';
-import {klona} from 'klona';
 import {MAX_ISSUER_INSTANCES} from './constants.js';
 import {parseLocalId} from './helpers.js';
 import '@bedrock/express';
@@ -24,8 +23,8 @@ bedrock.events.on('bedrock.init', async () => {
 
 async function _initService({serviceType, routePrefix}) {
   // add customizations to config validators...
-  const createConfigBody = klona(schemas.createConfigBody);
-  const updateConfigBody = klona(schemas.updateConfigBody);
+  const createConfigBody = structuredClone(schemas.createConfigBody);
+  const updateConfigBody = structuredClone(schemas.updateConfigBody);
   const schemasToUpdate = [createConfigBody, updateConfigBody];
   const {
     credentialTemplates, steps, initialStep, issuerInstances
@@ -37,7 +36,7 @@ async function _initService({serviceType, routePrefix}) {
     schema.properties.initialStep = initialStep;
     schema.properties.issuerInstances = issuerInstances;
     // allow zcaps by custom reference ID
-    schema.properties.zcaps = klona(schemas.zcaps);
+    schema.properties.zcaps = structuredClone(schemas.zcaps);
     // max of 4 basic zcaps + max issuer instances
     schema.properties.zcaps.maxProperties = 4 + MAX_ISSUER_INSTANCES;
     schema.properties.zcaps.additionalProperties = schemas.delegatedZcap;

package/lib/oid4/oid4vp.js

@@ -1,17 +1,17 @@
 /*!
- * Copyright (c) 2022-2024 Digital Bazaar, Inc. All rights reserved.
+ * Copyright (c) 2022-2025 Digital Bazaar, Inc. All rights reserved.
  */
 import * as bedrock from '@bedrock/core';
 import * as exchanges from '../exchanges.js';
 import {
-  evaluateTemplate, unenvelopePresentation, validateStep
+  buildPresentationFromResults, evaluateTemplate, unenvelopePresentation,
+  validateStep
 } from '../helpers.js';
 import {
   presentationSubmission as presentationSubmissionSchema,
   verifiablePresentation as verifiablePresentationSchema
 } from '../../schemas/bedrock-vc-workflow.js';
 import {compile} from '@bedrock/validation';
-import {klona} from 'klona';
 import {logger} from '../logger.js';
 import {oid4vp} from '@digitalbazaar/oid4-client';
 import {verify} from '../verify.js';
@@ -102,7 +102,8 @@ export async function getAuthorizationRequest({req}) {
           authorizationRequest.client_id_scheme = 'redirect_uri';
         }
         if(client_metadata) {
-          authorizationRequest.client_metadata = klona(client_metadata);
+          authorizationRequest.client_metadata = structuredClone(
+            client_metadata);
         } else if(client_metadata_uri) {
           authorizationRequest.client_metadata_uri = client_metadata_uri;
         } else {
@@ -207,24 +208,25 @@ export async function processAuthorizationResponse({req}) {
     if(!exchange.variables.results) {
       exchange.variables.results = {};
     }
-    const results = {
+    const stepResult = {
       // common use case of DID Authentication; provide `did` for ease
       // of use in template
       did: verificationMethod?.controller || null,
       verificationMethod,
-      verifiablePresentation: presentation,
+      verifiablePresentation: buildPresentationFromResults({
+        presentation,
+        verifyResult
+      }),
       openId: {
         authorizationRequest,
         presentationSubmission
       }
     };
     if(envelope) {
-      // normalize VP from inside envelope to `verifiablePresentation`
-      results.envelopedPresentation = presentation;
-      results.verifiablePresentation = verifyResult
-        .presentationResult.presentation;
+      // include enveloped VP in step result
+      stepResult.envelopedPresentation = presentation;
     }
-    exchange.variables.results[currentStep] = results;
+    exchange.variables.results[currentStep] = stepResult;
     try {
       exchange.sequence++;
 

package/lib/vcapi.js

@@ -1,16 +1,16 @@
 /*!
- * Copyright (c) 2018-2024 Digital Bazaar, Inc. All rights reserved.
+ * Copyright (c) 2018-2025 Digital Bazaar, Inc. All rights reserved.
  */
 import * as bedrock from '@bedrock/core';
 import * as exchanges from './exchanges.js';
 import {createChallenge as _createChallenge, verify} from './verify.js';
 import {
-  evaluateTemplate, generateRandom, unenvelopePresentation, validateStep
+  buildPresentationFromResults, evaluateTemplate, generateRandom,
+  unenvelopePresentation, validateStep
 } from './helpers.js';
 import {exportJWK, generateKeyPair, importJWK} from 'jose';
 import {compile} from '@bedrock/validation';
 import {issue} from './issue.js';
-import {klona} from 'klona';
 import {logger} from './logger.js';
 
 const {util: {BedrockError}} = bedrock;
@@ -140,7 +140,7 @@ export async function processExchange({req, res, workflow, exchangeRecord}) {
 
         // if no presentation was received in the body...
         if(!receivedPresentation) {
-          const verifiablePresentationRequest = klona(
+          const verifiablePresentationRequest = structuredClone(
             step.verifiablePresentationRequest);
           if(createChallenge) {
             /* Note: When creating a challenge, the initial step always
@@ -194,7 +194,7 @@ export async function processExchange({req, res, workflow, exchangeRecord}) {
         // verify the received VP
         const expectedChallenge = isInitialStep ? exchange.id : undefined;
         const {allowUnprotectedPresentation = false} = step;
-        const {verificationMethod} = await verify({
+        const verifyResult = await verify({
           workflow,
           verifiablePresentationRequest: step.verifiablePresentationRequest,
           presentation: receivedPresentation,
@@ -206,14 +206,19 @@ export async function processExchange({req, res, workflow, exchangeRecord}) {
         if(!exchange.variables.results) {
           exchange.variables.results = {};
         }
-        exchange.variables.results[currentStep] = {
+        const {verificationMethod} = verifyResult;
+        const result = {
           // common use case of DID Authentication; provide `did` for ease
           // of use in templates and consistency with OID4VCI which only
           // receives `did` not verification method nor VP
           did: verificationMethod?.controller || null,
           verificationMethod,
-          verifiablePresentation: receivedPresentation
+          verifiablePresentation: buildPresentationFromResults({
+            presentation: receivedPresentation,
+            verifyResult
+          })
         };
+        exchange.variables.results[currentStep] = result;
 
         // clear received presentation as it has been processed
         receivedPresentation = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bedrock/vc-delivery",
-  "version": "7.0.2",
+  "version": "7.1.1",
   "type": "module",
   "description": "Bedrock Verifiable Credential Delivery",
   "main": "./lib/index.js",
@@ -40,14 +40,13 @@
     "@digitalbazaar/ed25519-signature-2020": "^5.4.0",
     "@digitalbazaar/ezcap": "^4.1.0",
     "@digitalbazaar/oid4-client": "^4.3.0",
-    "@digitalbazaar/vc": "^7.1.2",
+    "@digitalbazaar/vc": "^7.2.0",
     "assert-plus": "^1.0.0",
     "bnid": "^3.0.0",
     "body-parser": "^1.20.3",
     "cors": "^2.8.5",
     "jose": "^5.10.0",
     "jsonata": "^2.0.6",
-    "klona": "^2.0.6",
     "serialize-error": "^12.0.0"
   },
   "peerDependencies": {
@@ -72,6 +71,6 @@
     "eslint-plugin-unicorn": "^56.0.1"
   },
   "engines": {
-    "node": ">=18"
+    "node": ">=20"
   }
 }