make knownRegistryList an argument of verifyCredential

.knownDidRegistries.ts

@@ -1,4 +1,4 @@
-export const knownDidRegistries = [
+export const knownDIDRegistries = [
   {
     name: 'DCC Pilot Registry',
     url: 'https://digitalcredentials.github.io/issuer-registry/registry.json'

src/Verify.ts

@@ -23,7 +23,7 @@ const suite = new Ed25519Signature2020();
 
 
 
-export async function verifyCredential({credential, reloadIssuerRegistry = true}:{credential: Credential, reloadIssuerRegistry: boolean}): Promise<VerificationResponse> {
+export async function verifyCredential({credential, knownDIDRegistries, reloadIssuerRegistry = true}:{credential: Credential, knownDIDRegistries: object, reloadIssuerRegistry: boolean}): Promise<VerificationResponse> {
 
 
   const fatalErrorMessage = checkForFatalErrors(credential)
@@ -58,7 +58,7 @@ export async function verifyCredential({credential, reloadIssuerRegistry = true}
   delete verificationResponse.statusResult
 
   const { issuer } = credential
-  await addTrustedIssuersToVerificationResponse({verificationResponse, reloadIssuerRegistry, issuer})
+  await addTrustedIssuersToVerificationResponse({verificationResponse, knownDIDRegistries,reloadIssuerRegistry, issuer})
 
 
   return verificationResponse;

src/issuerRegistries.ts

@@ -1,5 +1,4 @@
 import {RegistryClient} from '@digitalcredentials/issuer-registry-client';
-import {knownDidRegistries} from '../.knownDidRegistries'
 import { VerificationResponse } from './types/result';
 const registries = new RegistryClient()
 const registryNotYetLoaded = true;
@@ -9,13 +8,14 @@ const registryNotYetLoaded = true;
  * @returns A list of the names of the DID registries in which the issuer appears.
  */
 
-export async function getTrustedRegistryListForIssuer({ issuer, reloadIssuerRegistry = false }: {
+export async function getTrustedRegistryListForIssuer({ issuer, knownDIDRegistries, reloadIssuerRegistry = false }: {
   issuer: string | any,
+  knownDIDRegistries: object,
   reloadIssuerRegistry: boolean | null
 }): Promise<string[] | null> {
 
   if (reloadIssuerRegistry ?? registryNotYetLoaded) {
-    await registries.load({ config: knownDidRegistries })
+    await registries.load({ config: knownDIDRegistries })
   }
   const issuerDid = typeof issuer === 'string' ? issuer : issuer.id;
   const issuerInfo = registries.didEntry(issuerDid);
@@ -26,13 +26,14 @@ export async function getTrustedRegistryListForIssuer({ issuer, reloadIssuerRegi
     : null;
 }
 
-export async function addTrustedIssuersToVerificationResponse( {issuer, reloadIssuerRegistry = false, verificationResponse} :{
+export async function addTrustedIssuersToVerificationResponse( {issuer, knownDIDRegistries, reloadIssuerRegistry = false, verificationResponse} :{
   issuer: string | any,
-  reloadIssuerRegistry: boolean | null
+  reloadIssuerRegistry: boolean | null,
+  knownDIDRegistries: object,
   verificationResponse: VerificationResponse
 }) : Promise<void>
  {
-    const foundInRegistries = await getTrustedRegistryListForIssuer( {issuer, reloadIssuerRegistry});
+    const foundInRegistries = await getTrustedRegistryListForIssuer( {issuer, knownDIDRegistries, reloadIssuerRegistry});
 
     const registryStep = {
       "id": "registered_issuer",

test/Verify.spec.ts

@@ -1,22 +1,23 @@
-//import { expect } from 'chai'
+import { expect } from 'chai'
 import { strict as assert } from 'assert';
 import { verifyCredential } from '../src/Verify'
 import { getVCv2Expired, getVCv1Tampered, getVCv2ValidStatus } from '../src/test-fixtures/vc'
+import { knownDIDRegistries } from '../.knownDidRegistries';
 
 describe('Verify', () => {
   it('verifies with valid status', async () => {
     //const signedVC : any = getSignedVC() 
-    const signedVC2Unrevoked : any = getVCv2ValidStatus()
-    const result = await verifyCredential({credential: signedVC2Unrevoked, reloadIssuerRegistry: true})
+    const credential : any = getVCv2ValidStatus()
+    const result = await verifyCredential({credential, reloadIssuerRegistry: true, knownDIDRegistries})
    // console.log("result returned from verifyCredential call:")
     //console.log(JSON.stringify(result,null,2))
-    assert.ok(result.verified);
-    //expect(result.verified).to.be.true
+    //assert.ok(result.verified);
+    expect(result.verified).to.be.true
    })
 
    it('returns fatal error when tampered', async () => {
     const tamperedVC1 : any = getVCv1Tampered() 
-    const result = await verifyCredential({credential: tamperedVC1, reloadIssuerRegistry: true})
+    const result = await verifyCredential({credential: tamperedVC1, reloadIssuerRegistry: true, knownDIDRegistries})
    // console.log("result returned from verifyCredential call:")
    // console.log(JSON.stringify(result,null,2))
     assert.ok(result.verified === false);
@@ -25,7 +26,7 @@ describe('Verify', () => {
 
    it('returns unverified when expired', async () => {
     const expiredVC2 : any = getVCv2Expired() 
-    const result = await verifyCredential({credential: expiredVC2, reloadIssuerRegistry: true})
+    const result = await verifyCredential({credential: expiredVC2, reloadIssuerRegistry: true, knownDIDRegistries})
     //console.log("result returned from verifyCredential call:")
    // console.log(JSON.stringify(result,null,2))
     assert.ok(result.verified === false);