Merge pull request #51 from vaxxnz/feature/return_credential_if_valid…

…_sign

Feature/return credential if valid sign

src/generalTypes.ts

@@ -9,4 +9,4 @@ export interface Violates {
 
 export type VerificationResult =
   | { success: true; violates: null; credentialSubject: CredentialSubject }
-  | { success: false; violates: Violates; credentialSubject: null };
+  | { success: false; violates: Violates; credentialSubject: CredentialSubject | null };

src/main.test.ts

@@ -81,6 +81,7 @@ test("Expired Pass is unsuccessful", async () => {
   });
   expect(result.success).toBe(false);
   expect(result.violates?.section).toBe("2.1.0.4.3");
+  expect(result.credentialSubject?.dob).toBeTruthy()
 });
 
 // https://nzcp.covid19.health.nz/#not-active-pass
@@ -92,6 +93,7 @@ test("Not Active pass is unsuccessful", async () => {
   });
   expect(result.success).toBe(false);
   expect(result.violates?.section).toBe("2.1.0.3.3");
+  expect(result.credentialSubject?.dob).toBeTruthy()
 });
 
 // Custom Test: non base-32 string in the payload

src/main.ts

@@ -80,14 +80,20 @@ export const verifyPassURIOffline = (
     };
   } catch (err) {
     const error = err as Error;
-    return {
-      success: false,
-      violates:
-        "violates" in error
-          ? (error as Violation).violates
-          : { message: err.message, section: "unknown", link: "" },
-      credentialSubject: null,
-    };
+    if ("violates" in error) {
+      const violation = error as Violation;
+      return {
+        success: false,
+        violates: violation.violates,
+        credentialSubject: violation.credentialSubject,
+      };
+    } else {
+      return {
+        success: false,
+        violates: { message: err.message, section: "unknown", link: "" },
+        credentialSubject: null,
+      };
+    }
   }
 };
 
@@ -120,7 +126,7 @@ export const verifyPassURI = async (
         message: didResult.didResolutionMetadata.error,
         link: "https://nzcp.covid19.health.nz/#ref:DID-CORE",
         section: "DID-CORE.1",
-        description: "Could not resolve trusted issuer."
+        description: "Could not resolve trusted issuer.",
       });
     }
 
@@ -138,14 +144,20 @@ export const verifyPassURI = async (
     };
   } catch (err) {
     const error = err as Error;
-    return {
-      success: false,
-      violates:
-        "violates" in error
-          ? (error as Violation).violates
-          : { message: err.message, section: "unknown", link: "" },
-      credentialSubject: null,
-    };
+    if ("violates" in error) {
+      const violation = error as Violation;
+      return {
+        success: false,
+        violates: violation.violates,
+        credentialSubject: violation.credentialSubject,
+      };
+    } else {
+      return {
+        success: false,
+        violates: { message: err.message, section: "unknown", link: "" },
+        credentialSubject: null,
+      };
+    }
   }
 };
 
@@ -459,6 +471,17 @@ const getCredentialSubject = (
 
   // TODO: section number?
   // With the payload returned from the COSE_Sign1 decoding, check if it is a valid CWT containing the claims defined in the data model section, if these conditions are not meet then fail.
-  const validatedCwtClaims = validateCWTClaims(cwtClaims);
-  return validatedCwtClaims.vc.credentialSubject;
+  try {
+    const validatedCwtClaims = validateCWTClaims(cwtClaims);
+    return validatedCwtClaims.vc.credentialSubject;
+  } catch (e) {
+    if ("violates" in e) {
+      throw new Violation(
+        (e as Violation).violates,
+        cwtClaims.vc?.credentialSubject
+      );
+    } else {
+      throw e;
+    }
+  }
 };

src/violation.ts

@@ -1,11 +1,14 @@
+import { CredentialSubject } from "./cwtTypes";
 import { Violates } from "./generalTypes";
 
 type ViolationOptions = Violates;
 
 export class Violation extends Error {
   violates: Violates;
-  constructor(options: ViolationOptions) {
+  credentialSubject: CredentialSubject | null
+  constructor(options: ViolationOptions, credentialSubject: CredentialSubject | null = null) {
     super(options.message);
     this.violates = options;
+    this.credentialSubject = credentialSubject;
   }
 }