@bedrock/vc-verifier 22.1.2 → 22.2.1

package/lib/di.js

@@ -46,7 +46,7 @@ export async function verifyCredential({
   // ensure all proofs are verified in order to return `verified`
   let {verified} = result;
   verified = !!(verified && result?.results?.every(({verified}) => verified));
-  return {...result, verified};
+  return {...result, verified, credential};
 }
 
 export async function verifyPresentation({
@@ -59,7 +59,8 @@ export async function verifyPresentation({
     documentLoader: await createDocumentLoader({config}),
     suite: createSuites(),
     unsignedPresentation: !checks.includes('proof'),
-    checkStatus: _checkStatus
+    checkStatus: _checkStatus,
+    includeCredentials: true
   };
   return vc.verify(verifyOptions);
 }

package/lib/http.js

@@ -1,5 +1,5 @@
 /*!
- * 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 {createChallenge, verifyChallenge} from './challenges.js';
@@ -218,25 +218,26 @@ function _createResponse({credential, result, challengeUses, error, checks}) {
       error = result.error = _serializeError({error: result.error});
     } else {
       // try to get error from credential results
-      const firstCredentialResult = (result.presentationResult &&
-        result.credentialResults && result.credentialResults[0]) ||
-        result;
-      if(!firstCredentialResult.error &&
-        firstCredentialResult.statusResult &&
-        !firstCredentialResult.statusResult.verified) {
-        if(firstCredentialResult.statusResult.error) {
-          error = {
-            message: 'The credential status could not be checked.',
-            cause: firstCredentialResult.statusResult.error.message
-          };
-        } else {
-          // FIXME: surface status type information so it can be included here
-          error = {
-            message: 'The credential failed a status check.'
-          };
+      const credentialResults = result.credentialResults ?? [result];
+      for(const cr of credentialResults) {
+        if(cr.error) {
+          error = cr.error;
+          break;
+        }
+        if(cr.statusResult?.verified === false) {
+          if(cr.statusResult.error) {
+            error = {
+              message: 'A credential status could not be checked.',
+              cause: cr.statusResult.error.message
+            };
+          } else {
+            // FIXME: include status type information here
+            error = {
+              message: 'A credential failed a status check.'
+            };
+          }
+          break;
         }
-      } else {
-        error = firstCredentialResult.error;
       }
       error = error || {message: 'Verification error.'};
       // ensure error is serializable
@@ -244,7 +245,7 @@ function _createResponse({credential, result, challengeUses, error, checks}) {
     }
 
     let message = error.message;
-    if(error.errors && error.errors.length > 0) {
+    if(error.errors?.length > 0) {
       message = error.errors[0].message;
     }
     response = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bedrock/vc-verifier",
-  "version": "22.1.2",
+  "version": "22.2.1",
   "type": "module",
   "description": "Bedrock VC Verifier",
   "main": "./lib/index.js",
@@ -41,7 +41,7 @@
     "@digitalbazaar/eddsa-jcs-2022-cryptosuite": "^1.0.0",
     "@digitalbazaar/eddsa-rdfc-2022-cryptosuite": "^1.2.0",
     "@digitalbazaar/pdf417-dl-canonicalizer": "^1.2.1",
-    "@digitalbazaar/vc": "^7.1.2",
+    "@digitalbazaar/vc": "^7.2.0",
     "@digitalbazaar/vc-bitstring-status-list": "^2.0.1",
     "@digitalbazaar/vc-revocation-list": "^7.0.0",
     "@digitalbazaar/vc-status-list": "^8.0.1",