Swap to nullableFactory

bitwarden · Dec 2, 2022 · bb46b75 · bb46b75
1 parent 4677176
commit bb46b75
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/libs/common/src/models/domain/folder.ts b/libs/common/src/models/domain/folder.ts
@@ -25,7 +25,9 @@ export class Folder implements DecryptableDomain {
   }
 
   static fromJSON(obj: Jsonify<Folder>) {
-    const revisionDate = nullableFactory(Date, obj.revisionDate);
-    return Object.assign(new Folder(), obj, { name: EncString.fromJSON(obj.name), revisionDate });
+    return Object.assign(new Folder(), obj, {
+      name: nullableFactory(EncString, obj.name),
+      revisionDate: nullableFactory(Date, obj.revisionDate),
+    });
   }
 }
diff --git a/libs/common/src/models/view/folder.view.ts b/libs/common/src/models/view/folder.view.ts
@@ -1,7 +1,7 @@
 import { Jsonify } from "type-fest";
 
 import { EncryptService } from "../../abstractions/encrypt.service";
-import { Encryptable } from "../../interfaces/crypto.interface";
+import { Encryptable, nullableFactory } from "../../interfaces/crypto.interface";
 import { Folder } from "../domain/folder";
 import { SymmetricCryptoKey } from "../domain/symmetric-crypto-key";
 import { ITreeNodeObject } from "../domain/tree-node";
@@ -36,7 +36,8 @@ export class FolderView implements ITreeNodeObject, Encryptable<Folder> {
   }
 
   static fromJSON(obj: Jsonify<FolderView>) {
-    const revisionDate = obj.revisionDate == null ? null : new Date(obj.revisionDate);
-    return Object.assign(new FolderView(), obj, { revisionDate });
+    return Object.assign(new FolderView(), obj, {
+      revisionDate: nullableFactory(Date, obj.revisionDate),
+    });
   }
 }