@zkpassport/sdk 0.7.0 → 0.7.1

package/dist/cjs/index.cjs

@@ -994,18 +994,7 @@ var ZKPassport = class {
       }
     } else if (request.method === "done") {
       noLogger.debug(`User sent the query result`);
-      const formattedResult = request.params;
-      if (formattedResult.birthdate && formattedResult.birthdate.disclose) {
-        formattedResult.birthdate.disclose.result = new Date(
-          formattedResult.birthdate.disclose.result
-        );
-      }
-      if (formattedResult.expiry_date && formattedResult.expiry_date.disclose) {
-        formattedResult.expiry_date.disclose.result = new Date(
-          formattedResult.expiry_date.disclose.result
-        );
-      }
-      this.topicToResults[topic] = formattedResult;
+      this.topicToResults[topic] = (0, import_utils.formatQueryResultDates)(request.params);
       if (this.topicToExpectedProofCount[topic] === this.topicToProofs[topic].length) {
         await this.handleResult(topic);
       }
@@ -1223,7 +1212,7 @@ var ZKPassport = class {
     if (queryResult.birthdate) {
       const birthdatePassport = disclosedDataPassport.dateOfBirth;
       const birthdateIDCard = disclosedDataIDCard.dateOfBirth;
-      if (queryResult.birthdate.eq && queryResult.birthdate.eq.result && queryResult.birthdate.eq.expected.getTime() !== birthdatePassport.getTime() && queryResult.birthdate.eq.expected.getTime() !== birthdateIDCard.getTime()) {
+      if (queryResult.birthdate.eq && queryResult.birthdate.eq.result && !(0, import_utils.areDatesEqual)(queryResult.birthdate.eq.expected, birthdatePassport) && !(0, import_utils.areDatesEqual)(queryResult.birthdate.eq.expected, birthdateIDCard)) {
         console.warn("Birthdate does not match the expected birthdate");
         isCorrect = false;
         queryResultErrors.birthdate.eq = {
@@ -1232,7 +1221,7 @@ var ZKPassport = class {
           message: "Birthdate does not match the expected birthdate"
         };
       }
-      if (queryResult.birthdate.disclose && queryResult.birthdate.disclose.result.getTime() !== birthdatePassport.getTime() && queryResult.birthdate.disclose.result.getTime() !== birthdateIDCard.getTime()) {
+      if (queryResult.birthdate.disclose && !(0, import_utils.areDatesEqual)(queryResult.birthdate.disclose.result, birthdatePassport) && !(0, import_utils.areDatesEqual)(queryResult.birthdate.disclose.result, birthdateIDCard)) {
         console.warn("Birthdate does not match the disclosed birthdate in query result");
         isCorrect = false;
         queryResultErrors.birthdate.disclose = {
@@ -1245,7 +1234,7 @@ var ZKPassport = class {
     if (queryResult.expiry_date) {
       const expiryDatePassport = disclosedDataPassport.dateOfExpiry;
       const expiryDateIDCard = disclosedDataIDCard.dateOfExpiry;
-      if (queryResult.expiry_date.eq && queryResult.expiry_date.eq.result && queryResult.expiry_date.eq.expected.getTime() !== expiryDatePassport.getTime() && queryResult.expiry_date.eq.expected.getTime() !== expiryDateIDCard.getTime()) {
+      if (queryResult.expiry_date.eq && queryResult.expiry_date.eq.result && !(0, import_utils.areDatesEqual)(queryResult.expiry_date.eq.expected, expiryDatePassport) && !(0, import_utils.areDatesEqual)(queryResult.expiry_date.eq.expected, expiryDateIDCard)) {
         console.warn("Expiry date does not match the expected expiry date");
         isCorrect = false;
         queryResultErrors.expiry_date.eq = {
@@ -1254,7 +1243,7 @@ var ZKPassport = class {
           message: "Expiry date does not match the expected expiry date"
         };
       }
-      if (queryResult.expiry_date.disclose && queryResult.expiry_date.disclose.result.getTime() !== expiryDatePassport.getTime() && queryResult.expiry_date.disclose.result.getTime() !== expiryDateIDCard.getTime()) {
+      if (queryResult.expiry_date.disclose && !(0, import_utils.areDatesEqual)(queryResult.expiry_date.disclose.result, expiryDatePassport) && !(0, import_utils.areDatesEqual)(queryResult.expiry_date.disclose.result, expiryDateIDCard)) {
         console.warn("Expiry date does not match the disclosed expiry date in query result");
         isCorrect = false;
         queryResultErrors.expiry_date.disclose = {
@@ -1524,7 +1513,7 @@ var ZKPassport = class {
     const currentDate = (0, import_utils.getCurrentDateFromCommittedInputs)(
       proof.committedInputs?.compare_age
     );
-    if (currentDate.getTime() !== today.getTime() && currentDate.getTime() !== today.getTime() - 864e5) {
+    if (!(0, import_utils.areDatesEqual)(currentDate, today) && !(0, import_utils.areDatesEqual)(currentDate, today.getTime() - 864e5)) {
       console.warn("Current date in the proof is too old");
       isCorrect = false;
       queryResultErrors.age.disclose = {
@@ -1604,7 +1593,7 @@ var ZKPassport = class {
           };
         }
       }
-      if (!queryResult.birthdate.lte && !queryResult.birthdate.range && maxDate.getTime() != DEFAULT_DATE_VALUE.getTime()) {
+      if (!queryResult.birthdate.lte && !queryResult.birthdate.range && !(0, import_utils.areDatesEqual)(maxDate, DEFAULT_DATE_VALUE)) {
         console.warn("Maximum birthdate should be equal to default date value");
         isCorrect = false;
         queryResultErrors.birthdate.disclose = {
@@ -1613,7 +1602,7 @@ var ZKPassport = class {
           message: "Maximum birthdate should be equal to default date value"
         };
       }
-      if (!queryResult.birthdate.gte && !queryResult.birthdate.range && minDate.getTime() != DEFAULT_DATE_VALUE.getTime()) {
+      if (!queryResult.birthdate.gte && !queryResult.birthdate.range && !(0, import_utils.areDatesEqual)(minDate, DEFAULT_DATE_VALUE)) {
         console.warn("Minimum birthdate should be equal to default date value");
         isCorrect = false;
         queryResultErrors.birthdate.disclose = {
@@ -1629,7 +1618,7 @@ var ZKPassport = class {
         message: "Birthdate is not set in the query result"
       };
     }
-    if (currentDate.getTime() !== today.getTime() && currentDate.getTime() !== today.getTime() - 864e5) {
+    if (!(0, import_utils.areDatesEqual)(currentDate, today) && !(0, import_utils.areDatesEqual)(currentDate, today.getTime() - 864e5)) {
       console.warn("Current date in the proof is too old");
       isCorrect = false;
       queryResultErrors.age.disclose = {
@@ -1709,7 +1698,7 @@ var ZKPassport = class {
           };
         }
       }
-      if (!queryResult.expiry_date.lte && !queryResult.expiry_date.range && maxDate.getTime() != DEFAULT_DATE_VALUE.getTime()) {
+      if (!queryResult.expiry_date.lte && !queryResult.expiry_date.range && !(0, import_utils.areDatesEqual)(maxDate, DEFAULT_DATE_VALUE)) {
         console.warn("Maximum expiry date should be equal to default date value");
         isCorrect = false;
         queryResultErrors.expiry_date.disclose = {
@@ -1718,7 +1707,7 @@ var ZKPassport = class {
           message: "Maximum expiry date should be equal to default date value"
         };
       }
-      if (!queryResult.expiry_date.gte && !queryResult.expiry_date.range && minDate.getTime() != DEFAULT_DATE_VALUE.getTime()) {
+      if (!queryResult.expiry_date.gte && !queryResult.expiry_date.range && !(0, import_utils.areDatesEqual)(minDate, DEFAULT_DATE_VALUE)) {
         console.warn("Minimum expiry date should be equal to default date value");
         isCorrect = false;
         queryResultErrors.expiry_date.disclose = {
@@ -1734,7 +1723,7 @@ var ZKPassport = class {
         message: "Expiry date is not set in the query result"
       };
     }
-    if (currentDate.getTime() !== today.getTime() && currentDate.getTime() !== today.getTime() - 864e5) {
+    if (!(0, import_utils.areDatesEqual)(currentDate, today) && !(0, import_utils.areDatesEqual)(currentDate, today.getTime() - 864e5)) {
       console.warn("Current date in the proof is too old");
       isCorrect = false;
       queryResultErrors.age.disclose = {
@@ -2865,17 +2854,7 @@ var ZKPassport = class {
         verified: false
       };
     }
-    const formattedResult = queryResult;
-    if (formattedResult.birthdate && formattedResult.birthdate.disclose) {
-      formattedResult.birthdate.disclose.result = new Date(
-        formattedResult.birthdate.disclose.result
-      );
-    }
-    if (formattedResult.expiry_date && formattedResult.expiry_date.disclose) {
-      formattedResult.expiry_date.disclose.result = new Date(
-        formattedResult.expiry_date.disclose.result
-      );
-    }
+    const formattedResult = (0, import_utils.formatQueryResultDates)(queryResult);
     const { BarretenbergVerifier } = await import("@aztec/bb.js");
     if (typeof window === "undefined" && !writingDirectory) {
       writingDirectory = "/tmp";

package/dist/esm/index.js

@@ -46,7 +46,9 @@ import {
   getBindEVMParameterCommitment,
   getBindParameterCommitment,
   formatBoundData,
-  getCircuitRegistryRootFromOuterProof
+  getCircuitRegistryRootFromOuterProof,
+  areDatesEqual,
+  formatQueryResultDates
 } from "@zkpassport/utils";
 import { bytesToHex } from "@noble/ciphers/utils";
 import i18en from "i18n-iso-countries/langs/en.json";
@@ -994,18 +996,7 @@ var ZKPassport = class {
       }
     } else if (request.method === "done") {
       noLogger.debug(`User sent the query result`);
-      const formattedResult = request.params;
-      if (formattedResult.birthdate && formattedResult.birthdate.disclose) {
-        formattedResult.birthdate.disclose.result = new Date(
-          formattedResult.birthdate.disclose.result
-        );
-      }
-      if (formattedResult.expiry_date && formattedResult.expiry_date.disclose) {
-        formattedResult.expiry_date.disclose.result = new Date(
-          formattedResult.expiry_date.disclose.result
-        );
-      }
-      this.topicToResults[topic] = formattedResult;
+      this.topicToResults[topic] = formatQueryResultDates(request.params);
       if (this.topicToExpectedProofCount[topic] === this.topicToProofs[topic].length) {
         await this.handleResult(topic);
       }
@@ -1223,7 +1214,7 @@ var ZKPassport = class {
     if (queryResult.birthdate) {
       const birthdatePassport = disclosedDataPassport.dateOfBirth;
       const birthdateIDCard = disclosedDataIDCard.dateOfBirth;
-      if (queryResult.birthdate.eq && queryResult.birthdate.eq.result && queryResult.birthdate.eq.expected.getTime() !== birthdatePassport.getTime() && queryResult.birthdate.eq.expected.getTime() !== birthdateIDCard.getTime()) {
+      if (queryResult.birthdate.eq && queryResult.birthdate.eq.result && !areDatesEqual(queryResult.birthdate.eq.expected, birthdatePassport) && !areDatesEqual(queryResult.birthdate.eq.expected, birthdateIDCard)) {
         console.warn("Birthdate does not match the expected birthdate");
         isCorrect = false;
         queryResultErrors.birthdate.eq = {
@@ -1232,7 +1223,7 @@ var ZKPassport = class {
           message: "Birthdate does not match the expected birthdate"
         };
       }
-      if (queryResult.birthdate.disclose && queryResult.birthdate.disclose.result.getTime() !== birthdatePassport.getTime() && queryResult.birthdate.disclose.result.getTime() !== birthdateIDCard.getTime()) {
+      if (queryResult.birthdate.disclose && !areDatesEqual(queryResult.birthdate.disclose.result, birthdatePassport) && !areDatesEqual(queryResult.birthdate.disclose.result, birthdateIDCard)) {
         console.warn("Birthdate does not match the disclosed birthdate in query result");
         isCorrect = false;
         queryResultErrors.birthdate.disclose = {
@@ -1245,7 +1236,7 @@ var ZKPassport = class {
     if (queryResult.expiry_date) {
       const expiryDatePassport = disclosedDataPassport.dateOfExpiry;
       const expiryDateIDCard = disclosedDataIDCard.dateOfExpiry;
-      if (queryResult.expiry_date.eq && queryResult.expiry_date.eq.result && queryResult.expiry_date.eq.expected.getTime() !== expiryDatePassport.getTime() && queryResult.expiry_date.eq.expected.getTime() !== expiryDateIDCard.getTime()) {
+      if (queryResult.expiry_date.eq && queryResult.expiry_date.eq.result && !areDatesEqual(queryResult.expiry_date.eq.expected, expiryDatePassport) && !areDatesEqual(queryResult.expiry_date.eq.expected, expiryDateIDCard)) {
         console.warn("Expiry date does not match the expected expiry date");
         isCorrect = false;
         queryResultErrors.expiry_date.eq = {
@@ -1254,7 +1245,7 @@ var ZKPassport = class {
           message: "Expiry date does not match the expected expiry date"
         };
       }
-      if (queryResult.expiry_date.disclose && queryResult.expiry_date.disclose.result.getTime() !== expiryDatePassport.getTime() && queryResult.expiry_date.disclose.result.getTime() !== expiryDateIDCard.getTime()) {
+      if (queryResult.expiry_date.disclose && !areDatesEqual(queryResult.expiry_date.disclose.result, expiryDatePassport) && !areDatesEqual(queryResult.expiry_date.disclose.result, expiryDateIDCard)) {
         console.warn("Expiry date does not match the disclosed expiry date in query result");
         isCorrect = false;
         queryResultErrors.expiry_date.disclose = {
@@ -1524,7 +1515,7 @@ var ZKPassport = class {
     const currentDate = getCurrentDateFromCommittedInputs(
       proof.committedInputs?.compare_age
     );
-    if (currentDate.getTime() !== today.getTime() && currentDate.getTime() !== today.getTime() - 864e5) {
+    if (!areDatesEqual(currentDate, today) && !areDatesEqual(currentDate, today.getTime() - 864e5)) {
       console.warn("Current date in the proof is too old");
       isCorrect = false;
       queryResultErrors.age.disclose = {
@@ -1604,7 +1595,7 @@ var ZKPassport = class {
           };
         }
       }
-      if (!queryResult.birthdate.lte && !queryResult.birthdate.range && maxDate.getTime() != DEFAULT_DATE_VALUE.getTime()) {
+      if (!queryResult.birthdate.lte && !queryResult.birthdate.range && !areDatesEqual(maxDate, DEFAULT_DATE_VALUE)) {
         console.warn("Maximum birthdate should be equal to default date value");
         isCorrect = false;
         queryResultErrors.birthdate.disclose = {
@@ -1613,7 +1604,7 @@ var ZKPassport = class {
           message: "Maximum birthdate should be equal to default date value"
         };
       }
-      if (!queryResult.birthdate.gte && !queryResult.birthdate.range && minDate.getTime() != DEFAULT_DATE_VALUE.getTime()) {
+      if (!queryResult.birthdate.gte && !queryResult.birthdate.range && !areDatesEqual(minDate, DEFAULT_DATE_VALUE)) {
         console.warn("Minimum birthdate should be equal to default date value");
         isCorrect = false;
         queryResultErrors.birthdate.disclose = {
@@ -1629,7 +1620,7 @@ var ZKPassport = class {
         message: "Birthdate is not set in the query result"
       };
     }
-    if (currentDate.getTime() !== today.getTime() && currentDate.getTime() !== today.getTime() - 864e5) {
+    if (!areDatesEqual(currentDate, today) && !areDatesEqual(currentDate, today.getTime() - 864e5)) {
       console.warn("Current date in the proof is too old");
       isCorrect = false;
       queryResultErrors.age.disclose = {
@@ -1709,7 +1700,7 @@ var ZKPassport = class {
           };
         }
       }
-      if (!queryResult.expiry_date.lte && !queryResult.expiry_date.range && maxDate.getTime() != DEFAULT_DATE_VALUE.getTime()) {
+      if (!queryResult.expiry_date.lte && !queryResult.expiry_date.range && !areDatesEqual(maxDate, DEFAULT_DATE_VALUE)) {
         console.warn("Maximum expiry date should be equal to default date value");
         isCorrect = false;
         queryResultErrors.expiry_date.disclose = {
@@ -1718,7 +1709,7 @@ var ZKPassport = class {
           message: "Maximum expiry date should be equal to default date value"
         };
       }
-      if (!queryResult.expiry_date.gte && !queryResult.expiry_date.range && minDate.getTime() != DEFAULT_DATE_VALUE.getTime()) {
+      if (!queryResult.expiry_date.gte && !queryResult.expiry_date.range && !areDatesEqual(minDate, DEFAULT_DATE_VALUE)) {
         console.warn("Minimum expiry date should be equal to default date value");
         isCorrect = false;
         queryResultErrors.expiry_date.disclose = {
@@ -1734,7 +1725,7 @@ var ZKPassport = class {
         message: "Expiry date is not set in the query result"
       };
     }
-    if (currentDate.getTime() !== today.getTime() && currentDate.getTime() !== today.getTime() - 864e5) {
+    if (!areDatesEqual(currentDate, today) && !areDatesEqual(currentDate, today.getTime() - 864e5)) {
       console.warn("Current date in the proof is too old");
       isCorrect = false;
       queryResultErrors.age.disclose = {
@@ -2865,17 +2856,7 @@ var ZKPassport = class {
         verified: false
       };
     }
-    const formattedResult = queryResult;
-    if (formattedResult.birthdate && formattedResult.birthdate.disclose) {
-      formattedResult.birthdate.disclose.result = new Date(
-        formattedResult.birthdate.disclose.result
-      );
-    }
-    if (formattedResult.expiry_date && formattedResult.expiry_date.disclose) {
-      formattedResult.expiry_date.disclose.result = new Date(
-        formattedResult.expiry_date.disclose.result
-      );
-    }
+    const formattedResult = formatQueryResultDates(queryResult);
     const { BarretenbergVerifier } = await import("@aztec/bb.js");
     if (typeof window === "undefined" && !writingDirectory) {
       writingDirectory = "/tmp";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zkpassport/sdk",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "Privacy-preserving identity verification using passports and ID cards",
   "author": "ZKPassport",
   "license": "Apache-2.0",
@@ -37,7 +37,7 @@
     "@noble/secp256k1": "^2.2.3",
     "@obsidion/bridge": "^0.10.4",
     "@zkpassport/registry": "0.8.0",
-    "@zkpassport/utils": "0.19.0",
+    "@zkpassport/utils": "0.19.1",
     "buffer": "^6.0.3",
     "i18n-iso-countries": "^7.12.0",
     "pako": "^2.1.0",