From 0ea6eeec21e849f674f442140bb0bb9756caf16b Mon Sep 17 00:00:00 2001
From: PatStLouis <patrick.st-louis@opsecid.ca>
Date: Wed, 8 Jan 2025 19:15:06 +0000
Subject: [PATCH] Fix helper function error throwing and envelope tests
 variable allocation

Signed-off-by: PatStLouis <patrick.st-louis@opsecid.ca>
---
 tests/4.13.2-envelopes.js | 24 +++++++++++++++---------
 tests/helpers.js          |  6 +++---
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/tests/4.13.2-envelopes.js b/tests/4.13.2-envelopes.js
index 3ecbfc5..26b2f42 100644
--- a/tests/4.13.2-envelopes.js
+++ b/tests/4.13.2-envelopes.js
@@ -68,14 +68,14 @@ describe('Enveloped Verifiable Credentials', function() {
           negativeFixture = structuredClone(verifiableCredential);
           negativeFixture['@context'] = [];
           await assert.rejects(
-            verifyCredential({verifier, negativeFixture}),
+            verifyCredential({verifier, verifiableCredential: negativeFixture}),
             'Failed to reject an enveloped VC with invalid context.');
 
           // Replace context with an invalid value
           negativeFixture = structuredClone(verifiableCredential);
           negativeFixture['@context'] = 'https://www.w3.org/ns/credentials/examples/v2';
           await assert.rejects(
-            verifyCredential({verifier, negativeFixture}),
+            verifyCredential({verifier, verifiableCredential: negativeFixture}),
             'Failed to reject an enveloped VC with invalid context.');
         }
       });
@@ -101,7 +101,7 @@ describe('Enveloped Verifiable Credentials', function() {
           negativeFixture = structuredClone(verifiableCredential);
           negativeFixture.id = negativeFixture.id.split(',').pop();
           await assert.rejects(
-            verifyCredential({verifier, negativeFixture}),
+            verifyCredential({verifier, verifiableCredential: negativeFixture}),
             'Failed to reject an enveloped VC with an invalid data url id.');
         }
       });
@@ -125,7 +125,8 @@ describe('Enveloped Verifiable Credentials', function() {
             negativeFixture = structuredClone(verifiableCredential);
             delete negativeFixture.type;
             await assert.rejects(
-              verifyCredential({verifier, negativeFixture}),
+              verifyCredential(
+                {verifier, verifiableCredential: negativeFixture}),
               'Failed to reject an enveloped VC with an enveloped VC with a ' +
               'missing `type`.');
 
@@ -133,7 +134,8 @@ describe('Enveloped Verifiable Credentials', function() {
             negativeFixture = structuredClone(verifiableCredential);
             negativeFixture.type = 'VerifiableCredential';
             await assert.rejects(
-              verifyCredential({verifier, negativeFixture}),
+              verifyCredential(
+                {verifier, verifiableCredential: negativeFixture}),
               'Failed to reject an enveloped VC with an ' +
               'invalid `type`.');
           }
@@ -176,14 +178,16 @@ describe('Enveloped Verifiable Presentations', function() {
           negativeFixture = structuredClone(verifiablePresentation);
           negativeFixture['@context'] = [];
           await assert.rejects(
-            verifyPresentation({vpVerifier, negativeFixture}),
+            verifyPresentation(
+              {vpVerifier, verifiablePresentation: negativeFixture}),
             'Failed to reject Enveloped VP missing contexts.');
 
           // Replace context field with invalid context
           negativeFixture = structuredClone(verifiablePresentation);
           negativeFixture['@context'] = ['https://www.w3.org/ns/credentials/examples/v2'];
           await assert.rejects(
-            verifyPresentation({vpVerifier, negativeFixture}),
+            verifyPresentation(
+              {vpVerifier, verifiablePresentation: negativeFixture}),
             'Failed to reject Enveloped VP missing contexts.');
         }
       });
@@ -203,7 +207,8 @@ describe('Enveloped Verifiable Presentations', function() {
           negativeFixture = structuredClone(verifiablePresentation);
           negativeFixture.id = negativeFixture.id.split(',').pop();
           await assert.rejects(
-            verifyPresentation({vpVerifier, negativeFixture}),
+            verifyPresentation(
+              {vpVerifier, verifiablePresentation: negativeFixture}),
             'Failed to reject Enveloped VP with an id that is not a data url.');
         }
       });
@@ -221,7 +226,8 @@ describe('Enveloped Verifiable Presentations', function() {
           negativeFixture = structuredClone(verifiablePresentation);
           negativeFixture.type = ['VerifiablePresentation'];
           await assert.rejects(
-            verifyPresentation({vpVerifier, negativeFixture}),
+            verifyPresentation(
+              {vpVerifier, verifiablePresentation: negativeFixture}),
             'Failed to reject VP w/o type "EnvelopedVerifiablePresentation".');
         }
       });
diff --git a/tests/helpers.js b/tests/helpers.js
index 622b743..d9b40cc 100644
--- a/tests/helpers.js
+++ b/tests/helpers.js
@@ -54,7 +54,7 @@ export const secureCredential = async ({
     const {data, result, error} = await issuer.post({json: body});
     if(!result || !result.ok) {
       error;
-      return null;
+      throw new Error('Request rejected.');
     }
     return data;
   }
@@ -73,7 +73,7 @@ export const verifyCredential = async ({
     const {data, result, error} = await verifier.post({json: body});
     if(!result || !result.ok) {
       error;
-      return null;
+      throw new Error('Request rejected.');
     }
     return data;
   }
@@ -93,7 +93,7 @@ export const verifyPresentation = async ({
     const {data, result, error} = await vpVerifier.post({json: body});
     if(!result || !result.ok) {
       error;
-      return null;
+      throw new Error('Request rejected.');
     }
     return data;
   }