@bedrock/vc-verifier 13.0.1 → 14.1.0

package/lib/http.js

@@ -16,6 +16,7 @@ import {checkStatus} from './status.js';
 import cors from 'cors';
 import {createDocumentLoader} from './documentLoader.js';
 import {createSuites} from './suites.js';
+import {serializeError} from 'serialize-error';
 import {createValidateMiddleware as validate} from '@bedrock/validation';
 
 const {util: {BedrockError}} = bedrock;
@@ -93,6 +94,29 @@ export async function addRoutes({app, service} = {}) {
           checkStatus: checks.includes('credentialStatus') ?
             checkStatus : () => ({verified: true})
         });
+        // if proof should have been checked but wasn't due to an error,
+        // try to run the check again using the VC's issuance date
+        if(checks.includes('proof') &&
+          result.error && !result.proof && result.results[0] &&
+          typeof credential.issuanceDate === 'string') {
+          const proofResult = await vc.verifyCredential({
+            credential,
+            documentLoader,
+            suite,
+            now: new Date(credential.issuanceDate),
+            // only check credential status when option is set
+            checkStatus: checks.includes('credentialStatus') ?
+              checkStatus : () => ({verified: true})
+          });
+          if(proofResult.verified) {
+            // overlay original (failed) results on top of proof results
+            result.results[0] = {
+              ...proofResult.results[0],
+              ...result.results[0],
+              proofVerified: true
+            };
+          }
+        }
         response = _createResponse({credential, result, checks});
       } catch(e) {
         response = _createResponse({error: e});
@@ -152,14 +176,18 @@ export async function addRoutes({app, service} = {}) {
         _validateChecks({checks});
         const unsignedPresentation = !checks.includes('proof');
 
-        // FIXME: allow for `checks` to request whether or not the challenge
-        // should be checked; for now, default to checking it
-
-        // first, check the challenge
-        const {verified, uses: challengeUses, error} = await verifyChallenge(
-          {challenge, verifierId: config.id});
-        if(!verified) {
-          throw error;
+        // allow for `checks` to indicate whether or not the challenge
+        // should be checked
+        let challengeUses;
+        if(checks.includes('challenge')) {
+          // first, check the challenge
+          const result = await verifyChallenge(
+            {challenge, verifierId: config.id});
+          const {verified, error} = result;
+          if(!verified) {
+            throw error;
+          }
+          ({uses: challengeUses} = result);
         }
 
         const verifyOptions = {
@@ -218,11 +246,22 @@ function _createResponse({credential, result, challengeUses, error, checks}) {
     const results = result.results ||
       (result.presentationResult && result.presentationResult.results);
     if(results && results.length > 0) {
+      for(const r of results) {
+        // ensure error is serializable
+        if(r.error) {
+          r.error = _serializeError({error: r.error});
+        }
+      }
       const [{proof}] = results;
-      ({verificationMethod} = proof);
+      if(proof) {
+        ({verificationMethod} = proof);
+      }
     }
 
-    if(!result.error) {
+    if(result.error) {
+      // ensure error is serializable
+      error = result.error = _serializeError({error: result.error});
+    } else {
       // try to get error from credential results
       const firstCredentialResult = (result.presentationResult &&
         result.credentialResults && result.credentialResults[0]) ||
@@ -245,11 +284,8 @@ function _createResponse({credential, result, challengeUses, error, checks}) {
         error = firstCredentialResult.error;
       }
       error = error || {message: 'Verification error.'};
-    } else {
-      error = result.error;
-      if(!error.message) {
-        error.message = 'Verification error.';
-      }
+      // ensure error is serializable
+      error = _serializeError({error});
     }
 
     let message = error.message;
@@ -270,3 +306,16 @@ function _createResponse({credential, result, challengeUses, error, checks}) {
   }
   return response;
 }
+
+function _serializeError({error}) {
+  // ensure error is serializable; do not include stack
+  error = serializeError(error);
+  if(!error.name || error.name === 'Error') {
+    error.name = 'VerificationError';
+  }
+  if(!error.message) {
+    error.message = 'Verification error.';
+  }
+  delete error.stack;
+  return error;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bedrock/vc-verifier",
-  "version": "13.0.1",
+  "version": "14.1.0",
   "type": "module",
   "description": "Bedrock VC Verifier",
   "main": "./lib/index.js",
@@ -35,7 +35,8 @@
     "assert-plus": "^1.0.0",
     "bnid": "^3.0.0",
     "body-parser": "^1.20.0",
-    "cors": "^2.8.5"
+    "cors": "^2.8.5",
+    "serialize-error": "^11.0.0"
   },
   "peerDependencies": {
     "@bedrock/core": "^6.0.1",