intermediate

src/cr1/types.ts

@@ -255,11 +255,18 @@ export type ConformanceWarningMessage = {
 
 export type SchemaValidation = 'succeeded' | 'failed' | 'ignored'
 
+
+export type StatusCheckResult = {
+  set: boolean,
+  purpose: string,
+  errors?: StatusListError[]
+} & Record<string, any>
+
 export type ValidationResult = {
   valid: boolean
   content: VerifiableCredential
   schema: Record<string, { validation?: SchemaValidation, errors?: JsonSchemaError[], }>
-  status: Record<string, { valid: boolean, purpose: string, errors?: StatusListError[] }>
+  status: Record<string, StatusCheckResult>
   warnings: ConformanceWarningMessage[]
 }
 

src/cr1/validator/index.ts

@@ -86,7 +86,9 @@ export const validator = ({ resolver }: RequestValidator) => {
             if (status.statusPurpose !== verified.credentialSubject.statusPurpose) {
               validation.valid = false
               validation.status[`${status.id}`] = {
-                valid: false, purpose: status.statusPurpose, errors: [{
+                set: false,
+                purpose: status.statusPurpose,
+                errors: [{
                   message: 'status list purpose does not match credential status'
                 }]
               }
@@ -95,7 +97,7 @@ export const validator = ({ resolver }: RequestValidator) => {
               if (bit) {
                 validation.valid = false
               }
-              validation.status[`${status.id}`] = { valid: bit, purpose: status.statusPurpose }
+              validation.status[`${status.id}`] = { set: bit, purpose: status.statusPurpose, [status.statusPurpose]: bit }
             }
 
           }

test/jwt-product-passports/integration.test.ts

@@ -215,8 +215,8 @@ credentialSubject:
     })
     expect(validated.valid).toBe(true)
     expect(validated.schema[`${baseURL}/schemas/product-passport`].validation).toBe('succeeded')
-    expect(validated.status[`${baseURL}/credentials/status/3#${revocationIndex}`].valid).toBe(false)
-    expect(validated.status[`${baseURL}/credentials/status/4#${suspensionIndex}`].valid).toBe(false)
+    expect(validated.status[`${baseURL}/credentials/status/3#${revocationIndex}`]).toEqual({ "purpose": "revocation", "revocation": false, "set": false })
+    expect(validated.status[`${baseURL}/credentials/status/4#${suspensionIndex}`]).toEqual({ "purpose": "suspension", "suspension": false, "set": false })
 
 
     const vp = await transmute

test/w3c-cr-1/4-status.test.ts

@@ -97,8 +97,12 @@ credentialSubject:
             }),
         })
       expect(validation.valid).toBe(true);
-      expect(validation.status['https://example.com/credentials/status/3#94567'].valid).toBe(false);
-      expect(validation.status['https://example.com/credentials/status/3#94567'].purpose).toBe('revocation');
+      expect(validation.status['https://example.com/credentials/status/3#94567']).toEqual({
+        "purpose": "revocation",
+        "revocation": false,
+        "set": false
+      });
+
     })
 
     // failure here means REVOKED
@@ -183,8 +187,11 @@ credentialSubject:
             }),
         })
       expect(validation.valid).toBe(false);
-      expect(validation.status['https://example.com/credentials/status/3#94567'].valid).toBe(true);
-      expect(validation.status['https://example.com/credentials/status/3#94567'].purpose).toBe('revocation');
+      expect(validation.status['https://example.com/credentials/status/3#94567']).toEqual({
+        "purpose": "revocation",
+        "revocation": true,
+        "set": true
+      });
     })
   })
 
@@ -259,8 +266,12 @@ credentialSubject:
             }),
         })
       expect(validation.valid).toBe(true);
-      expect(validation.status['https://example.com/credentials/status/3#94567'].valid).toBe(false);
-      expect(validation.status['https://example.com/credentials/status/3#94567'].purpose).toBe('suspension');
+      expect(validation.status['https://example.com/credentials/status/3#94567']).toEqual({
+        "set": false,
+        "purpose": "suspension",
+        "suspension": false
+      });
+
     })
 
     // failure here means REVOKED
@@ -345,8 +356,12 @@ credentialSubject:
             }),
         })
       expect(validation.valid).toBe(false);
-      expect(validation.status['https://example.com/credentials/status/3#94567'].valid).toBe(true);
-      expect(validation.status['https://example.com/credentials/status/3#94567'].purpose).toBe('suspension');
+      expect(validation.status['https://example.com/credentials/status/3#94567']).toEqual({
+        "set": true,
+        "purpose": "suspension",
+        "suspension": true
+      });
+
     })
   })
 })