fix: mf rate limit

OpenCerts · Jul 4, 2020 · 88ec82e · 88ec82e
1 parent 89d2639
commit 88ec82e
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 19 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -44,8 +44,8 @@
     ]
   },
   "dependencies": {
-    "@govtechsg/oa-verify": "3.3.0",
-    "@govtechsg/open-attestation": "3.1.1",
+    "@govtechsg/oa-verify": "3.4.0",
+    "@govtechsg/open-attestation": "3.9.0",
     "debug": "4.1.1",
     "node-fetch": "2.6.0"
   },

diff --git a/src/verify.ts b/src/verify.ts
@@ -4,11 +4,10 @@ import {
   Verifier,
   VerificationFragment,
   VerificationFragmentType,
-  VerificationManagerOptions,
-  isWrappedV3Document
+  VerificationManagerOptions
 } from "@govtechsg/oa-verify";
 import fetch from "node-fetch";
-import { getData, v2, v3, WrappedDocument } from "@govtechsg/open-attestation";
+import { getData, v2, v3, WrappedDocument, utils } from "@govtechsg/open-attestation";
 
 export interface RegistryEntry {
   name: string;
@@ -84,7 +83,7 @@ export const registryVerifier: Verifier<
   OpencertsRegistryVerificationFragmentData | OpencertsRegistryVerificationFragmentData[]
 > = {
   test: document => {
-    if (isWrappedV3Document(document)) {
+    if (utils.isWrappedV3Document(document)) {
       const documentData = getData(document);
       return documentData.proof.method === v3.Method.DocumentStore;
     }
@@ -106,7 +105,7 @@ export const registryVerifier: Verifier<
   verify: async document => {
     const registry: Registry = await fetch("https://opencerts.io/static/registry.json").then(res => res.json());
 
-    if (isWrappedV3Document(document)) {
+    if (utils.isWrappedV3Document(document)) {
       const documentData = getData(document);
       return storeToFragment(registry, documentData.proof.value);
     }

diff --git a/test/fixtures/v3/document.ts b/test/fixtures/v3/document.ts
@@ -1,10 +1,10 @@
-import { v3, WrappedDocument } from "@govtechsg/open-attestation";
+import { SchemaId, v3, WrappedDocument } from "@govtechsg/open-attestation";
 
 const issuerInRegistry = "0x532C9Ff853CA54370D7492cD84040F9f8099f11B";
 const issuerNotInRegistry = "0x8FC57204C35FB9317D91285EF52D6B892EC08CD3";
 
 export const documentWithDocumentStoreIssuerInRegistryAndValidDns: WrappedDocument<v3.OpenAttestationDocument> = {
-  version: "open-attestation/3.0",
+  version: SchemaId.v3,
   data: {
     reference: "23099a48-5d9f-463e-941f-28fffaabaec7:string:ABCXXXXX00",
     name: "f7da877a-ba98-4317-9434-67b072bd620a:string:Certificate of whatever",
@@ -36,7 +36,7 @@ export const documentWithDocumentStoreIssuerInRegistryAndValidDns: WrappedDocume
   }
 };
 export const documentWithDocumentStoreIssuerInRegistryAndInvalidDns: WrappedDocument<v3.OpenAttestationDocument> = {
-  version: "open-attestation/3.0",
+  version: SchemaId.v3,
   data: {
     reference: "23099a48-5d9f-463e-941f-28fffaabaec7:string:ABCXXXXX00",
     name: "f7da877a-ba98-4317-9434-67b072bd620a:string:Certificate of whatever",
@@ -68,7 +68,7 @@ export const documentWithDocumentStoreIssuerInRegistryAndInvalidDns: WrappedDocu
   }
 };
 export const documentWithDocumentStoreIssuerNotInRegistryAndValidDns: WrappedDocument<v3.OpenAttestationDocument> = {
-  version: "open-attestation/3.0",
+  version: SchemaId.v3,
   data: {
     reference: "23099a48-5d9f-463e-941f-28fffaabaec7:string:ABCXXXXX00",
     name: "f7da877a-ba98-4317-9434-67b072bd620a:string:Certificate of whatever",
@@ -101,7 +101,7 @@ export const documentWithDocumentStoreIssuerNotInRegistryAndValidDns: WrappedDoc
 };
 
 export const documentWithDocumentStoreIssuerNotInRegistryAndInvalidDns: WrappedDocument<v3.OpenAttestationDocument> = {
-  version: "open-attestation/3.0",
+  version: SchemaId.v3,
   data: {
     reference: "23099a48-5d9f-463e-941f-28fffaabaec7:string:ABCXXXXX00",
     name: "f7da877a-ba98-4317-9434-67b072bd620a:string:Certificate of whatever",
@@ -134,7 +134,7 @@ export const documentWithDocumentStoreIssuerNotInRegistryAndInvalidDns: WrappedD
 };
 
 export const documentRopstenValidWithDocumentStore: WrappedDocument<v3.OpenAttestationDocument> = {
-  version: "open-attestation/3.0",
+  version: SchemaId.v3,
   data: {
     reference: "8354acc7-74ab-4cab-be1c-1bf1e10a6920:string:ABCXXXXX00",
     name: "1c1df86c-168e-4519-805b-f38698e5b00e:string:Certificate of whatever",

diff --git a/test/verify.v2.test.ts b/test/verify.v2.test.ts
@@ -28,6 +28,16 @@ describe("verify", () => {
         name: "OpenAttestationHash",
         type: "DOCUMENT_INTEGRITY"
       },
+      {
+        name: "OpenAttestationSignedProof",
+        reason: {
+          code: 4,
+          codeString: "SKIPPED",
+          message: "Document does not have a proof block"
+        },
+        status: "SKIPPED",
+        type: "DOCUMENT_STATUS"
+      },
       {
         data: {
           details: [

diff --git a/test/verify.v3.test.ts b/test/verify.v3.test.ts
@@ -20,6 +20,16 @@ describe("verify", () => {
         name: "OpenAttestationHash",
         type: "DOCUMENT_INTEGRITY"
       },
+      {
+        name: "OpenAttestationSignedProof",
+        reason: {
+          code: 4,
+          codeString: "SKIPPED",
+          message: "Document does not have a proof block"
+        },
+        status: "SKIPPED",
+        type: "DOCUMENT_STATUS"
+      },
       {
         data: {
           details: {
@@ -108,6 +118,16 @@ describe("verify", () => {
         name: "OpenAttestationHash",
         type: "DOCUMENT_INTEGRITY"
       },
+      {
+        name: "OpenAttestationSignedProof",
+        reason: {
+          code: 4,
+          codeString: "SKIPPED",
+          message: "Document does not have a proof block"
+        },
+        status: "SKIPPED",
+        type: "DOCUMENT_STATUS"
+      },
       {
         data: {
           details: {