Update validator interface

src/cr1/types.ts

@@ -255,17 +255,16 @@ export type ConformanceWarningMessage = {
 
 export type SchemaValidation = 'succeeded' | 'failed' | 'ignored'
 
-
 export type StatusCheckResult = {
-  set: boolean,
-  purpose: string,
   errors?: StatusListError[]
-} & Record<string, any>
+} & Record<string, any> // because of enumerations.
+
+export type SchemaCheckResult = { validation?: SchemaValidation, errors?: JsonSchemaError[], }
 
 export type ValidationResult = {
-  valid: boolean
+  verified: boolean
   content: VerifiableCredential
-  schema: Record<string, { validation?: SchemaValidation, errors?: JsonSchemaError[], }>
+  schema: Record<string, SchemaCheckResult>
   status: Record<string, StatusCheckResult>
   warnings: ConformanceWarningMessage[]
 }

src/cr1/validator/index.ts

@@ -26,7 +26,7 @@ export const validator = ({ resolver }: RequestValidator) => {
     validate: async <T = TraceablePresentationValidationResult>({ type, content }: SecuredContentType) => {
       const verified = await verifier({ resolver }).verify<VerifiableCredential>({ type, content })
       const validation: ValidationResult = {
-        valid: true,
+        verified: true,
         content: verified,
         schema: {},
         status: {},
@@ -65,7 +65,6 @@ export const validator = ({ resolver }: RequestValidator) => {
             }
             validation.schema[schema.id] = { validation: valid ? 'succeeded' : 'failed' }
             if (!valid) {
-              validation.valid = false
               validation.schema[schema.id].errors = compiledSchemaValidator.errors as JsonSchemaError[]
             }
           }
@@ -84,20 +83,15 @@ export const validator = ({ resolver }: RequestValidator) => {
             const verified = await verifier({ resolver }).verify<BitstringStatusListCredential>(statusListCredential)
             // confirm purpose matches
             if (status.statusPurpose !== verified.credentialSubject.statusPurpose) {
-              validation.valid = false
               validation.status[`${status.id}`] = {
-                set: false,
-                purpose: status.statusPurpose,
+                [status.statusPurpose]: false,
                 errors: [{
                   message: 'status list purpose does not match credential status'
                 }]
               }
             } else {
               const bit = bs(verified.credentialSubject.encodedList).get(parseInt(status.statusListIndex, 10))
-              if (bit) {
-                validation.valid = false
-              }
-              validation.status[`${status.id}`] = { set: bit, purpose: status.statusPurpose, [status.statusPurpose]: bit }
+              validation.status[`${status.id}`] = { [status.statusPurpose]: bit }
             }
 
           }

test/json-schema-tests/better-schema-errors.test.ts

@@ -117,7 +117,7 @@ credentialSubject:
     type: "application/vc+ld+json+jwt",
     content: issued,
   });
-  expect(validation1.valid).toBe(false);
+  expect(validation1.verified).toBe(true);
   expect(validation1.schema).toEqual({
     "https://vendor.example/api/schemas/product-passport": {
       "validation": "failed",

test/json-schema-tests/json-schema-tests.test.ts

@@ -221,12 +221,12 @@ credentialSubject:
       type: "application/vc+ld+json+jwt",
       content: issued,
     });
-    expect(valid1.valid).toBe(true);
+    expect(valid1.verified).toBe(true);
 
     const valid2 = await validator.validate({
       type: "application/vc+ld+json+jwt",
       content: issued,
     });
-    expect(valid2.valid).toBe(true);
+    expect(valid2.verified).toBe(true);
   });
 });

test/json-schema-tests/optional-schema-validation.test.ts

@@ -84,7 +84,7 @@ it("can disable schema validation", async () => {
     type: "application/vc+ld+json+jwt",
     content: issued,
   });
-  expect(validation1.valid).toBe(true);
+  expect(validation1.verified).toBe(true);
   // console.log(JSON.stringify(validation1, null, 2))
   expect(validation1.schema['https://vendor.example/api/schemas/product-passport'].validation).toBe('ignored')
 });

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

@@ -213,10 +213,10 @@ credentialSubject:
       type: 'application/vc+ld+json+jwt',
       content: issued,
     })
-    expect(validated.valid).toBe(true)
+    expect(validated.verified).toBe(true)
     expect(validated.schema[`${baseURL}/schemas/product-passport`].validation).toBe('succeeded')
-    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 })
+    expect(validated.status[`${baseURL}/credentials/status/3#${revocationIndex}`]).toEqual({ "revocation": false, })
+    expect(validated.status[`${baseURL}/credentials/status/4#${suspensionIndex}`]).toEqual({ "suspension": false, })
 
 
     const vp = await transmute

test/w3c-cr-1/3-schema.test.ts

@@ -88,7 +88,7 @@ credentialSubject:
           `)
           }),
       })
-    expect(validation.valid).toBe(true);
+    expect(validation.verified).toBe(true);
     expect(validation.schema).toEqual({ 'https://issuer.example/schemas/42': { validation: 'succeeded' } });
   })
 
@@ -154,7 +154,7 @@ credentialSubject:
           `)
           }),
       })
-    expect(validation.valid).toBe(false);
+    expect(validation.verified).toBe(true);
     expect(validation.schema).toEqual({
       "https://issuer.example/schemas/52": {
         "validation": 'failed',

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

@@ -96,11 +96,9 @@ credentialSubject:
           `)
             }),
         })
-      expect(validation.valid).toBe(true);
+      expect(validation.verified).toBe(true);
       expect(validation.status['https://example.com/credentials/status/3#94567']).toEqual({
-        "purpose": "revocation",
         "revocation": false,
-        "set": false
       });
 
     })
@@ -186,11 +184,9 @@ credentialSubject:
           `)
             }),
         })
-      expect(validation.valid).toBe(false);
+      expect(validation.verified).toBe(true);
       expect(validation.status['https://example.com/credentials/status/3#94567']).toEqual({
-        "purpose": "revocation",
         "revocation": true,
-        "set": true
       });
     })
   })
@@ -265,10 +261,8 @@ credentialSubject:
           `)
             }),
         })
-      expect(validation.valid).toBe(true);
+      expect(validation.verified).toBe(true);
       expect(validation.status['https://example.com/credentials/status/3#94567']).toEqual({
-        "set": false,
-        "purpose": "suspension",
         "suspension": false
       });
 
@@ -355,10 +349,8 @@ credentialSubject:
           `)
             }),
         })
-      expect(validation.valid).toBe(false);
+      expect(validation.verified).toBe(true);
       expect(validation.status['https://example.com/credentials/status/3#94567']).toEqual({
-        "set": true,
-        "purpose": "suspension",
         "suspension": true
       });