fix: use shared verify for documentService.js

OpenCerts · Aug 30, 2024 · 11b06af · 11b06af
1 parent 129bebe
commit 11b06af
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/src/shared/verify.js b/src/shared/verify.js
@@ -1,4 +1,4 @@
-const { getData } = require("@govtechsg/open-attestation");
+const { getData, validateSchema } = require("@govtechsg/open-attestation");
 const {
   verificationBuilder,
   openAttestationVerifiers
@@ -13,15 +13,21 @@ const IS_MAINNET =
 /**
  * A wrapper of verify to auto-switch between Ethereum and Polygon
  */
-export const verify = (document) => {
+export const verify = async (document) => {
+  if (!validateSchema(document)) {
+    // Following current behaviour of from "@govtechsg/opencerts-verify"
+    // E.g. await verify({ "bad": "document" }) // returns undefined
+    return undefined;
+  }
+
   const _verify = verificationBuilder(
     [...openAttestationVerifiers, registryVerifier],
     {
       network: getNetworkName(document)
     }
   );
 
-  return _verify(document);
+  return await _verify(document);
 };
 
 function getNetworkName(document) {

diff --git a/src/storage/documentService/documentService.js b/src/storage/documentService/documentService.js
@@ -1,10 +1,11 @@
 const { v4: uuidv4 } = require("uuid");
-const { verify, isValid } = require("@govtechsg/opencerts-verify"); // FIXME: Unable to use `src/shared/verify.js` due to weird crash claiming `network` is undefined
+const { isValid } = require("@govtechsg/opencerts-verify"); // FIXME: Unable to use `src/shared/verify.js` due to weird crash claiming `network` is undefined
 const {
   encryptString,
   generateEncryptionKey
 } = require("@govtechsg/oa-encryption");
 
+const { verify } = require("../../shared/verify");
 const config = require("../config");
 const { put, get, remove } = require("../s3");
 
@@ -68,7 +69,7 @@ const uploadDocumentAtId = async (
     throw new Error("Ttl cannot exceed 90 days");
   }
 
-  const fragments = await verify({ network: config.network })(document);
+  const fragments = await verify(document);
   if (!isValid(fragments)) {
     throw new Error("Document is not valid");
   }
@@ -100,7 +101,7 @@ const uploadDocument = async (
   document,
   ttlInMicroseconds = DEFAULT_TTL_IN_MICROSECONDS
 ) => {
-  const fragments = await verify({ network: config.network })(document);
+  const fragments = await verify(document);
   if (!isValid(fragments)) {
     throw new Error("Document is not valid");
   }