Switch to strings for vc version to support semantic versioning.

test/10-verify.spec.js

@@ -2,11 +2,15 @@
  * Copyright (c) 2019-2024 Digital Bazaar, Inc. All rights reserved.
  */
 import * as vc from '../lib/index.js';
+import {
+  createIssuerSuite,
+  createVerifySuite,
+  generateCredential
+} from './helpers.js';
 import {assertionController} from './mocks/assertionController.js';
 import chai from 'chai';
 import {DataIntegrityProof} from '@digitalbazaar/data-integrity';
 import {documentLoader} from './testDocumentLoader.js';
-import {generateCredential} from './helpers.js';
 import {invalidContexts} from './contexts/index.js';
 import {setupSuites} from './mocks/suites.js';
 import {v4 as uuid} from 'uuid';
@@ -32,20 +36,20 @@ function _runSuite({
   suite, version,
   credentialFactory, cryptosuite
 }) {
-  const title = `VC ${version.toFixed(1)} Suite ${suiteName} ` +
-    `KeyType ${keyType}`;
+  const title = `VC ${version} Suite ${suiteName} KeyType ${keyType}`;
   const generateDefaults = {
     credentialFactory,
     suite,
     issuer
   };
   const verifySuite = createVerifySuite({Suite, cryptosuite, derived});
+  const issuerSuite = createIssuerSuite({Suite, cryptosuite, derived, signer: keyPair.signer()});
   describe(title, async function() {
     describe('verify API (credentials)', () => {
       it('should verify a vc', async () => {
         const verifiableCredential = await vc.issue({
           credential: credentialFactory(),
-          suite,
+          suite: issuerSuite,
           documentLoader
         });
         const result = await vc.verifyCredential({
@@ -91,7 +95,7 @@ function _runSuite({
             createSignCryptosuite,
           } = cryptosuite;
           const proofId = `urn:uuid:${uuid()}`;
-          const mandatoryPointers = (version === 1.0) ?
+          const mandatoryPointers = (version === '1.0') ?
             ['/issuer', '/issuanceDate'] : ['/issuer'];
           const sdSignSuite = new DataIntegrityProof({
             signer: keyPair.signer(),
@@ -150,7 +154,7 @@ function _runSuite({
         };
         const verifiableCredential = await vc.issue({
           credential,
-          suite,
+          suite: issuerSuite,
           documentLoader
         });
         const result = await vc.verifyCredential({
@@ -264,7 +268,7 @@ function _runSuite({
             };
             const verifiableCredential = await vc.issue({
               credential,
-              suite,
+              suite: issuerSuite,
               documentLoader
             });
             const result = await vc.verifyCredential({
@@ -285,7 +289,7 @@ function _runSuite({
           const credential = credentialFactory();
           const verifiableCredential = await vc.issue({
             credential,
-            suite,
+            suite: issuerSuite,
             documentLoader
           });
           const result = await vc.verifyCredential({
@@ -306,10 +310,9 @@ function _runSuite({
             const {
               createDiscloseCryptosuite,
               createSignCryptosuite,
-              createVerifyCryptosuite
             } = cryptosuite;
             const proofId = `urn:uuid:${uuid()}`;
-            const mandatoryPointers = (version === 1.0) ?
+            const mandatoryPointers = (version === '1.0') ?
               ['/issuer', '/issuanceDate'] : ['/issuer'];
             // setup ecdsa-sd-2023 suite for signing selective disclosure VCs
             const sdSignSuite = new DataIntegrityProof({
@@ -354,12 +357,3 @@ function _runSuite({
     });
   });
 }
-
-function createVerifySuite({Suite, cryptosuite, derived}) {
-  if(!derived) {
-    return new Suite({cryptosuite});
-  }
-  return new Suite({
-    cryptosuite: cryptosuite.createVerifyCryptosuite()
-  });
-}

test/30-presentations.spec.js

@@ -188,7 +188,7 @@ function _runSuite({keyType, suite, version, credentialFactory}) {
                 credential.credentialId.should.be.a('string');
               }
             });
-          if(version === 2.0) {
+          if(version === '2.0') {
             it(`should not error when credentials have mixed contexts ` +
                   `[${count}]`, async () => {
               const challenge = uuid();

test/40-credentials.spec.js

@@ -99,7 +99,7 @@ function _runSuite({mockCredential, version}) {
           .contain('"evidence" must be a URI');
       });
 
-      if(version === 1.0) {
+      if(version === '1.0') {
         it('should reject if "expirationDate" has passed', () => {
           const credential = mockCredential();
           credential.issuer = 'did:example:12345';
@@ -134,7 +134,7 @@ function _runSuite({mockCredential, version}) {
               `"issuanceDate" (${credential.issuanceDate}).`);
         });
       }
-      if(version === 2.0) {
+      if(version === '2.0') {
         it('should reject "validFrom" in the future', () => {
           const credential = mockCredential();
           credential.issuer = 'did:example:12345';
@@ -267,7 +267,7 @@ function _runSuite({mockCredential, version}) {
         const credential = mockCredential();
         credential.credentialSubject = {};
         credential.issuer = 'did:example:12345';
-        if(version === 1.0) {
+        if(version === '1.0') {
           credential.issuanceDate = '2022-10-31T19:21:25Z';
         }
         let error;
@@ -285,7 +285,7 @@ function _runSuite({mockCredential, version}) {
         const credential = mockCredential();
         credential.credentialSubject = [{}, {id: 'did:key:zFoo'}];
         credential.issuer = 'did:example:12345';
-        if(version === 1.0) {
+        if(version === '1.0') {
           credential.issuanceDate = '2022-10-31T19:21:25Z';
         }
         let error;
@@ -307,7 +307,7 @@ function _runSuite({mockCredential, version}) {
           {name: 'did key'}
         ];
         credential.issuer = 'did:example:12345';
-        if(version === 1.0) {
+        if(version === '1.0') {
           credential.issuanceDate = '2022-10-31T19:21:25Z';
         }
         let error;

test/50-issue.spec.js

@@ -67,7 +67,7 @@ function _runSuite({version, keyType, suite, mockCredential}) {
         error.message.should
           .contain('"suite.verificationMethod" property is required.');
       });
-      if(version === 1.0) {
+      if(version === '1.0') {
         it('should issue an expired verifiable credential', async () => {
           const fp = Ed25519VerificationKey2018
             .fingerprintFromPublicKey({
@@ -113,7 +113,7 @@ function _runSuite({version, keyType, suite, mockCredential}) {
           );
         });
       }
-      if(version === 2.0) {
+      if(version === '2.0') {
         it('should issue "validUntil" in the future', async () => {
           const credential = mockCredential();
           credential.issuer = 'did:example:12345';

test/helpers.js

@@ -40,3 +40,24 @@ export async function generateCredential({
   });
   return {credential};
 }
+
+export function createVerifySuite({Suite, cryptosuite, derived}) {
+  if(!derived) {
+    return new Suite({cryptosuite});
+  }
+  return new Suite({
+    cryptosuite: cryptosuite.createVerifyCryptosuite()
+  });
+}
+export function createIssuerSuite({
+  Suite, cryptosuite, signer,
+  derived, mandatoryPointers = ['/issuer']
+}) {
+  if(!derived) {
+    return new Suite({signer, cryptosuite});
+  }
+  return new Suite({
+    signer,
+    cryptosuite: cryptosuite.createSignCryptosuite({mandatoryPointers})
+  });
+}

test/mocks/credential.js

@@ -4,7 +4,7 @@
 import {klona} from 'klona';
 
 export const versionedCredentials = new Map([
-  [1.0, () => klona({
+  ['1.0', () => klona({
     '@context': [
       'https://www.w3.org/2018/credentials/v1',
       'https://www.w3.org/2018/credentials/examples/v1'
@@ -18,7 +18,7 @@ export const versionedCredentials = new Map([
       alumniOf: '<span lang="en">Example University</span>'
     }
   })],
-  [2.0, () => klona({
+  ['2.0', () => klona({
     '@context': [
       'https://www.w3.org/ns/credentials/v2',
       'https://www.w3.org/ns/credentials/examples/v2'

test/mocks/mock.data.js

@@ -22,10 +22,10 @@ const _mixedCredential = () => {
   return () => {
     if((count % 2) === 0) {
       count++;
-      return versionedCredentials.get(1.0)();
+      return versionedCredentials.get('1.0')();
     }
     count ++;
-    return versionedCredentials.get(2.0)();
+    return versionedCredentials.get('2.0')();
   };
 };