Refactor helper function getCredentialStatus().

Author: JSAssassin

tests/20-verify.js

@@ -31,7 +31,7 @@ describe('StatusList2021 Credentials (Verify)', function() {
       let setSuspensionStatusList;
       let publishRevocationStatusList;
       let publishSuspensionStatusList;
-      before(async function() {
+      beforeEach(async function() {
         // get a VC issued by DB
         const {match} = filterImplementations({filter: ({value}) => {
           // FIXME: Make issuer name configurable via env variable
@@ -110,6 +110,11 @@ describe('StatusList2021 Credentials (Verify)', function() {
             publishStatusList: publishRevocationStatusList, statusInfo,
             statusPurpose: 'revocation'
           });
+          // get the status of the VC after it is revoked
+          const {status} = await getCredentialStatus({
+            verifiableCredential: revokedVc
+          });
+          status.should.equal(true);
           // try to verify the credential after revocation, should fail since it
           // has now been revoked
           const {
@@ -140,6 +145,11 @@ describe('StatusList2021 Credentials (Verify)', function() {
             publishStatusList: publishSuspensionStatusList, statusInfo,
             statusPurpose: 'suspension'
           });
+          // get the status of the VC after it is suspended
+          const {status} = await getCredentialStatus({
+            verifiableCredential: suspendedVc
+          });
+          status.should.equal(true);
           // try to verify the credential after suspension, should fail since it
           // has now been suspended
           const {

tests/30-interop.js

@@ -29,17 +29,16 @@ describe('StatusList2021 Credentials (Interop "statusPurpose: revocation")',
     this.rowLabel = 'Issuer';
     this.columnLabel = 'Verifier';
     for(const [issuerName, {endpoints}] of issuerMatches) {
-      let issuedVc;
+      let issuer;
       before(async function() {
-        const [issuer] = endpoints.filter(
-          endpoint => endpoint.settings.tags.includes('Revocation'));
-        issuedVc = issueVc({issuer});
+        ([issuer] = endpoints.filter(
+          endpoint => endpoint.settings.tags.includes('Revocation')));
       });
       for(const [verifierName, {endpoints}] of verifierMatches) {
         const [verifier] = endpoints;
         it(`${verifierName} should verify ${issuerName}`, async function() {
           this.test.cell = {rowId: issuerName, columnId: verifierName};
-          const {data: vc, error: err} = await issuedVc;
+          const {data: vc, error: err} = await issueVc({issuer});
           should.not.exist(err);
           should.exist(vc);
           const body = createRequestBody({vc});

tests/helpers.js

@@ -23,17 +23,30 @@ export const ISOTimeStamp = ({date = new Date()} = {}) => {
 };
 
 export const getCredentialStatus = async ({verifiableCredential}) => {
+  // get SLC for the VC
   const {credentialStatus} = verifiableCredential;
-  const {statusListCredential} = credentialStatus;
-  // get StatusList Credential for the VC
-  const {data: slc} = await httpClient.get(
-    statusListCredential, {agent});
-  const {credentialSubject: {encodedList}} = slc;
+  if(Array.isArray(credentialStatus)) {
+    throw new Error('Multiple credential statuses not supported.');
+  }
+  let slcUrl;
+  let statusListIndexProperty;
+  if(credentialStatus.type === 'RevocationList2020Status') {
+    slcUrl = credentialStatus.revocationListCredential;
+    statusListIndexProperty = 'revocationListIndex';
+  } else {
+    slcUrl = credentialStatus.statusListCredential;
+    statusListIndexProperty = 'statusListIndex';
+  }
+  if(!slcUrl) {
+    throw new Error('Status list credential missing from credential status.');
+  }
+  const {data: slc} = await httpClient.get(slcUrl, {agent});
+  const {encodedList} = slc.credentialSubject;
   const list = await decodeList({encodedList});
   const statusListIndex = parseInt(
-    credentialStatus.statusListIndex, 10);
+    credentialStatus[statusListIndexProperty], 10);
   const status = list.getStatus(statusListIndex);
-  return {status, statusListCredential};
+  return {status, statusListCredential: slcUrl};
 };
 
 export const issueVc = async ({issuer}) => {
@@ -102,8 +115,5 @@ export async function updateStatus({
   should.not.exist(err2);
   should.exist(result2);
   statusCode2.should.equal(204);
-  // get the status of the VC
-  const {status} = await getCredentialStatus({verifiableCredential: vc});
-  status.should.equal(true);
   return vc;
 }