[PM-328] Move Send to Tools (#5104)

* Move send in libs/common

* Move send in libs/angular

* Move send in browser

* Move send in cli

* Move send in desktop

* Move send in web

libs/common/src/models/api/send-file.api.ts

@@ -1,19 +0,0 @@
-import { BaseResponse } from "../response/base.response";
-
-export class SendFileApi extends BaseResponse {
-  id: string;
-  fileName: string;
-  size: string;
-  sizeName: string;
-
-  constructor(data: any = null) {
-    super(data);
-    if (data == null) {
-      return;
-    }
-    this.id = this.getResponseProperty("Id");
-    this.fileName = this.getResponseProperty("FileName");
-    this.size = this.getResponseProperty("Size");
-    this.sizeName = this.getResponseProperty("SizeName");
-  }
-}

libs/common/src/models/api/send-text.api.ts

@@ -1,15 +0,0 @@
-import { BaseResponse } from "../response/base.response";
-
-export class SendTextApi extends BaseResponse {
-  text: string;
-  hidden: boolean;
-
-  constructor(data: any = null) {
-    super(data);
-    if (data == null) {
-      return;
-    }
-    this.text = this.getResponseProperty("Text");
-    this.hidden = this.getResponseProperty("Hidden") || false;
-  }
-}

libs/common/src/models/data/send-file.data.ts

@@ -1,19 +0,0 @@
-import { SendFileApi } from "../api/send-file.api";
-
-export class SendFileData {
-  id: string;
-  fileName: string;
-  size: string;
-  sizeName: string;
-
-  constructor(data?: SendFileApi) {
-    if (data == null) {
-      return;
-    }
-
-    this.id = data.id;
-    this.fileName = data.fileName;
-    this.size = data.size;
-    this.sizeName = data.sizeName;
-  }
-}

libs/common/src/models/data/send-text.data.ts

@@ -1,15 +0,0 @@
-import { SendTextApi } from "../api/send-text.api";
-
-export class SendTextData {
-  text: string;
-  hidden: boolean;
-
-  constructor(data?: SendTextApi) {
-    if (data == null) {
-      return;
-    }
-
-    this.text = data.text;
-    this.hidden = data.hidden;
-  }
-}

libs/common/src/models/data/send.data.ts

@@ -1,56 +0,0 @@
-import { SendType } from "../../enums/sendType";
-import { SendResponse } from "../response/send.response";
-
-import { SendFileData } from "./send-file.data";
-import { SendTextData } from "./send-text.data";
-
-export class SendData {
-  id: string;
-  accessId: string;
-  type: SendType;
-  name: string;
-  notes: string;
-  file: SendFileData;
-  text: SendTextData;
-  key: string;
-  maxAccessCount?: number;
-  accessCount: number;
-  revisionDate: string;
-  expirationDate: string;
-  deletionDate: string;
-  password: string;
-  disabled: boolean;
-  hideEmail: boolean;
-
-  constructor(response?: SendResponse) {
-    if (response == null) {
-      return;
-    }
-
-    this.id = response.id;
-    this.accessId = response.accessId;
-    this.type = response.type;
-    this.name = response.name;
-    this.notes = response.notes;
-    this.key = response.key;
-    this.maxAccessCount = response.maxAccessCount;
-    this.accessCount = response.accessCount;
-    this.revisionDate = response.revisionDate;
-    this.expirationDate = response.expirationDate;
-    this.deletionDate = response.deletionDate;
-    this.password = response.password;
-    this.disabled = response.disable;
-    this.hideEmail = response.hideEmail;
-
-    switch (this.type) {
-      case SendType.Text:
-        this.text = new SendTextData(response.text);
-        break;
-      case SendType.File:
-        this.file = new SendFileData(response.file);
-        break;
-      default:
-        break;
-    }
-  }
-}

libs/common/src/models/domain/account.ts

@@ -13,14 +13,14 @@ import { KdfType } from "../../enums/kdfType";
 import { UriMatchType } from "../../enums/uriMatchType";
 import { Utils } from "../../misc/utils";
 import { GeneratedPasswordHistory } from "../../tools/generator/password";
+import { SendData } from "../../tools/send/models/data/send.data";
+import { SendView } from "../../tools/send/models/view/send.view";
 import { DeepJsonify } from "../../types/deep-jsonify";
 import { CipherData } from "../../vault/models/data/cipher.data";
 import { FolderData } from "../../vault/models/data/folder.data";
 import { CipherView } from "../../vault/models/view/cipher.view";
 import { EventData } from "../data/event.data";
-import { SendData } from "../data/send.data";
 import { ServerConfigData } from "../data/server-config.data";
-import { SendView } from "../view/send.view";
 
 import { EncString } from "./enc-string";
 import { SymmetricCryptoKey } from "./symmetric-crypto-key";

libs/common/src/models/domain/send-access.ts

@@ -1,77 +0,0 @@
-import { SendType } from "../../enums/sendType";
-import { SendAccessResponse } from "../response/send-access.response";
-import { SendAccessView } from "../view/send-access.view";
-
-import Domain from "./domain-base";
-import { EncString } from "./enc-string";
-import { SendFile } from "./send-file";
-import { SendText } from "./send-text";
-import { SymmetricCryptoKey } from "./symmetric-crypto-key";
-
-export class SendAccess extends Domain {
-  id: string;
-  type: SendType;
-  name: EncString;
-  file: SendFile;
-  text: SendText;
-  expirationDate: Date;
-  creatorIdentifier: string;
-
-  constructor(obj?: SendAccessResponse) {
-    super();
-    if (obj == null) {
-      return;
-    }
-
-    this.buildDomainModel(
-      this,
-      obj,
-      {
-        id: null,
-        name: null,
-        expirationDate: null,
-        creatorIdentifier: null,
-      },
-      ["id", "expirationDate", "creatorIdentifier"]
-    );
-
-    this.type = obj.type;
-
-    switch (this.type) {
-      case SendType.Text:
-        this.text = new SendText(obj.text);
-        break;
-      case SendType.File:
-        this.file = new SendFile(obj.file);
-        break;
-      default:
-        break;
-    }
-  }
-
-  async decrypt(key: SymmetricCryptoKey): Promise<SendAccessView> {
-    const model = new SendAccessView(this);
-
-    await this.decryptObj(
-      model,
-      {
-        name: null,
-      },
-      null,
-      key
-    );
-
-    switch (this.type) {
-      case SendType.File:
-        model.file = await this.file.decrypt(key);
-        break;
-      case SendType.Text:
-        model.text = await this.text.decrypt(key);
-        break;
-      default:
-        break;
-    }
-
-    return model;
-  }
-}

libs/common/src/models/domain/send-file.ts

@@ -1,56 +0,0 @@
-import { Jsonify } from "type-fest";
-
-import { SendFileData } from "../data/send-file.data";
-import { SendFileView } from "../view/send-file.view";
-
-import Domain from "./domain-base";
-import { EncString } from "./enc-string";
-import { SymmetricCryptoKey } from "./symmetric-crypto-key";
-
-export class SendFile extends Domain {
-  id: string;
-  size: string;
-  sizeName: string;
-  fileName: EncString;
-
-  constructor(obj?: SendFileData) {
-    super();
-    if (obj == null) {
-      return;
-    }
-
-    this.size = obj.size;
-    this.buildDomainModel(
-      this,
-      obj,
-      {
-        id: null,
-        sizeName: null,
-        fileName: null,
-      },
-      ["id", "sizeName"]
-    );
-  }
-
-  async decrypt(key: SymmetricCryptoKey): Promise<SendFileView> {
-    const view = await this.decryptObj(
-      new SendFileView(this),
-      {
-        fileName: null,
-      },
-      null,
-      key
-    );
-    return view;
-  }
-
-  static fromJSON(obj: Jsonify<SendFile>) {
-    if (obj == null) {
-      return null;
-    }
-
-    return Object.assign(new SendFile(), obj, {
-      fileName: EncString.fromJSON(obj.fileName),
-    });
-  }
-}

libs/common/src/models/domain/send-text.ts

@@ -1,51 +0,0 @@
-import { Jsonify } from "type-fest";
-
-import { SendTextData } from "../data/send-text.data";
-import { SendTextView } from "../view/send-text.view";
-
-import Domain from "./domain-base";
-import { EncString } from "./enc-string";
-import { SymmetricCryptoKey } from "./symmetric-crypto-key";
-
-export class SendText extends Domain {
-  text: EncString;
-  hidden: boolean;
-
-  constructor(obj?: SendTextData) {
-    super();
-    if (obj == null) {
-      return;
-    }
-
-    this.hidden = obj.hidden;
-    this.buildDomainModel(
-      this,
-      obj,
-      {
-        text: null,
-      },
-      []
-    );
-  }
-
-  decrypt(key: SymmetricCryptoKey): Promise<SendTextView> {
-    return this.decryptObj(
-      new SendTextView(this),
-      {
-        text: null,
-      },
-      null,
-      key
-    );
-  }
-
-  static fromJSON(obj: Jsonify<SendText>) {
-    if (obj == null) {
-      return null;
-    }
-
-    return Object.assign(new SendText(), obj, {
-      text: EncString.fromJSON(obj.text),
-    });
-  }
-}

libs/common/src/models/domain/send.ts

@@ -1,128 +0,0 @@
-import { Jsonify } from "type-fest";
-
-import { SendType } from "../../enums/sendType";
-import { Utils } from "../../misc/utils";
-import { SendData } from "../data/send.data";
-import { SendView } from "../view/send.view";
-
-import Domain from "./domain-base";
-import { EncString } from "./enc-string";
-import { SendFile } from "./send-file";
-import { SendText } from "./send-text";
-
-export class Send extends Domain {
-  id: string;
-  accessId: string;
-  type: SendType;
-  name: EncString;
-  notes: EncString;
-  file: SendFile;
-  text: SendText;
-  key: EncString;
-  maxAccessCount?: number;
-  accessCount: number;
-  revisionDate: Date;
-  expirationDate: Date;
-  deletionDate: Date;
-  password: string;
-  disabled: boolean;
-  hideEmail: boolean;
-
-  constructor(obj?: SendData) {
-    super();
-    if (obj == null) {
-      return;
-    }
-
-    this.buildDomainModel(
-      this,
-      obj,
-      {
-        id: null,
-        accessId: null,
-        name: null,
-        notes: null,
-        key: null,
-      },
-      ["id", "accessId"]
-    );
-
-    this.type = obj.type;
-    this.maxAccessCount = obj.maxAccessCount;
-    this.accessCount = obj.accessCount;
-    this.password = obj.password;
-    this.disabled = obj.disabled;
-    this.revisionDate = obj.revisionDate != null ? new Date(obj.revisionDate) : null;
-    this.deletionDate = obj.deletionDate != null ? new Date(obj.deletionDate) : null;
-    this.expirationDate = obj.expirationDate != null ? new Date(obj.expirationDate) : null;
-    this.hideEmail = obj.hideEmail;
-
-    switch (this.type) {
-      case SendType.Text:
-        this.text = new SendText(obj.text);
-        break;
-      case SendType.File:
-        this.file = new SendFile(obj.file);
-        break;
-      default:
-        break;
-    }
-  }
-
-  async decrypt(): Promise<SendView> {
-    const model = new SendView(this);
-
-    const cryptoService = Utils.getContainerService().getCryptoService();
-
-    try {
-      model.key = await cryptoService.decryptToBytes(this.key, null);
-      model.cryptoKey = await cryptoService.makeSendKey(model.key);
-    } catch (e) {
-      // TODO: error?
-    }
-
-    await this.decryptObj(
-      model,
-      {
-        name: null,
-        notes: null,
-      },
-      null,
-      model.cryptoKey
-    );
-
-    switch (this.type) {
-      case SendType.File:
-        model.file = await this.file.decrypt(model.cryptoKey);
-        break;
-      case SendType.Text:
-        model.text = await this.text.decrypt(model.cryptoKey);
-        break;
-      default:
-        break;
-    }
-
-    return model;
-  }
-
-  static fromJSON(obj: Jsonify<Send>) {
-    if (obj == null) {
-      return null;
-    }
-
-    const revisionDate = obj.revisionDate == null ? null : new Date(obj.revisionDate);
-    const expirationDate = obj.expirationDate == null ? null : new Date(obj.expirationDate);
-    const deletionDate = obj.deletionDate == null ? null : new Date(obj.deletionDate);
-
-    return Object.assign(new Send(), obj, {
-      key: EncString.fromJSON(obj.key),
-      name: EncString.fromJSON(obj.name),
-      notes: EncString.fromJSON(obj.notes),
-      text: SendText.fromJSON(obj.text),
-      file: SendFile.fromJSON(obj.file),
-      revisionDate,
-      expirationDate,
-      deletionDate,
-    });
-  }
-}

libs/common/src/models/request/send-access.request.ts

@@ -1,3 +0,0 @@
-export class SendAccessRequest {
-  password: string;
-}

libs/common/src/models/request/send-with-id.request.ts

@@ -1,12 +0,0 @@
-import { Send } from "../domain/send";
-
-import { SendRequest } from "./send.request";
-
-export class SendWithIdRequest extends SendRequest {
-  id: string;
-
-  constructor(send: Send) {
-    super(send);
-    this.id = send.id;
-  }
-}

libs/common/src/models/request/send.request.ts

@@ -1,48 +0,0 @@
-import { SendType } from "../../enums/sendType";
-import { SendFileApi } from "../api/send-file.api";
-import { SendTextApi } from "../api/send-text.api";
-import { Send } from "../domain/send";
-
-export class SendRequest {
-  type: SendType;
-  fileLength?: number;
-  name: string;
-  notes: string;
-  key: string;
-  maxAccessCount?: number;
-  expirationDate: string;
-  deletionDate: string;
-  text: SendTextApi;
-  file: SendFileApi;
-  password: string;
-  disabled: boolean;
-  hideEmail: boolean;
-
-  constructor(send: Send, fileLength?: number) {
-    this.type = send.type;
-    this.fileLength = fileLength;
-    this.name = send.name ? send.name.encryptedString : null;
-    this.notes = send.notes ? send.notes.encryptedString : null;
-    this.maxAccessCount = send.maxAccessCount;
-    this.expirationDate = send.expirationDate != null ? send.expirationDate.toISOString() : null;
-    this.deletionDate = send.deletionDate != null ? send.deletionDate.toISOString() : null;
-    this.key = send.key != null ? send.key.encryptedString : null;
-    this.password = send.password;
-    this.disabled = send.disabled;
-    this.hideEmail = send.hideEmail;
-
-    switch (this.type) {
-      case SendType.Text:
-        this.text = new SendTextApi();
-        this.text.text = send.text.text != null ? send.text.text.encryptedString : null;
-        this.text.hidden = send.text.hidden;
-        break;
-      case SendType.File:
-        this.file = new SendFileApi();
-        this.file.fileName = send.file.fileName != null ? send.file.fileName.encryptedString : null;
-        break;
-      default:
-        break;
-    }
-  }
-}

libs/common/src/models/request/update-key.request.ts

@@ -1,8 +1,7 @@
+import { SendWithIdRequest } from "../../tools/send/models/request/send-with-id.request";
 import { CipherWithIdRequest } from "../../vault/models/request/cipher-with-id.request";
 import { FolderWithIdRequest } from "../../vault/models/request/folder-with-id.request";
 
-import { SendWithIdRequest } from "./send-with-id.request";
-
 export class UpdateKeyRequest {
   ciphers: CipherWithIdRequest[] = [];
   folders: FolderWithIdRequest[] = [];

libs/common/src/models/response/send-access.response.ts

@@ -1,35 +0,0 @@
-import { SendType } from "../../enums/sendType";
-import { SendFileApi } from "../api/send-file.api";
-import { SendTextApi } from "../api/send-text.api";
-
-import { BaseResponse } from "./base.response";
-
-export class SendAccessResponse extends BaseResponse {
-  id: string;
-  type: SendType;
-  name: string;
-  file: SendFileApi;
-  text: SendTextApi;
-  expirationDate: Date;
-  creatorIdentifier: string;
-
-  constructor(response: any) {
-    super(response);
-    this.id = this.getResponseProperty("Id");
-    this.type = this.getResponseProperty("Type");
-    this.name = this.getResponseProperty("Name");
-
-    const text = this.getResponseProperty("Text");
-    if (text != null) {
-      this.text = new SendTextApi(text);
-    }
-
-    const file = this.getResponseProperty("File");
-    if (file != null) {
-      this.file = new SendFileApi(file);
-    }
-
-    this.expirationDate = this.getResponseProperty("ExpirationDate");
-    this.creatorIdentifier = this.getResponseProperty("CreatorIdentifier");
-  }
-}

libs/common/src/models/response/send-file-download-data.response.ts

@@ -1,11 +0,0 @@
-import { BaseResponse } from "./base.response";
-
-export class SendFileDownloadDataResponse extends BaseResponse {
-  id: string = null;
-  url: string = null;
-  constructor(response: any) {
-    super(response);
-    this.id = this.getResponseProperty("Id");
-    this.url = this.getResponseProperty("Url");
-  }
-}

libs/common/src/models/response/send-file-upload-data.response.ts

@@ -1,17 +0,0 @@
-import { FileUploadType } from "../../enums/fileUploadType";
-
-import { BaseResponse } from "./base.response";
-import { SendResponse } from "./send.response";
-
-export class SendFileUploadDataResponse extends BaseResponse {
-  fileUploadType: FileUploadType;
-  sendResponse: SendResponse;
-  url: string = null;
-  constructor(response: any) {
-    super(response);
-    this.fileUploadType = this.getResponseProperty("FileUploadType");
-    const sendResponse = this.getResponseProperty("SendResponse");
-    this.sendResponse = sendResponse == null ? null : new SendResponse(sendResponse);
-    this.url = this.getResponseProperty("Url");
-  }
-}

libs/common/src/models/response/send.response.ts

@@ -1,52 +0,0 @@
-import { SendType } from "../../enums/sendType";
-import { SendFileApi } from "../api/send-file.api";
-import { SendTextApi } from "../api/send-text.api";
-
-import { BaseResponse } from "./base.response";
-
-export class SendResponse extends BaseResponse {
-  id: string;
-  accessId: string;
-  type: SendType;
-  name: string;
-  notes: string;
-  file: SendFileApi;
-  text: SendTextApi;
-  key: string;
-  maxAccessCount?: number;
-  accessCount: number;
-  revisionDate: string;
-  expirationDate: string;
-  deletionDate: string;
-  password: string;
-  disable: boolean;
-  hideEmail: boolean;
-
-  constructor(response: any) {
-    super(response);
-    this.id = this.getResponseProperty("Id");
-    this.accessId = this.getResponseProperty("AccessId");
-    this.type = this.getResponseProperty("Type");
-    this.name = this.getResponseProperty("Name");
-    this.notes = this.getResponseProperty("Notes");
-    this.key = this.getResponseProperty("Key");
-    this.maxAccessCount = this.getResponseProperty("MaxAccessCount");
-    this.accessCount = this.getResponseProperty("AccessCount");
-    this.revisionDate = this.getResponseProperty("RevisionDate");
-    this.expirationDate = this.getResponseProperty("ExpirationDate");
-    this.deletionDate = this.getResponseProperty("DeletionDate");
-    this.password = this.getResponseProperty("Password");
-    this.disable = this.getResponseProperty("Disabled") || false;
-    this.hideEmail = this.getResponseProperty("HideEmail") || false;
-
-    const text = this.getResponseProperty("Text");
-    if (text != null) {
-      this.text = new SendTextApi(text);
-    }
-
-    const file = this.getResponseProperty("File");
-    if (file != null) {
-      this.file = new SendFileApi(file);
-    }
-  }
-}

libs/common/src/models/view/send-access.view.ts

@@ -1,27 +0,0 @@
-import { SendType } from "../../enums/sendType";
-import { SendAccess } from "../domain/send-access";
-
-import { SendFileView } from "./send-file.view";
-import { SendTextView } from "./send-text.view";
-import { View } from "./view";
-
-export class SendAccessView implements View {
-  id: string = null;
-  name: string = null;
-  type: SendType = null;
-  text = new SendTextView();
-  file = new SendFileView();
-  expirationDate: Date = null;
-  creatorIdentifier: string = null;
-
-  constructor(s?: SendAccess) {
-    if (!s) {
-      return;
-    }
-
-    this.id = s.id;
-    this.type = s.type;
-    this.expirationDate = s.expirationDate;
-    this.creatorIdentifier = s.creatorIdentifier;
-  }
-}

libs/common/src/models/view/send-file.view.ts

@@ -1,40 +0,0 @@
-import { DeepJsonify } from "../../types/deep-jsonify";
-import { SendFile } from "../domain/send-file";
-
-import { View } from "./view";
-
-export class SendFileView implements View {
-  id: string = null;
-  size: string = null;
-  sizeName: string = null;
-  fileName: string = null;
-
-  constructor(f?: SendFile) {
-    if (!f) {
-      return;
-    }
-
-    this.id = f.id;
-    this.size = f.size;
-    this.sizeName = f.sizeName;
-  }
-
-  get fileSize(): number {
-    try {
-      if (this.size != null) {
-        return parseInt(this.size, null);
-      }
-    } catch {
-      // Invalid file size.
-    }
-    return 0;
-  }
-
-  static fromJSON(json: DeepJsonify<SendFileView>) {
-    if (json == null) {
-      return null;
-    }
-
-    return Object.assign(new SendFileView(), json);
-  }
-}

libs/common/src/models/view/send-text.view.ts

@@ -1,29 +0,0 @@
-import { DeepJsonify } from "../../types/deep-jsonify";
-import { SendText } from "../domain/send-text";
-
-import { View } from "./view";
-
-export class SendTextView implements View {
-  text: string = null;
-  hidden: boolean;
-
-  constructor(t?: SendText) {
-    if (!t) {
-      return;
-    }
-
-    this.hidden = t.hidden;
-  }
-
-  get maskedText(): string {
-    return this.text != null ? "••••••••" : null;
-  }
-
-  static fromJSON(json: DeepJsonify<SendTextView>) {
-    if (json == null) {
-      return null;
-    }
-
-    return Object.assign(new SendTextView(), json);
-  }
-}

libs/common/src/models/view/send.view.ts

@@ -1,94 +0,0 @@
-import { SendType } from "../../enums/sendType";
-import { Utils } from "../../misc/utils";
-import { DeepJsonify } from "../../types/deep-jsonify";
-import { Send } from "../domain/send";
-import { SymmetricCryptoKey } from "../domain/symmetric-crypto-key";
-
-import { SendFileView } from "./send-file.view";
-import { SendTextView } from "./send-text.view";
-import { View } from "./view";
-
-export class SendView implements View {
-  id: string = null;
-  accessId: string = null;
-  name: string = null;
-  notes: string = null;
-  key: ArrayBuffer;
-  cryptoKey: SymmetricCryptoKey;
-  type: SendType = null;
-  text = new SendTextView();
-  file = new SendFileView();
-  maxAccessCount?: number = null;
-  accessCount = 0;
-  revisionDate: Date = null;
-  deletionDate: Date = null;
-  expirationDate: Date = null;
-  password: string = null;
-  disabled = false;
-  hideEmail = false;
-
-  constructor(s?: Send) {
-    if (!s) {
-      return;
-    }
-
-    this.id = s.id;
-    this.accessId = s.accessId;
-    this.type = s.type;
-    this.maxAccessCount = s.maxAccessCount;
-    this.accessCount = s.accessCount;
-    this.revisionDate = s.revisionDate;
-    this.deletionDate = s.deletionDate;
-    this.expirationDate = s.expirationDate;
-    this.disabled = s.disabled;
-    this.password = s.password;
-    this.hideEmail = s.hideEmail;
-  }
-
-  get urlB64Key(): string {
-    return Utils.fromBufferToUrlB64(this.key);
-  }
-
-  get maxAccessCountReached(): boolean {
-    if (this.maxAccessCount == null) {
-      return false;
-    }
-    return this.accessCount >= this.maxAccessCount;
-  }
-
-  get expired(): boolean {
-    if (this.expirationDate == null) {
-      return false;
-    }
-    return this.expirationDate <= new Date();
-  }
-
-  get pendingDelete(): boolean {
-    return this.deletionDate <= new Date();
-  }
-
-  toJSON() {
-    return Utils.merge(
-      { ...this },
-      {
-        key: Utils.fromBufferToB64(this.key),
-      }
-    );
-  }
-
-  static fromJSON(json: DeepJsonify<SendView>) {
-    if (json == null) {
-      return null;
-    }
-
-    return Object.assign(new SendView(), json, {
-      key: Utils.fromB64ToArray(json.key)?.buffer,
-      cryptoKey: SymmetricCryptoKey.fromJSON(json.cryptoKey),
-      text: SendTextView.fromJSON(json.text),
-      file: SendFileView.fromJSON(json.file),
-      revisionDate: json.revisionDate == null ? null : new Date(json.revisionDate),
-      deletionDate: json.deletionDate == null ? null : new Date(json.deletionDate),
-      expirationDate: json.expirationDate == null ? null : new Date(json.expirationDate),
-    });
-  }
-}