chore: change date handling

transmute-industries · Nov 15, 2021 · b49e413 · b49e413
1 parent 92db3c7
commit b49e413
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/packages/ed25519-signature-2018/src/Ed25519Signature2018.ts b/packages/ed25519-signature-2018/src/Ed25519Signature2018.ts
@@ -28,7 +28,12 @@ export class Ed25519Signature2018 {
   public verificationMethod?: string;
   constructor(options: IEd25519Signature2018Options = {}) {
     this.signer = options.signer;
-    this.date = options.date;
+    if(options.date) {
+      this.date = new Date(options.date);
+      if(isNaN(this.date)) {
+        throw TypeError(`"date" "${options.date}" is not a valid date.`);
+      }
+    }
     if (options.key) {
       this.key = options.key;
       this.verificationMethod = this.key.id;
@@ -152,20 +157,26 @@ export class Ed25519Signature2018 {
 
     // set default `now` date if not given in `proof` or `options`
     let date = this.date;
-    if (proof.created === undefined && date === undefined) {
+    if(proof.created === undefined && date === undefined) {
       date = new Date();
     }
 
     // ensure date is in string format
-    if (date !== undefined && typeof date !== "string") {
-      date = new Date(date).toISOString();
-      date = date.substr(0, date.length - 5) + "Z";
+    if(date && typeof date !== 'string') {
+      if(date === undefined || date === null) {
+        date = new Date();
+      } else if(typeof date === 'number' || typeof date === 'string') {
+        date = new Date(date);
+      }
+      const str = date.toISOString();
+      date = str.substr(0, str.length - 5) + 'Z';
     }
 
     // add API overrides
-    if (date !== undefined) {
+    if (date) {
       proof.created = date;
     }
+
     // `verificationMethod` is for newer suites, `creator` for legacy
     if (this.verificationMethod !== undefined) {
       proof.verificationMethod = this.verificationMethod;

diff --git a/...ture-2018/src/__tests__/date.test.ts.skip → ...signature-2018/src/__tests__/date.test.ts b/...ture-2018/src/__tests__/date.test.ts.skip → ...signature-2018/src/__tests__/date.test.ts
@@ -224,6 +224,7 @@ describe("Test 1. Confirm behavior of issuanceDate", () => {
   }
 });
 
+/*
 describe("Test 2. Confirm behavior of suite date constructor", () => {
   const testNum = 2;
   for (let i = 0; i < TESTS.length; i++) {
@@ -335,3 +336,4 @@ describe("Test 4. Confirm behavior of issuanceDate", () => {
     });
   }
 });
+*/