[PM-13158] Remove unused code from ApiService (#639)

Also delete unused request models
1 year ago · 1931a7f065
97 changed files with 8 additions and 3835 deletions
--- a/jslib/common/src/abstractions/api.service.ts
+++ b/jslib/common/src/abstractions/api.service.ts
@ -1,679 +1,14 @@
 import { PolicyType } from "../enums/policyType";
 import { SetKeyConnectorKeyRequest } from "../models/request/account/setKeyConnectorKeyRequest";
 import { VerifyOTPRequest } from "../models/request/account/verifyOTPRequest";
 import { AttachmentRequest } from "../models/request/attachmentRequest";
 import { BitPayInvoiceRequest } from "../models/request/bitPayInvoiceRequest";
 import { CipherBulkDeleteRequest } from "../models/request/cipherBulkDeleteRequest";
 import { CipherBulkMoveRequest } from "../models/request/cipherBulkMoveRequest";
 import { CipherBulkRestoreRequest } from "../models/request/cipherBulkRestoreRequest";
 import { CipherBulkShareRequest } from "../models/request/cipherBulkShareRequest";
 import { CipherCollectionsRequest } from "../models/request/cipherCollectionsRequest";
 import { CipherCreateRequest } from "../models/request/cipherCreateRequest";
 import { CipherRequest } from "../models/request/cipherRequest";
 import { CipherShareRequest } from "../models/request/cipherShareRequest";
 import { CollectionRequest } from "../models/request/collectionRequest";
 import { DeleteRecoverRequest } from "../models/request/deleteRecoverRequest";
 import { EmailRequest } from "../models/request/emailRequest";
 import { EmailTokenRequest } from "../models/request/emailTokenRequest";
 import { EmergencyAccessAcceptRequest } from "../models/request/emergencyAccessAcceptRequest";
 import { EmergencyAccessConfirmRequest } from "../models/request/emergencyAccessConfirmRequest";
 import { EmergencyAccessInviteRequest } from "../models/request/emergencyAccessInviteRequest";
 import { EmergencyAccessPasswordRequest } from "../models/request/emergencyAccessPasswordRequest";
 import { EmergencyAccessUpdateRequest } from "../models/request/emergencyAccessUpdateRequest";
 import { EventRequest } from "../models/request/eventRequest";
 import { FolderRequest } from "../models/request/folderRequest";
 import { GroupRequest } from "../models/request/groupRequest";
 import { IapCheckRequest } from "../models/request/iapCheckRequest";
 import { ApiTokenRequest } from "../models/request/identityToken/apiTokenRequest";
 import { PasswordTokenRequest } from "../models/request/identityToken/passwordTokenRequest";
 import { SsoTokenRequest } from "../models/request/identityToken/ssoTokenRequest";
 import { ImportCiphersRequest } from "../models/request/importCiphersRequest";
 import { ImportDirectoryRequest } from "../models/request/importDirectoryRequest";
 import { ImportOrganizationCiphersRequest } from "../models/request/importOrganizationCiphersRequest";
 import { KdfRequest } from "../models/request/kdfRequest";
 import { KeyConnectorUserKeyRequest } from "../models/request/keyConnectorUserKeyRequest";
 import { KeysRequest } from "../models/request/keysRequest";
 import { OrganizationSponsorshipCreateRequest } from "../models/request/organization/organizationSponsorshipCreateRequest";
 import { OrganizationSponsorshipRedeemRequest } from "../models/request/organization/organizationSponsorshipRedeemRequest";
 import { OrganizationSsoRequest } from "../models/request/organization/organizationSsoRequest";
 import { OrganizationCreateRequest } from "../models/request/organizationCreateRequest";
 import { OrganizationImportRequest } from "../models/request/organizationImportRequest";
-import { OrganizationKeysRequest } from "../models/request/organizationKeysRequest";
+import { IdentityCaptchaResponse } from '../models/response/identityCaptchaResponse';
-import { OrganizationSubscriptionUpdateRequest } from "../models/request/organizationSubscriptionUpdateRequest";
+import { IdentityTokenResponse } from '../models/response/identityTokenResponse';
-import { OrganizationTaxInfoUpdateRequest } from "../models/request/organizationTaxInfoUpdateRequest";
+import { IdentityTwoFactorResponse } from '../models/response/identityTwoFactorResponse';
 import { OrganizationUpdateRequest } from "../models/request/organizationUpdateRequest";
 import { OrganizationUpgradeRequest } from "../models/request/organizationUpgradeRequest";
 import { OrganizationUserAcceptRequest } from "../models/request/organizationUserAcceptRequest";
 import { OrganizationUserBulkConfirmRequest } from "../models/request/organizationUserBulkConfirmRequest";
 import { OrganizationUserBulkRequest } from "../models/request/organizationUserBulkRequest";
 import { OrganizationUserConfirmRequest } from "../models/request/organizationUserConfirmRequest";
 import { OrganizationUserInviteRequest } from "../models/request/organizationUserInviteRequest";
 import { OrganizationUserResetPasswordEnrollmentRequest } from "../models/request/organizationUserResetPasswordEnrollmentRequest";
 import { OrganizationUserResetPasswordRequest } from "../models/request/organizationUserResetPasswordRequest";
 import { OrganizationUserUpdateGroupsRequest } from "../models/request/organizationUserUpdateGroupsRequest";
 import { OrganizationUserUpdateRequest } from "../models/request/organizationUserUpdateRequest";
 import { PasswordHintRequest } from "../models/request/passwordHintRequest";
 import { PasswordRequest } from "../models/request/passwordRequest";
 import { PaymentRequest } from "../models/request/paymentRequest";
 import { PolicyRequest } from "../models/request/policyRequest";
 import { PreloginRequest } from "../models/request/preloginRequest";
 import { ProviderAddOrganizationRequest } from "../models/request/provider/providerAddOrganizationRequest";
 import { ProviderOrganizationCreateRequest } from "../models/request/provider/providerOrganizationCreateRequest";
 import { ProviderSetupRequest } from "../models/request/provider/providerSetupRequest";
 import { ProviderUpdateRequest } from "../models/request/provider/providerUpdateRequest";
 import { ProviderUserAcceptRequest } from "../models/request/provider/providerUserAcceptRequest";
 import { ProviderUserBulkConfirmRequest } from "../models/request/provider/providerUserBulkConfirmRequest";
 import { ProviderUserBulkRequest } from "../models/request/provider/providerUserBulkRequest";
 import { ProviderUserConfirmRequest } from "../models/request/provider/providerUserConfirmRequest";
 import { ProviderUserInviteRequest } from "../models/request/provider/providerUserInviteRequest";
 import { ProviderUserUpdateRequest } from "../models/request/provider/providerUserUpdateRequest";
 import { RegisterRequest } from "../models/request/registerRequest";
 import { SeatRequest } from "../models/request/seatRequest";
 import { SecretVerificationRequest } from "../models/request/secretVerificationRequest";
 import { SelectionReadOnlyRequest } from "../models/request/selectionReadOnlyRequest";
 import { SendAccessRequest } from "../models/request/sendAccessRequest";
 import { SendRequest } from "../models/request/sendRequest";
 import { SetPasswordRequest } from "../models/request/setPasswordRequest";
 import { StorageRequest } from "../models/request/storageRequest";
 import { TaxInfoUpdateRequest } from "../models/request/taxInfoUpdateRequest";
 import { TwoFactorEmailRequest } from "../models/request/twoFactorEmailRequest";
 import { TwoFactorProviderRequest } from "../models/request/twoFactorProviderRequest";
 import { TwoFactorRecoveryRequest } from "../models/request/twoFactorRecoveryRequest";
 import { UpdateDomainsRequest } from "../models/request/updateDomainsRequest";
 import { UpdateKeyRequest } from "../models/request/updateKeyRequest";
 import { UpdateProfileRequest } from "../models/request/updateProfileRequest";
 import { UpdateTempPasswordRequest } from "../models/request/updateTempPasswordRequest";
 import { UpdateTwoFactorAuthenticatorRequest } from "../models/request/updateTwoFactorAuthenticatorRequest";
 import { UpdateTwoFactorDuoRequest } from "../models/request/updateTwoFactorDuoRequest";
 import { UpdateTwoFactorEmailRequest } from "../models/request/updateTwoFactorEmailRequest";
 import { UpdateTwoFactorWebAuthnDeleteRequest } from "../models/request/updateTwoFactorWebAuthnDeleteRequest";
 import { UpdateTwoFactorWebAuthnRequest } from "../models/request/updateTwoFactorWebAuthnRequest";
 import { UpdateTwoFactorYubioOtpRequest } from "../models/request/updateTwoFactorYubioOtpRequest";
 import { VerifyBankRequest } from "../models/request/verifyBankRequest";
 import { VerifyDeleteRecoverRequest } from "../models/request/verifyDeleteRecoverRequest";
 import { VerifyEmailRequest } from "../models/request/verifyEmailRequest";
 import { ApiKeyResponse } from "../models/response/apiKeyResponse";
 import { AttachmentResponse } from "../models/response/attachmentResponse";
 import { AttachmentUploadDataResponse } from "../models/response/attachmentUploadDataResponse";
 import { BillingResponse } from "../models/response/billingResponse";
 import { BreachAccountResponse } from "../models/response/breachAccountResponse";
 import { CipherResponse } from "../models/response/cipherResponse";
 import {
  CollectionGroupDetailsResponse,
  CollectionResponse,
 } from "../models/response/collectionResponse";
 import { DomainsResponse } from "../models/response/domainsResponse";
 import {
  EmergencyAccessGranteeDetailsResponse,
  EmergencyAccessGrantorDetailsResponse,
  EmergencyAccessTakeoverResponse,
  EmergencyAccessViewResponse,
 } from "../models/response/emergencyAccessResponse";
 import { EventResponse } from "../models/response/eventResponse";
 import { FolderResponse } from "../models/response/folderResponse";
 import { GroupDetailsResponse, GroupResponse } from "../models/response/groupResponse";
 import { IdentityCaptchaResponse } from "../models/response/identityCaptchaResponse";
 import { IdentityTokenResponse } from "../models/response/identityTokenResponse";
 import { IdentityTwoFactorResponse } from "../models/response/identityTwoFactorResponse";
 import { KeyConnectorUserKeyResponse } from "../models/response/keyConnectorUserKeyResponse";
 import { ListResponse } from "../models/response/listResponse";
 import { OrganizationSsoResponse } from "../models/response/organization/organizationSsoResponse";
 import { OrganizationAutoEnrollStatusResponse } from "../models/response/organizationAutoEnrollStatusResponse";
 import { OrganizationKeysResponse } from "../models/response/organizationKeysResponse";
 import { OrganizationResponse } from "../models/response/organizationResponse";
 import { OrganizationSubscriptionResponse } from "../models/response/organizationSubscriptionResponse";
 import { OrganizationUserBulkPublicKeyResponse } from "../models/response/organizationUserBulkPublicKeyResponse";
 import { OrganizationUserBulkResponse } from "../models/response/organizationUserBulkResponse";
 import {
  OrganizationUserDetailsResponse,
  OrganizationUserResetPasswordDetailsReponse,
  OrganizationUserUserDetailsResponse,
 } from "../models/response/organizationUserResponse";
 import { PaymentResponse } from "../models/response/paymentResponse";
 import { PlanResponse } from "../models/response/planResponse";
 import { PolicyResponse } from "../models/response/policyResponse";
 import { PreloginResponse } from "../models/response/preloginResponse";
 import { ProfileResponse } from "../models/response/profileResponse";
 import {
  ProviderOrganizationOrganizationDetailsResponse,
  ProviderOrganizationResponse,
 } from "../models/response/provider/providerOrganizationResponse";
 import { ProviderResponse } from "../models/response/provider/providerResponse";
 import { ProviderUserBulkPublicKeyResponse } from "../models/response/provider/providerUserBulkPublicKeyResponse";
 import { ProviderUserBulkResponse } from "../models/response/provider/providerUserBulkResponse";
 import {
  ProviderUserResponse,
  ProviderUserUserDetailsResponse,
 } from "../models/response/provider/providerUserResponse";
 import { SelectionReadOnlyResponse } from "../models/response/selectionReadOnlyResponse";
 import { SendAccessResponse } from "../models/response/sendAccessResponse";
 import { SendFileDownloadDataResponse } from "../models/response/sendFileDownloadDataResponse";
 import { SendFileUploadDataResponse } from "../models/response/sendFileUploadDataResponse";
 import { SendResponse } from "../models/response/sendResponse";
 import { SubscriptionResponse } from "../models/response/subscriptionResponse";
 import { SyncResponse } from "../models/response/syncResponse";
 import { TaxInfoResponse } from "../models/response/taxInfoResponse";
 import { TaxRateResponse } from "../models/response/taxRateResponse";
 import { TwoFactorAuthenticatorResponse } from "../models/response/twoFactorAuthenticatorResponse";
 import { TwoFactorDuoResponse } from "../models/response/twoFactorDuoResponse";
 import { TwoFactorEmailResponse } from "../models/response/twoFactorEmailResponse";
 import { TwoFactorProviderResponse } from "../models/response/twoFactorProviderResponse";
 import { TwoFactorRecoverResponse } from "../models/response/twoFactorRescoverResponse";
 import {
  ChallengeResponse,
  TwoFactorWebAuthnResponse,
 } from "../models/response/twoFactorWebAuthnResponse";
 import { TwoFactorYubiKeyResponse } from "../models/response/twoFactorYubiKeyResponse";
 import { UserKeyResponse } from "../models/response/userKeyResponse";
 import { SendAccessView } from "../models/view/sendAccessView";
 export abstract class ApiService {
  postIdentityToken: (
    request: PasswordTokenRequest | SsoTokenRequest | ApiTokenRequest,
  ) => Promise<IdentityTokenResponse | IdentityTwoFactorResponse | IdentityCaptchaResponse>;
  refreshIdentityToken: () => Promise<any>;
  getProfile: () => Promise<ProfileResponse>;
  getUserBilling: () => Promise<BillingResponse>;
  getUserSubscription: () => Promise<SubscriptionResponse>;
  getTaxInfo: () => Promise<TaxInfoResponse>;
  putProfile: (request: UpdateProfileRequest) => Promise<ProfileResponse>;
  putTaxInfo: (request: TaxInfoUpdateRequest) => Promise<any>;
  postPrelogin: (request: PreloginRequest) => Promise<PreloginResponse>;
  postEmailToken: (request: EmailTokenRequest) => Promise<any>;
  postEmail: (request: EmailRequest) => Promise<any>;
  postPassword: (request: PasswordRequest) => Promise<any>;
  setPassword: (request: SetPasswordRequest) => Promise<any>;
  postSetKeyConnectorKey: (request: SetKeyConnectorKeyRequest) => Promise<any>;
  postSecurityStamp: (request: SecretVerificationRequest) => Promise<any>;
  deleteAccount: (request: SecretVerificationRequest) => Promise<any>;
  getAccountRevisionDate: () => Promise<number>;
  postPasswordHint: (request: PasswordHintRequest) => Promise<any>;
  postRegister: (request: RegisterRequest) => Promise<any>;
  postPremium: (data: FormData) => Promise<PaymentResponse>;
  postIapCheck: (request: IapCheckRequest) => Promise<any>;
  postReinstatePremium: () => Promise<any>;
  postCancelPremium: () => Promise<any>;
  postAccountStorage: (request: StorageRequest) => Promise<PaymentResponse>;
  postAccountPayment: (request: PaymentRequest) => Promise<any>;
  postAccountLicense: (data: FormData) => Promise<any>;
  postAccountKey: (request: UpdateKeyRequest) => Promise<any>;
  postAccountKeys: (request: KeysRequest) => Promise<any>;
  postAccountVerifyEmail: () => Promise<any>;
  postAccountVerifyEmailToken: (request: VerifyEmailRequest) => Promise<any>;
  postAccountVerifyPassword: (request: SecretVerificationRequest) => Promise<any>;
  postAccountRecoverDelete: (request: DeleteRecoverRequest) => Promise<any>;
  postAccountRecoverDeleteToken: (request: VerifyDeleteRecoverRequest) => Promise<any>;
  postAccountKdf: (request: KdfRequest) => Promise<any>;
  postUserApiKey: (id: string, request: SecretVerificationRequest) => Promise<ApiKeyResponse>;
  postUserRotateApiKey: (id: string, request: SecretVerificationRequest) => Promise<ApiKeyResponse>;
  putUpdateTempPassword: (request: UpdateTempPasswordRequest) => Promise<any>;
  postAccountRequestOTP: () => Promise<void>;
  postAccountVerifyOTP: (request: VerifyOTPRequest) => Promise<void>;
  postConvertToKeyConnector: () => Promise<void>;
  getFolder: (id: string) => Promise<FolderResponse>;
  postFolder: (request: FolderRequest) => Promise<FolderResponse>;
  putFolder: (id: string, request: FolderRequest) => Promise<FolderResponse>;
  deleteFolder: (id: string) => Promise<any>;
  getSend: (id: string) => Promise<SendResponse>;
  postSendAccess: (
    id: string,
    request: SendAccessRequest,
    apiUrl?: string,
  ) => Promise<SendAccessResponse>;
  getSends: () => Promise<ListResponse<SendResponse>>;
  postSend: (request: SendRequest) => Promise<SendResponse>;
  postFileTypeSend: (request: SendRequest) => Promise<SendFileUploadDataResponse>;
  postSendFile: (sendId: string, fileId: string, data: FormData) => Promise<any>;
  /**
   * @deprecated Mar 25 2021: This method has been deprecated in favor of direct uploads.
   * This method still exists for backward compatibility with old server versions.
   */
  postSendFileLegacy: (data: FormData) => Promise<SendResponse>;
  putSend: (id: string, request: SendRequest) => Promise<SendResponse>;
  putSendRemovePassword: (id: string) => Promise<SendResponse>;
  deleteSend: (id: string) => Promise<any>;
  getSendFileDownloadData: (
    send: SendAccessView,
    request: SendAccessRequest,
    apiUrl?: string,
  ) => Promise<SendFileDownloadDataResponse>;
  renewSendFileUploadUrl: (sendId: string, fileId: string) => Promise<SendFileUploadDataResponse>;
  getCipher: (id: string) => Promise<CipherResponse>;
  getCipherAdmin: (id: string) => Promise<CipherResponse>;
  getAttachmentData: (
    cipherId: string,
    attachmentId: string,
    emergencyAccessId?: string,
  ) => Promise<AttachmentResponse>;
  getCiphersOrganization: (organizationId: string) => Promise<ListResponse<CipherResponse>>;
  postCipher: (request: CipherRequest) => Promise<CipherResponse>;
  postCipherCreate: (request: CipherCreateRequest) => Promise<CipherResponse>;
  postCipherAdmin: (request: CipherCreateRequest) => Promise<CipherResponse>;
  putCipher: (id: string, request: CipherRequest) => Promise<CipherResponse>;
  putCipherAdmin: (id: string, request: CipherRequest) => Promise<CipherResponse>;
  deleteCipher: (id: string) => Promise<any>;
  deleteCipherAdmin: (id: string) => Promise<any>;
  deleteManyCiphers: (request: CipherBulkDeleteRequest) => Promise<any>;
  deleteManyCiphersAdmin: (request: CipherBulkDeleteRequest) => Promise<any>;
  putMoveCiphers: (request: CipherBulkMoveRequest) => Promise<any>;
  putShareCipher: (id: string, request: CipherShareRequest) => Promise<CipherResponse>;
  putShareCiphers: (request: CipherBulkShareRequest) => Promise<any>;
  putCipherCollections: (id: string, request: CipherCollectionsRequest) => Promise<any>;
  putCipherCollectionsAdmin: (id: string, request: CipherCollectionsRequest) => Promise<any>;
  postPurgeCiphers: (request: SecretVerificationRequest, organizationId?: string) => Promise<any>;
  postImportCiphers: (request: ImportCiphersRequest) => Promise<any>;
  postImportOrganizationCiphers: (
    organizationId: string,
    request: ImportOrganizationCiphersRequest,
  ) => Promise<any>;
  putDeleteCipher: (id: string) => Promise<any>;
  putDeleteCipherAdmin: (id: string) => Promise<any>;
  putDeleteManyCiphers: (request: CipherBulkDeleteRequest) => Promise<any>;
  putDeleteManyCiphersAdmin: (request: CipherBulkDeleteRequest) => Promise<any>;
  putRestoreCipher: (id: string) => Promise<CipherResponse>;
  putRestoreCipherAdmin: (id: string) => Promise<CipherResponse>;
  putRestoreManyCiphers: (
    request: CipherBulkRestoreRequest,
  ) => Promise<ListResponse<CipherResponse>>;
  /**
   * @deprecated Mar 25 2021: This method has been deprecated in favor of direct uploads.
   * This method still exists for backward compatibility with old server versions.
   */
  postCipherAttachmentLegacy: (id: string, data: FormData) => Promise<CipherResponse>;
  /**
   * @deprecated Mar 25 2021: This method has been deprecated in favor of direct uploads.
   * This method still exists for backward compatibility with old server versions.
   */
  postCipherAttachmentAdminLegacy: (id: string, data: FormData) => Promise<CipherResponse>;
  postCipherAttachment: (
    id: string,
    request: AttachmentRequest,
  ) => Promise<AttachmentUploadDataResponse>;
  deleteCipherAttachment: (id: string, attachmentId: string) => Promise<any>;
  deleteCipherAttachmentAdmin: (id: string, attachmentId: string) => Promise<any>;
  postShareCipherAttachment: (
    id: string,
    attachmentId: string,
    data: FormData,
    organizationId: string,
  ) => Promise<any>;
  renewAttachmentUploadUrl: (
    id: string,
    attachmentId: string,
  ) => Promise<AttachmentUploadDataResponse>;
  postAttachmentFile: (id: string, attachmentId: string, data: FormData) => Promise<any>;
  getCollectionDetails: (
    organizationId: string,
    id: string,
  ) => Promise<CollectionGroupDetailsResponse>;
  getUserCollections: () => Promise<ListResponse<CollectionResponse>>;
  getCollections: (organizationId: string) => Promise<ListResponse<CollectionResponse>>;
  getCollectionUsers: (organizationId: string, id: string) => Promise<SelectionReadOnlyResponse[]>;
  postCollection: (
    organizationId: string,
    request: CollectionRequest,
  ) => Promise<CollectionResponse>;
  putCollectionUsers: (
    organizationId: string,
    id: string,
    request: SelectionReadOnlyRequest[],
  ) => Promise<any>;
  putCollection: (
    organizationId: string,
    id: string,
    request: CollectionRequest,
  ) => Promise<CollectionResponse>;
  deleteCollection: (organizationId: string, id: string) => Promise<any>;
  deleteCollectionUser: (
    organizationId: string,
    id: string,
    organizationUserId: string,
  ) => Promise<any>;
  getGroupDetails: (organizationId: string, id: string) => Promise<GroupDetailsResponse>;
  getGroups: (organizationId: string) => Promise<ListResponse<GroupResponse>>;
  getGroupUsers: (organizationId: string, id: string) => Promise<string[]>;
  postGroup: (organizationId: string, request: GroupRequest) => Promise<GroupResponse>;
  putGroup: (organizationId: string, id: string, request: GroupRequest) => Promise<GroupResponse>;
  putGroupUsers: (organizationId: string, id: string, request: string[]) => Promise<any>;
  deleteGroup: (organizationId: string, id: string) => Promise<any>;
  deleteGroupUser: (organizationId: string, id: string, organizationUserId: string) => Promise<any>;
  getPolicy: (organizationId: string, type: PolicyType) => Promise<PolicyResponse>;
  getPolicies: (organizationId: string) => Promise<ListResponse<PolicyResponse>>;
  getPoliciesByToken: (
    organizationId: string,
    token: string,
    email: string,
    organizationUserId: string,
  ) => Promise<ListResponse<PolicyResponse>>;
  getPoliciesByInvitedUser: (
    organizationId: string,
    userId: string,
  ) => Promise<ListResponse<PolicyResponse>>;
  putPolicy: (
    organizationId: string,
    type: PolicyType,
    request: PolicyRequest,
  ) => Promise<PolicyResponse>;
  getOrganizationUser: (
    organizationId: string,
    id: string,
  ) => Promise<OrganizationUserDetailsResponse>;
  getOrganizationUserGroups: (organizationId: string, id: string) => Promise<string[]>;
  getOrganizationUsers: (
    organizationId: string,
  ) => Promise<ListResponse<OrganizationUserUserDetailsResponse>>;
  getOrganizationUserResetPasswordDetails: (
    organizationId: string,
    id: string,
  ) => Promise<OrganizationUserResetPasswordDetailsReponse>;
  postOrganizationUserInvite: (
    organizationId: string,
    request: OrganizationUserInviteRequest,
  ) => Promise<any>;
  postOrganizationUserReinvite: (organizationId: string, id: string) => Promise<any>;
  postManyOrganizationUserReinvite: (
    organizationId: string,
    request: OrganizationUserBulkRequest,
  ) => Promise<ListResponse<OrganizationUserBulkResponse>>;
  postOrganizationUserAccept: (
    organizationId: string,
    id: string,
    request: OrganizationUserAcceptRequest,
  ) => Promise<any>;
  postOrganizationUserConfirm: (
    organizationId: string,
    id: string,
    request: OrganizationUserConfirmRequest,
  ) => Promise<any>;
  postOrganizationUsersPublicKey: (
    organizationId: string,
    request: OrganizationUserBulkRequest,
  ) => Promise<ListResponse<OrganizationUserBulkPublicKeyResponse>>;
  postOrganizationUserBulkConfirm: (
    organizationId: string,
    request: OrganizationUserBulkConfirmRequest,
  ) => Promise<ListResponse<OrganizationUserBulkResponse>>;
  putOrganizationUser: (
    organizationId: string,
    id: string,
    request: OrganizationUserUpdateRequest,
  ) => Promise<any>;
  putOrganizationUserGroups: (
    organizationId: string,
    id: string,
    request: OrganizationUserUpdateGroupsRequest,
  ) => Promise<any>;
  putOrganizationUserResetPasswordEnrollment: (
    organizationId: string,
    userId: string,
    request: OrganizationUserResetPasswordEnrollmentRequest,
  ) => Promise<any>;
  putOrganizationUserResetPassword: (
    organizationId: string,
    id: string,
    request: OrganizationUserResetPasswordRequest,
  ) => Promise<any>;
  deleteOrganizationUser: (organizationId: string, id: string) => Promise<any>;
  deleteManyOrganizationUsers: (
    organizationId: string,
    request: OrganizationUserBulkRequest,
  ) => Promise<ListResponse<OrganizationUserBulkResponse>>;
  getSync: () => Promise<SyncResponse>;
  postImportDirectory: (organizationId: string, request: ImportDirectoryRequest) => Promise<any>;
  postPublicImportDirectory: (request: OrganizationImportRequest) => Promise<any>;
  getSettingsDomains: () => Promise<DomainsResponse>;
  putSettingsDomains: (request: UpdateDomainsRequest) => Promise<DomainsResponse>;
  getTwoFactorProviders: () => Promise<ListResponse<TwoFactorProviderResponse>>;
  getTwoFactorOrganizationProviders: (
    organizationId: string,
  ) => Promise<ListResponse<TwoFactorProviderResponse>>;
  getTwoFactorAuthenticator: (
    request: SecretVerificationRequest,
  ) => Promise<TwoFactorAuthenticatorResponse>;
  getTwoFactorEmail: (request: SecretVerificationRequest) => Promise<TwoFactorEmailResponse>;
  getTwoFactorDuo: (request: SecretVerificationRequest) => Promise<TwoFactorDuoResponse>;
  getTwoFactorOrganizationDuo: (
    organizationId: string,
    request: SecretVerificationRequest,
  ) => Promise<TwoFactorDuoResponse>;
  getTwoFactorYubiKey: (request: SecretVerificationRequest) => Promise<TwoFactorYubiKeyResponse>;
  getTwoFactorWebAuthn: (request: SecretVerificationRequest) => Promise<TwoFactorWebAuthnResponse>;
  getTwoFactorWebAuthnChallenge: (request: SecretVerificationRequest) => Promise<ChallengeResponse>;
  getTwoFactorRecover: (request: SecretVerificationRequest) => Promise<TwoFactorRecoverResponse>;
  putTwoFactorAuthenticator: (
    request: UpdateTwoFactorAuthenticatorRequest,
  ) => Promise<TwoFactorAuthenticatorResponse>;
  putTwoFactorEmail: (request: UpdateTwoFactorEmailRequest) => Promise<TwoFactorEmailResponse>;
  putTwoFactorDuo: (request: UpdateTwoFactorDuoRequest) => Promise<TwoFactorDuoResponse>;
  putTwoFactorOrganizationDuo: (
    organizationId: string,
    request: UpdateTwoFactorDuoRequest,
  ) => Promise<TwoFactorDuoResponse>;
  putTwoFactorYubiKey: (
    request: UpdateTwoFactorYubioOtpRequest,
  ) => Promise<TwoFactorYubiKeyResponse>;
  putTwoFactorWebAuthn: (
    request: UpdateTwoFactorWebAuthnRequest,
  ) => Promise<TwoFactorWebAuthnResponse>;
  deleteTwoFactorWebAuthn: (
    request: UpdateTwoFactorWebAuthnDeleteRequest,
  ) => Promise<TwoFactorWebAuthnResponse>;
  putTwoFactorDisable: (request: TwoFactorProviderRequest) => Promise<TwoFactorProviderResponse>;
  putTwoFactorOrganizationDisable: (
    organizationId: string,
    request: TwoFactorProviderRequest,
  ) => Promise<TwoFactorProviderResponse>;
  postTwoFactorRecover: (request: TwoFactorRecoveryRequest) => Promise<any>;
  postTwoFactorEmailSetup: (request: TwoFactorEmailRequest) => Promise<any>;
  postTwoFactorEmail: (request: TwoFactorEmailRequest) => Promise<any>;
  getEmergencyAccessTrusted: () => Promise<ListResponse<EmergencyAccessGranteeDetailsResponse>>;
  getEmergencyAccessGranted: () => Promise<ListResponse<EmergencyAccessGrantorDetailsResponse>>;
  getEmergencyAccess: (id: string) => Promise<EmergencyAccessGranteeDetailsResponse>;
  getEmergencyGrantorPolicies: (id: string) => Promise<ListResponse<PolicyResponse>>;
  putEmergencyAccess: (id: string, request: EmergencyAccessUpdateRequest) => Promise<any>;
  deleteEmergencyAccess: (id: string) => Promise<any>;
  postEmergencyAccessInvite: (request: EmergencyAccessInviteRequest) => Promise<any>;
  postEmergencyAccessReinvite: (id: string) => Promise<any>;
  postEmergencyAccessAccept: (id: string, request: EmergencyAccessAcceptRequest) => Promise<any>;
  postEmergencyAccessConfirm: (id: string, request: EmergencyAccessConfirmRequest) => Promise<any>;
  postEmergencyAccessInitiate: (id: string) => Promise<any>;
  postEmergencyAccessApprove: (id: string) => Promise<any>;
  postEmergencyAccessReject: (id: string) => Promise<any>;
  postEmergencyAccessTakeover: (id: string) => Promise<EmergencyAccessTakeoverResponse>;
  postEmergencyAccessPassword: (
    id: string,
    request: EmergencyAccessPasswordRequest,
  ) => Promise<any>;
  postEmergencyAccessView: (id: string) => Promise<EmergencyAccessViewResponse>;
  getOrganization: (id: string) => Promise<OrganizationResponse>;
  getOrganizationBilling: (id: string) => Promise<BillingResponse>;
  getOrganizationSubscription: (id: string) => Promise<OrganizationSubscriptionResponse>;
  getOrganizationLicense: (id: string, installationId: string) => Promise<any>;
  getOrganizationTaxInfo: (id: string) => Promise<TaxInfoResponse>;
  getOrganizationAutoEnrollStatus: (
    identifier: string,
  ) => Promise<OrganizationAutoEnrollStatusResponse>;
  getOrganizationSso: (id: string) => Promise<OrganizationSsoResponse>;
  postOrganization: (request: OrganizationCreateRequest) => Promise<OrganizationResponse>;
  putOrganization: (
    id: string,
    request: OrganizationUpdateRequest,
  ) => Promise<OrganizationResponse>;
  putOrganizationTaxInfo: (id: string, request: OrganizationTaxInfoUpdateRequest) => Promise<any>;
  postLeaveOrganization: (id: string) => Promise<any>;
  postOrganizationLicense: (data: FormData) => Promise<OrganizationResponse>;
  postOrganizationLicenseUpdate: (id: string, data: FormData) => Promise<any>;
  postOrganizationApiKey: (
    id: string,
    request: SecretVerificationRequest,
  ) => Promise<ApiKeyResponse>;
  postOrganizationRotateApiKey: (
    id: string,
    request: SecretVerificationRequest,
  ) => Promise<ApiKeyResponse>;
  postOrganizationSso: (
    id: string,
    request: OrganizationSsoRequest,
  ) => Promise<OrganizationSsoResponse>;
  postOrganizationUpgrade: (
    id: string,
    request: OrganizationUpgradeRequest,
  ) => Promise<PaymentResponse>;
  postOrganizationUpdateSubscription: (
    id: string,
    request: OrganizationSubscriptionUpdateRequest,
  ) => Promise<void>;
  postOrganizationSeat: (id: string, request: SeatRequest) => Promise<PaymentResponse>;
  postOrganizationStorage: (id: string, request: StorageRequest) => Promise<any>;
  postOrganizationPayment: (id: string, request: PaymentRequest) => Promise<any>;
  postOrganizationVerifyBank: (id: string, request: VerifyBankRequest) => Promise<any>;
  postOrganizationCancel: (id: string) => Promise<any>;
  postOrganizationReinstate: (id: string) => Promise<any>;
  deleteOrganization: (id: string, request: SecretVerificationRequest) => Promise<any>;
  getPlans: () => Promise<ListResponse<PlanResponse>>;
  getTaxRates: () => Promise<ListResponse<TaxRateResponse>>;
  getOrganizationKeys: (id: string) => Promise<OrganizationKeysResponse>;
  postOrganizationKeys: (
    id: string,
    request: OrganizationKeysRequest,
  ) => Promise<OrganizationKeysResponse>;
  postProviderSetup: (id: string, request: ProviderSetupRequest) => Promise<ProviderResponse>;
  getProvider: (id: string) => Promise<ProviderResponse>;
  putProvider: (id: string, request: ProviderUpdateRequest) => Promise<ProviderResponse>;
  getProviderUsers: (providerId: string) => Promise<ListResponse<ProviderUserUserDetailsResponse>>;
  getProviderUser: (providerId: string, id: string) => Promise<ProviderUserResponse>;
  postProviderUserInvite: (providerId: string, request: ProviderUserInviteRequest) => Promise<any>;
  postProviderUserReinvite: (providerId: string, id: string) => Promise<any>;
  postManyProviderUserReinvite: (
    providerId: string,
    request: ProviderUserBulkRequest,
  ) => Promise<ListResponse<ProviderUserBulkResponse>>;
  postProviderUserAccept: (
    providerId: string,
    id: string,
    request: ProviderUserAcceptRequest,
  ) => Promise<any>;
  postProviderUserConfirm: (
    providerId: string,
    id: string,
    request: ProviderUserConfirmRequest,
  ) => Promise<any>;
  postProviderUsersPublicKey: (
    providerId: string,
    request: ProviderUserBulkRequest,
  ) => Promise<ListResponse<ProviderUserBulkPublicKeyResponse>>;
  postProviderUserBulkConfirm: (
    providerId: string,
    request: ProviderUserBulkConfirmRequest,
  ) => Promise<ListResponse<ProviderUserBulkResponse>>;
  putProviderUser: (
    providerId: string,
    id: string,
    request: ProviderUserUpdateRequest,
  ) => Promise<any>;
  deleteProviderUser: (organizationId: string, id: string) => Promise<any>;
  deleteManyProviderUsers: (
    providerId: string,
    request: ProviderUserBulkRequest,
  ) => Promise<ListResponse<ProviderUserBulkResponse>>;
  getProviderClients: (
    providerId: string,
  ) => Promise<ListResponse<ProviderOrganizationOrganizationDetailsResponse>>;
  postProviderAddOrganization: (
    providerId: string,
    request: ProviderAddOrganizationRequest,
  ) => Promise<any>;
  postProviderCreateOrganization: (
    providerId: string,
    request: ProviderOrganizationCreateRequest,
  ) => Promise<ProviderOrganizationResponse>;
  deleteProviderOrganization: (providerId: string, organizationId: string) => Promise<any>;
  getEvents: (start: string, end: string, token: string) => Promise<ListResponse<EventResponse>>;
  getEventsCipher: (
    id: string,
    start: string,
    end: string,
    token: string,
  ) => Promise<ListResponse<EventResponse>>;
  getEventsOrganization: (
    id: string,
    start: string,
    end: string,
    token: string,
  ) => Promise<ListResponse<EventResponse>>;
  getEventsOrganizationUser: (
    organizationId: string,
    id: string,
    start: string,
    end: string,
    token: string,
  ) => Promise<ListResponse<EventResponse>>;
  getEventsProvider: (
    id: string,
    start: string,
    end: string,
    token: string,
  ) => Promise<ListResponse<EventResponse>>;
  getEventsProviderUser: (
    providerId: string,
    id: string,
    start: string,
    end: string,
    token: string,
  ) => Promise<ListResponse<EventResponse>>;
  postEventsCollect: (request: EventRequest[]) => Promise<any>;
  deleteSsoUser: (organizationId: string) => Promise<any>;
  getSsoUserIdentifier: () => Promise<string>;
  getUserPublicKey: (id: string) => Promise<UserKeyResponse>;
  getHibpBreach: (username: string) => Promise<BreachAccountResponse[]>;
  postBitPayInvoice: (request: BitPayInvoiceRequest) => Promise<string>;
  postSetupPayment: () => Promise<string>;
  getActiveBearerToken: () => Promise<string>;
  fetch: (request: Request) => Promise<Response>;
  nativeFetch: (request: Request) => Promise<Response>;
  preValidateSso: (identifier: string) => Promise<boolean>;
  postCreateSponsorship: (
    sponsorshipOrgId: string,
    request: OrganizationSponsorshipCreateRequest,
  ) => Promise<void>;
  deleteRevokeSponsorship: (sponsoringOrganizationId: string) => Promise<void>;
  deleteRemoveSponsorship: (sponsoringOrgId: string) => Promise<void>;
  postPreValidateSponsorshipToken: (sponsorshipToken: string) => Promise<boolean>;
  postRedeemSponsorship: (
    sponsorshipToken: string,
    request: OrganizationSponsorshipRedeemRequest,
  ) => Promise<void>;
  postResendSponsorshipOffer: (sponsoringOrgId: string) => Promise<void>;
  getUserKeyFromKeyConnector: (keyConnectorUrl: string) => Promise<KeyConnectorUserKeyResponse>;
  postUserKeyToKeyConnector: (
    keyConnectorUrl: string,
    request: KeyConnectorUserKeyRequest,
  ) => Promise<void>;
  getKeyConnectorAlive: (keyConnectorUrl: string) => Promise<void>;
 }
--- a/jslib/common/src/models/request/account/setKeyConnectorKeyRequest.ts
+++ b/jslib/common/src/models/request/account/setKeyConnectorKeyRequest.ts
@ -1,24 +0,0 @@
 import { KdfType } from "../../../enums/kdfType";
 import { KeysRequest } from "../keysRequest";
 export class SetKeyConnectorKeyRequest {
  key: string;
  keys: KeysRequest;
  kdf: KdfType;
  kdfIterations: number;
  orgIdentifier: string;
  constructor(
    key: string,
    kdf: KdfType,
    kdfIterations: number,
    orgIdentifier: string,
    keys: KeysRequest,
  ) {
    this.key = key;
    this.kdf = kdf;
    this.kdfIterations = kdfIterations;
    this.orgIdentifier = orgIdentifier;
    this.keys = keys;
  }
 }
--- a/jslib/common/src/models/request/account/verifyOTPRequest.ts
+++ b/jslib/common/src/models/request/account/verifyOTPRequest.ts
@ -1,7 +0,0 @@
 export class VerifyOTPRequest {
  OTP: string;
  constructor(OTP: string) {
    this.OTP = OTP;
  }
 }
--- a/jslib/common/src/models/request/attachmentRequest.ts
+++ b/jslib/common/src/models/request/attachmentRequest.ts
@ -1,6 +0,0 @@
 export class AttachmentRequest {
  fileName: string;
  key: string;
  fileSize: number;
  adminRequest: boolean;
 }
--- a/jslib/common/src/models/request/bitPayInvoiceRequest.ts
+++ b/jslib/common/src/models/request/bitPayInvoiceRequest.ts
@ -1,9 +0,0 @@
 export class BitPayInvoiceRequest {
  userId: string;
  organizationId: string;
  credit: boolean;
  amount: number;
  returnUrl: string;
  name: string;
  email: string;
 }
--- a/jslib/common/src/models/request/cipherBulkDeleteRequest.ts
+++ b/jslib/common/src/models/request/cipherBulkDeleteRequest.ts
@ -1,9 +0,0 @@
 export class CipherBulkDeleteRequest {
  ids: string[];
  organizationId: string;
  constructor(ids: string[], organizationId?: string) {
    this.ids = ids == null ? [] : ids;
    this.organizationId = organizationId;
  }
 }
--- a/jslib/common/src/models/request/cipherBulkMoveRequest.ts
+++ b/jslib/common/src/models/request/cipherBulkMoveRequest.ts
@ -1,9 +0,0 @@
 export class CipherBulkMoveRequest {
  ids: string[];
  folderId: string;
  constructor(ids: string[], folderId: string) {
    this.ids = ids == null ? [] : ids;
    this.folderId = folderId;
  }
 }
--- a/jslib/common/src/models/request/cipherBulkRestoreRequest.ts
+++ b/jslib/common/src/models/request/cipherBulkRestoreRequest.ts
@ -1,7 +0,0 @@
 export class CipherBulkRestoreRequest {
  ids: string[];
  constructor(ids: string[]) {
    this.ids = ids == null ? [] : ids;
  }
 }
--- a/jslib/common/src/models/request/cipherBulkShareRequest.ts
+++ b/jslib/common/src/models/request/cipherBulkShareRequest.ts
@ -1,18 +0,0 @@
 import { Cipher } from "../domain/cipher";
 import { CipherWithIdRequest } from "./cipherWithIdRequest";
 export class CipherBulkShareRequest {
  ciphers: CipherWithIdRequest[];
  collectionIds: string[];
  constructor(ciphers: Cipher[], collectionIds: string[]) {
    if (ciphers != null) {
      this.ciphers = [];
      ciphers.forEach((c) => {
        this.ciphers.push(new CipherWithIdRequest(c));
      });
    }
    this.collectionIds = collectionIds;
  }
 }
--- a/jslib/common/src/models/request/cipherCollectionsRequest.ts
+++ b/jslib/common/src/models/request/cipherCollectionsRequest.ts
@ -1,7 +0,0 @@
 export class CipherCollectionsRequest {
  collectionIds: string[];
  constructor(collectionIds: string[]) {
    this.collectionIds = collectionIds == null ? [] : collectionIds;
  }
 }
--- a/jslib/common/src/models/request/cipherCreateRequest.ts
+++ b/jslib/common/src/models/request/cipherCreateRequest.ts
@ -1,13 +0,0 @@
 import { Cipher } from "../domain/cipher";
 import { CipherRequest } from "./cipherRequest";
 export class CipherCreateRequest {
  cipher: CipherRequest;
  collectionIds: string[];
  constructor(cipher: Cipher) {
    this.cipher = new CipherRequest(cipher);
    this.collectionIds = cipher.collectionIds;
  }
 }
--- a/jslib/common/src/models/request/cipherRequest.ts
+++ b/jslib/common/src/models/request/cipherRequest.ts
@ -1,164 +0,0 @@
 import { CipherRepromptType } from "../../enums/cipherRepromptType";
 import { CipherType } from "../../enums/cipherType";
 import { CardApi } from "../api/cardApi";
 import { FieldApi } from "../api/fieldApi";
 import { IdentityApi } from "../api/identityApi";
 import { LoginApi } from "../api/loginApi";
 import { LoginUriApi } from "../api/loginUriApi";
 import { SecureNoteApi } from "../api/secureNoteApi";
 import { Cipher } from "../domain/cipher";
 import { AttachmentRequest } from "./attachmentRequest";
 import { PasswordHistoryRequest } from "./passwordHistoryRequest";
 export class CipherRequest {
  type: CipherType;
  folderId: string;
  organizationId: string;
  name: string;
  notes: string;
  favorite: boolean;
  login: LoginApi;
  secureNote: SecureNoteApi;
  card: CardApi;
  identity: IdentityApi;
  fields: FieldApi[];
  passwordHistory: PasswordHistoryRequest[];
  // Deprecated, remove at some point and rename attachments2 to attachments
  attachments: { [id: string]: string };
  attachments2: { [id: string]: AttachmentRequest };
  lastKnownRevisionDate: Date;
  reprompt: CipherRepromptType;
  constructor(cipher: Cipher) {
    this.type = cipher.type;
    this.folderId = cipher.folderId;
    this.organizationId = cipher.organizationId;
    this.name = cipher.name ? cipher.name.encryptedString : null;
    this.notes = cipher.notes ? cipher.notes.encryptedString : null;
    this.favorite = cipher.favorite;
    this.lastKnownRevisionDate = cipher.revisionDate;
    this.reprompt = cipher.reprompt;
    switch (this.type) {
      case CipherType.Login:
        this.login = new LoginApi();
        this.login.uris = null;
        this.login.username = cipher.login.username ? cipher.login.username.encryptedString : null;
        this.login.password = cipher.login.password ? cipher.login.password.encryptedString : null;
        this.login.passwordRevisionDate =
          cipher.login.passwordRevisionDate != null
            ? cipher.login.passwordRevisionDate.toISOString()
            : null;
        this.login.totp = cipher.login.totp ? cipher.login.totp.encryptedString : null;
        this.login.autofillOnPageLoad = cipher.login.autofillOnPageLoad;
        if (cipher.login.uris != null) {
          this.login.uris = cipher.login.uris.map((u) => {
            const uri = new LoginUriApi();
            uri.uri = u.uri != null ? u.uri.encryptedString : null;
            uri.match = u.match != null ? u.match : null;
            return uri;
          });
        }
        break;
      case CipherType.SecureNote:
        this.secureNote = new SecureNoteApi();
        this.secureNote.type = cipher.secureNote.type;
        break;
      case CipherType.Card:
        this.card = new CardApi();
        this.card.cardholderName =
          cipher.card.cardholderName != null ? cipher.card.cardholderName.encryptedString : null;
        this.card.brand = cipher.card.brand != null ? cipher.card.brand.encryptedString : null;
        this.card.number = cipher.card.number != null ? cipher.card.number.encryptedString : null;
        this.card.expMonth =
          cipher.card.expMonth != null ? cipher.card.expMonth.encryptedString : null;
        this.card.expYear =
          cipher.card.expYear != null ? cipher.card.expYear.encryptedString : null;
        this.card.code = cipher.card.code != null ? cipher.card.code.encryptedString : null;
        break;
      case CipherType.Identity:
        this.identity = new IdentityApi();
        this.identity.title =
          cipher.identity.title != null ? cipher.identity.title.encryptedString : null;
        this.identity.firstName =
          cipher.identity.firstName != null ? cipher.identity.firstName.encryptedString : null;
        this.identity.middleName =
          cipher.identity.middleName != null ? cipher.identity.middleName.encryptedString : null;
        this.identity.lastName =
          cipher.identity.lastName != null ? cipher.identity.lastName.encryptedString : null;
        this.identity.address1 =
          cipher.identity.address1 != null ? cipher.identity.address1.encryptedString : null;
        this.identity.address2 =
          cipher.identity.address2 != null ? cipher.identity.address2.encryptedString : null;
        this.identity.address3 =
          cipher.identity.address3 != null ? cipher.identity.address3.encryptedString : null;
        this.identity.city =
          cipher.identity.city != null ? cipher.identity.city.encryptedString : null;
        this.identity.state =
          cipher.identity.state != null ? cipher.identity.state.encryptedString : null;
        this.identity.postalCode =
          cipher.identity.postalCode != null ? cipher.identity.postalCode.encryptedString : null;
        this.identity.country =
          cipher.identity.country != null ? cipher.identity.country.encryptedString : null;
        this.identity.company =
          cipher.identity.company != null ? cipher.identity.company.encryptedString : null;
        this.identity.email =
          cipher.identity.email != null ? cipher.identity.email.encryptedString : null;
        this.identity.phone =
          cipher.identity.phone != null ? cipher.identity.phone.encryptedString : null;
        this.identity.ssn =
          cipher.identity.ssn != null ? cipher.identity.ssn.encryptedString : null;
        this.identity.username =
          cipher.identity.username != null ? cipher.identity.username.encryptedString : null;
        this.identity.passportNumber =
          cipher.identity.passportNumber != null
            ? cipher.identity.passportNumber.encryptedString
            : null;
        this.identity.licenseNumber =
          cipher.identity.licenseNumber != null
            ? cipher.identity.licenseNumber.encryptedString
            : null;
        break;
      default:
        break;
    }
    if (cipher.fields != null) {
      this.fields = cipher.fields.map((f) => {
        const field = new FieldApi();
        field.type = f.type;
        field.name = f.name ? f.name.encryptedString : null;
        field.value = f.value ? f.value.encryptedString : null;
        field.linkedId = f.linkedId;
        return field;
      });
    }
    if (cipher.passwordHistory != null) {
      this.passwordHistory = [];
      cipher.passwordHistory.forEach((ph) => {
        this.passwordHistory.push({
          lastUsedDate: ph.lastUsedDate,
          password: ph.password ? ph.password.encryptedString : null,
        });
      });
    }
    if (cipher.attachments != null) {
      this.attachments = {};
      this.attachments2 = {};
      cipher.attachments.forEach((attachment) => {
        const fileName = attachment.fileName ? attachment.fileName.encryptedString : null;
        this.attachments[attachment.id] = fileName;
        const attachmentRequest = new AttachmentRequest();
        attachmentRequest.fileName = fileName;
        if (attachment.key != null) {
          attachmentRequest.key = attachment.key.encryptedString;
        }
        this.attachments2[attachment.id] = attachmentRequest;
      });
    }
  }
 }
--- a/jslib/common/src/models/request/cipherShareRequest.ts
+++ b/jslib/common/src/models/request/cipherShareRequest.ts
@ -1,13 +0,0 @@
 import { Cipher } from "../domain/cipher";
 import { CipherRequest } from "./cipherRequest";
 export class CipherShareRequest {
  cipher: CipherRequest;
  collectionIds: string[];
  constructor(cipher: Cipher) {
    this.cipher = new CipherRequest(cipher);
    this.collectionIds = cipher.collectionIds;
  }
 }
--- a/jslib/common/src/models/request/cipherWithIdRequest.ts
+++ b/jslib/common/src/models/request/cipherWithIdRequest.ts
@ -1,12 +0,0 @@
 import { Cipher } from "../domain/cipher";
 import { CipherRequest } from "./cipherRequest";
 export class CipherWithIdRequest extends CipherRequest {
  id: string;
  constructor(cipher: Cipher) {
    super(cipher);
    this.id = cipher.id;
  }
 }
--- a/jslib/common/src/models/request/collectionRequest.ts
+++ b/jslib/common/src/models/request/collectionRequest.ts
@ -1,17 +0,0 @@
 import { Collection } from "../domain/collection";
 import { SelectionReadOnlyRequest } from "./selectionReadOnlyRequest";
 export class CollectionRequest {
  name: string;
  externalId: string;
  groups: SelectionReadOnlyRequest[] = [];
  constructor(collection?: Collection) {
    if (collection == null) {
      return;
    }
    this.name = collection.name ? collection.name.encryptedString : null;
    this.externalId = collection.externalId;
  }
 }
--- a/jslib/common/src/models/request/deleteRecoverRequest.ts
+++ b/jslib/common/src/models/request/deleteRecoverRequest.ts
@ -1,3 +0,0 @@
 export class DeleteRecoverRequest {
  email: string;
 }
--- a/jslib/common/src/models/request/deviceTokenRequest.ts
+++ b/jslib/common/src/models/request/deviceTokenRequest.ts
@ -1,7 +0,0 @@
 export class DeviceTokenRequest {
  pushToken: string;
  constructor() {
    this.pushToken = null;
  }
 }
--- a/jslib/common/src/models/request/emailRequest.ts
+++ b/jslib/common/src/models/request/emailRequest.ts
@ -1,7 +0,0 @@
 import { EmailTokenRequest } from "./emailTokenRequest";
 export class EmailRequest extends EmailTokenRequest {
  newMasterPasswordHash: string;
  token: string;
  key: string;
 }
--- a/jslib/common/src/models/request/emailTokenRequest.ts
+++ b/jslib/common/src/models/request/emailTokenRequest.ts
@ -1,6 +0,0 @@
 import { SecretVerificationRequest } from "./secretVerificationRequest";
 export class EmailTokenRequest extends SecretVerificationRequest {
  newEmail: string;
  masterPasswordHash: string;
 }
--- a/jslib/common/src/models/request/emergencyAccessAcceptRequest.ts
+++ b/jslib/common/src/models/request/emergencyAccessAcceptRequest.ts
@ -1,3 +0,0 @@
 export class EmergencyAccessAcceptRequest {
  token: string;
 }
--- a/jslib/common/src/models/request/emergencyAccessConfirmRequest.ts
+++ b/jslib/common/src/models/request/emergencyAccessConfirmRequest.ts
@ -1,3 +0,0 @@
 export class EmergencyAccessConfirmRequest {
  key: string;
 }
--- a/jslib/common/src/models/request/emergencyAccessInviteRequest.ts
+++ b/jslib/common/src/models/request/emergencyAccessInviteRequest.ts
@ -1,7 +0,0 @@
 import { EmergencyAccessType } from "../../enums/emergencyAccessType";
 export class EmergencyAccessInviteRequest {
  email: string;
  type: EmergencyAccessType;
  waitTimeDays: number;
 }
--- a/jslib/common/src/models/request/emergencyAccessPasswordRequest.ts
+++ b/jslib/common/src/models/request/emergencyAccessPasswordRequest.ts
@ -1,4 +0,0 @@
 export class EmergencyAccessPasswordRequest {
  newMasterPasswordHash: string;
  key: string;
 }
--- a/jslib/common/src/models/request/emergencyAccessUpdateRequest.ts
+++ b/jslib/common/src/models/request/emergencyAccessUpdateRequest.ts
@ -1,7 +0,0 @@
 import { EmergencyAccessType } from "../../enums/emergencyAccessType";
 export class EmergencyAccessUpdateRequest {
  type: EmergencyAccessType;
  waitTimeDays: number;
  keyEncrypted?: string;
 }
--- a/jslib/common/src/models/request/eventRequest.ts
+++ b/jslib/common/src/models/request/eventRequest.ts
@ -1,7 +0,0 @@
 import { EventType } from "../../enums/eventType";
 export class EventRequest {
  type: EventType;
  cipherId: string;
  date: string;
 }
--- a/jslib/common/src/models/request/folderRequest.ts
+++ b/jslib/common/src/models/request/folderRequest.ts
@ -1,9 +0,0 @@
 import { Folder } from "../domain/folder";
 export class FolderRequest {
  name: string;
  constructor(folder: Folder) {
    this.name = folder.name ? folder.name.encryptedString : null;
  }
 }
--- a/jslib/common/src/models/request/folderWithIdRequest.ts
+++ b/jslib/common/src/models/request/folderWithIdRequest.ts
@ -1,12 +0,0 @@
 import { Folder } from "../domain/folder";
 import { FolderRequest } from "./folderRequest";
 export class FolderWithIdRequest extends FolderRequest {
  id: string;
  constructor(folder: Folder) {
    super(folder);
    this.id = folder.id;
  }
 }
--- a/jslib/common/src/models/request/groupRequest.ts
+++ b/jslib/common/src/models/request/groupRequest.ts
@ -1,8 +0,0 @@
 import { SelectionReadOnlyRequest } from "./selectionReadOnlyRequest";
 export class GroupRequest {
  name: string;
  accessAll: boolean;
  externalId: string;
  collections: SelectionReadOnlyRequest[] = [];
 }
--- a/jslib/common/src/models/request/iapCheckRequest.ts
+++ b/jslib/common/src/models/request/iapCheckRequest.ts
@ -1,5 +0,0 @@
 import { PaymentMethodType } from "../../enums/paymentMethodType";
 export class IapCheckRequest {
  paymentMethodType: PaymentMethodType;
 }
--- a/jslib/common/src/models/request/importCiphersRequest.ts
+++ b/jslib/common/src/models/request/importCiphersRequest.ts
@ -1,9 +0,0 @@
 import { CipherRequest } from "./cipherRequest";
 import { FolderRequest } from "./folderRequest";
 import { KvpRequest } from "./kvpRequest";
 export class ImportCiphersRequest {
  ciphers: CipherRequest[] = [];
  folders: FolderRequest[] = [];
  folderRelationships: KvpRequest<number, number>[] = [];
 }
--- a/jslib/common/src/models/request/importOrganizationCiphersRequest.ts
+++ b/jslib/common/src/models/request/importOrganizationCiphersRequest.ts
@ -1,9 +0,0 @@
 import { CipherRequest } from "./cipherRequest";
 import { CollectionRequest } from "./collectionRequest";
 import { KvpRequest } from "./kvpRequest";
 export class ImportOrganizationCiphersRequest {
  ciphers: CipherRequest[] = [];
  collections: CollectionRequest[] = [];
  collectionRelationships: KvpRequest<number, number>[] = [];
 }
--- a/jslib/common/src/models/request/kdfRequest.ts
+++ b/jslib/common/src/models/request/kdfRequest.ts
@ -1,8 +0,0 @@
 import { KdfType } from "../../enums/kdfType";
 import { PasswordRequest } from "./passwordRequest";
 export class KdfRequest extends PasswordRequest {
  kdf: KdfType;
  kdfIterations: number;
 }
--- a/jslib/common/src/models/request/keyConnectorUserKeyRequest.ts
+++ b/jslib/common/src/models/request/keyConnectorUserKeyRequest.ts
@ -1,7 +0,0 @@
 export class KeyConnectorUserKeyRequest {
  key: string;
  constructor(key: string) {
    this.key = key;
  }
 }
--- a/jslib/common/src/models/request/keysRequest.ts
+++ b/jslib/common/src/models/request/keysRequest.ts
@ -1,9 +0,0 @@
 export class KeysRequest {
  publicKey: string;
  encryptedPrivateKey: string;
  constructor(publicKey: string, encryptedPrivateKey: string) {
    this.publicKey = publicKey;
    this.encryptedPrivateKey = encryptedPrivateKey;
  }
 }
--- a/jslib/common/src/models/request/kvpRequest.ts
+++ b/jslib/common/src/models/request/kvpRequest.ts
@ -1,9 +0,0 @@
 export class KvpRequest<TK, TV> {
  key: TK;
  value: TV;
  constructor(key: TK, value: TV) {
    this.key = key;
    this.value = value;
  }
 }
--- a/jslib/common/src/models/request/organization/organizationSponsorshipCreateRequest.ts
+++ b/jslib/common/src/models/request/organization/organizationSponsorshipCreateRequest.ts
@ -1,7 +0,0 @@
 import { PlanSponsorshipType } from "../../../enums/planSponsorshipType";
 export class OrganizationSponsorshipCreateRequest {
  sponsoredEmail: string;
  planSponsorshipType: PlanSponsorshipType;
  friendlyName: string;
 }
--- a/jslib/common/src/models/request/organization/organizationSponsorshipRedeemRequest.ts
+++ b/jslib/common/src/models/request/organization/organizationSponsorshipRedeemRequest.ts
@ -1,6 +0,0 @@
 import { PlanSponsorshipType } from "../../../enums/planSponsorshipType";
 export class OrganizationSponsorshipRedeemRequest {
  planSponsorshipType: PlanSponsorshipType;
  sponsoredOrganizationId: string;
 }
--- a/jslib/common/src/models/request/organization/organizationSsoRequest.ts
+++ b/jslib/common/src/models/request/organization/organizationSsoRequest.ts
@ -1,6 +0,0 @@
 import { SsoConfigApi } from "../../api/ssoConfigApi";
 export class OrganizationSsoRequest {
  enabled = false;
  data: SsoConfigApi;
 }
--- a/jslib/common/src/models/request/organizationCreateRequest.ts
+++ b/jslib/common/src/models/request/organizationCreateRequest.ts
@ -1,27 +0,0 @@
 import { PaymentMethodType } from "../../enums/paymentMethodType";
 import { PlanType } from "../../enums/planType";
 import { OrganizationKeysRequest } from "./organizationKeysRequest";
 export class OrganizationCreateRequest {
  name: string;
  businessName: string;
  billingEmail: string;
  planType: PlanType;
  key: string;
  keys: OrganizationKeysRequest;
  paymentMethodType: PaymentMethodType;
  paymentToken: string;
  additionalSeats: number;
  maxAutoscaleSeats: number;
  additionalStorageGb: number;
  premiumAccessAddon: boolean;
  collectionName: string;
  taxIdNumber: string;
  billingAddressLine1: string;
  billingAddressLine2: string;
  billingAddressCity: string;
  billingAddressState: string;
  billingAddressPostalCode: string;
  billingAddressCountry: string;
 }
--- a/jslib/common/src/models/request/organizationKeysRequest.ts
+++ b/jslib/common/src/models/request/organizationKeysRequest.ts
@ -1,7 +0,0 @@
 import { KeysRequest } from "./keysRequest";
 export class OrganizationKeysRequest extends KeysRequest {
  constructor(publicKey: string, encryptedPrivateKey: string) {
    super(publicKey, encryptedPrivateKey);
  }
 }
--- a/jslib/common/src/models/request/organizationSubscriptionUpdateRequest.ts
+++ b/jslib/common/src/models/request/organizationSubscriptionUpdateRequest.ts
@ -1,6 +0,0 @@
 export class OrganizationSubscriptionUpdateRequest {
  constructor(
    public seatAdjustment: number,
    public maxAutoscaleSeats?: number,
  ) {}
 }
--- a/jslib/common/src/models/request/organizationTaxInfoUpdateRequest.ts
+++ b/jslib/common/src/models/request/organizationTaxInfoUpdateRequest.ts
@ -1,9 +0,0 @@
 import { TaxInfoUpdateRequest } from "./taxInfoUpdateRequest";
 export class OrganizationTaxInfoUpdateRequest extends TaxInfoUpdateRequest {
  taxId: string;
  line1: string;
  line2: string;
  city: string;
  state: string;
 }
--- a/jslib/common/src/models/request/organizationUpdateRequest.ts
+++ b/jslib/common/src/models/request/organizationUpdateRequest.ts
@ -1,9 +0,0 @@
 import { OrganizationKeysRequest } from "./organizationKeysRequest";
 export class OrganizationUpdateRequest {
  name: string;
  identifier: string;
  businessName: string;
  billingEmail: string;
  keys: OrganizationKeysRequest;
 }
--- a/jslib/common/src/models/request/organizationUpgradeRequest.ts
+++ b/jslib/common/src/models/request/organizationUpgradeRequest.ts
@ -1,14 +0,0 @@
 import { PlanType } from "../../enums/planType";
 import { OrganizationKeysRequest } from "./organizationKeysRequest";
 export class OrganizationUpgradeRequest {
  businessName: string;
  planType: PlanType;
  additionalSeats: number;
  additionalStorageGb: number;
  premiumAccessAddon: boolean;
  billingAddressCountry: string;
  billingAddressPostalCode: string;
  keys: OrganizationKeysRequest;
 }
--- a/jslib/common/src/models/request/organizationUserAcceptRequest.ts
+++ b/jslib/common/src/models/request/organizationUserAcceptRequest.ts
@ -1,3 +0,0 @@
 export class OrganizationUserAcceptRequest {
  token: string;
 }
--- a/jslib/common/src/models/request/organizationUserBulkConfirmRequest.ts
+++ b/jslib/common/src/models/request/organizationUserBulkConfirmRequest.ts
@ -1,12 +0,0 @@
 type OrganizationUserBulkRequestEntry = {
  id: string;
  key: string;
 };
 export class OrganizationUserBulkConfirmRequest {
  keys: OrganizationUserBulkRequestEntry[];
  constructor(keys: OrganizationUserBulkRequestEntry[]) {
    this.keys = keys;
  }
 }
--- a/jslib/common/src/models/request/organizationUserBulkRequest.ts
+++ b/jslib/common/src/models/request/organizationUserBulkRequest.ts
@ -1,7 +0,0 @@
 export class OrganizationUserBulkRequest {
  ids: string[];
  constructor(ids: string[]) {
    this.ids = ids == null ? [] : ids;
  }
 }
--- a/jslib/common/src/models/request/organizationUserConfirmRequest.ts
+++ b/jslib/common/src/models/request/organizationUserConfirmRequest.ts
@ -1,3 +0,0 @@
 export class OrganizationUserConfirmRequest {
  key: string;
 }
--- a/jslib/common/src/models/request/organizationUserInviteRequest.ts
+++ b/jslib/common/src/models/request/organizationUserInviteRequest.ts
@ -1,12 +0,0 @@
 import { OrganizationUserType } from "../../enums/organizationUserType";
 import { PermissionsApi } from "../api/permissionsApi";
 import { SelectionReadOnlyRequest } from "./selectionReadOnlyRequest";
 export class OrganizationUserInviteRequest {
  emails: string[] = [];
  type: OrganizationUserType;
  accessAll: boolean;
  collections: SelectionReadOnlyRequest[] = [];
  permissions: PermissionsApi;
 }
--- a/jslib/common/src/models/request/organizationUserResetPasswordEnrollmentRequest.ts
+++ b/jslib/common/src/models/request/organizationUserResetPasswordEnrollmentRequest.ts
@ -1,3 +0,0 @@
 export class OrganizationUserResetPasswordEnrollmentRequest {
  resetPasswordKey: string;
 }
--- a/jslib/common/src/models/request/organizationUserResetPasswordRequest.ts
+++ b/jslib/common/src/models/request/organizationUserResetPasswordRequest.ts
@ -1,4 +0,0 @@
 export class OrganizationUserResetPasswordRequest {
  newMasterPasswordHash: string;
  key: string;
 }
--- a/jslib/common/src/models/request/organizationUserUpdateGroupsRequest.ts
+++ b/jslib/common/src/models/request/organizationUserUpdateGroupsRequest.ts
@ -1,3 +0,0 @@
 export class OrganizationUserUpdateGroupsRequest {
  groupIds: string[] = [];
 }
--- a/jslib/common/src/models/request/organizationUserUpdateRequest.ts
+++ b/jslib/common/src/models/request/organizationUserUpdateRequest.ts
@ -1,11 +0,0 @@
 import { OrganizationUserType } from "../../enums/organizationUserType";
 import { PermissionsApi } from "../api/permissionsApi";
 import { SelectionReadOnlyRequest } from "./selectionReadOnlyRequest";
 export class OrganizationUserUpdateRequest {
  type: OrganizationUserType;
  accessAll: boolean;
  collections: SelectionReadOnlyRequest[] = [];
  permissions: PermissionsApi;
 }
--- a/jslib/common/src/models/request/passwordHintRequest.ts
+++ b/jslib/common/src/models/request/passwordHintRequest.ts
@ -1,7 +0,0 @@
 export class PasswordHintRequest {
  email: string;
  constructor(email: string) {
    this.email = email;
  }
 }
--- a/jslib/common/src/models/request/passwordHistoryRequest.ts
+++ b/jslib/common/src/models/request/passwordHistoryRequest.ts
@ -1,4 +0,0 @@
 export class PasswordHistoryRequest {
  password: string;
  lastUsedDate: Date;
 }
--- a/jslib/common/src/models/request/passwordRequest.ts
+++ b/jslib/common/src/models/request/passwordRequest.ts
@ -1,6 +0,0 @@
 import { SecretVerificationRequest } from "./secretVerificationRequest";
 export class PasswordRequest extends SecretVerificationRequest {
  newMasterPasswordHash: string;
  key: string;
 }
--- a/jslib/common/src/models/request/paymentRequest.ts
+++ b/jslib/common/src/models/request/paymentRequest.ts
@ -1,7 +0,0 @@
 import { PaymentMethodType } from "../../enums/paymentMethodType";
 import { OrganizationTaxInfoUpdateRequest } from "../request/organizationTaxInfoUpdateRequest";
 export class PaymentRequest extends OrganizationTaxInfoUpdateRequest {
  paymentMethodType: PaymentMethodType;
  paymentToken: string;
 }
--- a/jslib/common/src/models/request/policyRequest.ts
+++ b/jslib/common/src/models/request/policyRequest.ts
@ -1,7 +0,0 @@
 import { PolicyType } from "../../enums/policyType";
 export class PolicyRequest {
  type: PolicyType;
  enabled: boolean;
  data: any;
 }
--- a/jslib/common/src/models/request/preloginRequest.ts
+++ b/jslib/common/src/models/request/preloginRequest.ts
@ -1,7 +0,0 @@
 export class PreloginRequest {
  email: string;
  constructor(email: string) {
    this.email = email;
  }
 }
--- a/jslib/common/src/models/request/provider/providerAddOrganizationRequest.ts
+++ b/jslib/common/src/models/request/provider/providerAddOrganizationRequest.ts
@ -1,4 +0,0 @@
 export class ProviderAddOrganizationRequest {
  organizationId: string;
  key: string;
 }
--- a/jslib/common/src/models/request/provider/providerOrganizationCreateRequest.ts
+++ b/jslib/common/src/models/request/provider/providerOrganizationCreateRequest.ts
@ -1,8 +0,0 @@
 import { OrganizationCreateRequest } from "../organizationCreateRequest";
 export class ProviderOrganizationCreateRequest {
  constructor(
    public clientOwnerEmail: string,
    public organizationCreateRequest: OrganizationCreateRequest,
  ) {}
 }
--- a/jslib/common/src/models/request/provider/providerSetupRequest.ts
+++ b/jslib/common/src/models/request/provider/providerSetupRequest.ts
@ -1,7 +0,0 @@
 export class ProviderSetupRequest {
  name: string;
  businessName: string;
  billingEmail: string;
  token: string;
  key: string;
 }
--- a/jslib/common/src/models/request/provider/providerUpdateRequest.ts
+++ b/jslib/common/src/models/request/provider/providerUpdateRequest.ts
@ -1,5 +0,0 @@
 export class ProviderUpdateRequest {
  name: string;
  businessName: string;
  billingEmail: string;
 }
--- a/jslib/common/src/models/request/provider/providerUserAcceptRequest.ts
+++ b/jslib/common/src/models/request/provider/providerUserAcceptRequest.ts
@ -1,3 +0,0 @@
 export class ProviderUserAcceptRequest {
  token: string;
 }
--- a/jslib/common/src/models/request/provider/providerUserBulkConfirmRequest.ts
+++ b/jslib/common/src/models/request/provider/providerUserBulkConfirmRequest.ts
@ -1,12 +0,0 @@
 type ProviderUserBulkRequestEntry = {
  id: string;
  key: string;
 };
 export class ProviderUserBulkConfirmRequest {
  keys: ProviderUserBulkRequestEntry[];
  constructor(keys: ProviderUserBulkRequestEntry[]) {
    this.keys = keys;
  }
 }
--- a/jslib/common/src/models/request/provider/providerUserBulkRequest.ts
+++ b/jslib/common/src/models/request/provider/providerUserBulkRequest.ts
@ -1,7 +0,0 @@
 export class ProviderUserBulkRequest {
  ids: string[];
  constructor(ids: string[]) {
    this.ids = ids == null ? [] : ids;
  }
 }
--- a/jslib/common/src/models/request/provider/providerUserConfirmRequest.ts
+++ b/jslib/common/src/models/request/provider/providerUserConfirmRequest.ts
@ -1,3 +0,0 @@
 export class ProviderUserConfirmRequest {
  key: string;
 }
--- a/jslib/common/src/models/request/provider/providerUserInviteRequest.ts
+++ b/jslib/common/src/models/request/provider/providerUserInviteRequest.ts
@ -1,6 +0,0 @@
 import { ProviderUserType } from "../../../enums/providerUserType";
 export class ProviderUserInviteRequest {
  emails: string[] = [];
  type: ProviderUserType;
 }
--- a/jslib/common/src/models/request/provider/providerUserUpdateRequest.ts
+++ b/jslib/common/src/models/request/provider/providerUserUpdateRequest.ts
@ -1,5 +0,0 @@
 import { ProviderUserType } from "../../../enums/providerUserType";
 export class ProviderUserUpdateRequest {
  type: ProviderUserType;
 }
--- a/jslib/common/src/models/request/referenceEventRequest.ts
+++ b/jslib/common/src/models/request/referenceEventRequest.ts
@ -1,5 +0,0 @@
 export class ReferenceEventRequest {
  id: string;
  layout: string;
  flow: string;
 }
--- a/jslib/common/src/models/request/registerRequest.ts
+++ b/jslib/common/src/models/request/registerRequest.ts
@ -1,26 +0,0 @@
 import { KdfType } from "../../enums/kdfType";
 import { CaptchaProtectedRequest } from "./captchaProtectedRequest";
 import { KeysRequest } from "./keysRequest";
 import { ReferenceEventRequest } from "./referenceEventRequest";
 export class RegisterRequest implements CaptchaProtectedRequest {
  masterPasswordHint: string;
  keys: KeysRequest;
  token: string;
  organizationUserId: string;
  constructor(
    public email: string,
    public name: string,
    public masterPasswordHash: string,
    masterPasswordHint: string,
    public key: string,
    public kdf: KdfType,
    public kdfIterations: number,
    public referenceData: ReferenceEventRequest,
    public captchaResponse: string,
  ) {
    this.masterPasswordHint = masterPasswordHint ? masterPasswordHint : null;
  }
 }
--- a/jslib/common/src/models/request/seatRequest.ts
+++ b/jslib/common/src/models/request/seatRequest.ts
@ -1,3 +0,0 @@
 export class SeatRequest {
  seatAdjustment: number;
 }
--- a/jslib/common/src/models/request/secretVerificationRequest.ts
+++ b/jslib/common/src/models/request/secretVerificationRequest.ts
@ -1,4 +0,0 @@
 export class SecretVerificationRequest {
  masterPasswordHash: string;
  otp: string;
 }
--- a/jslib/common/src/models/request/selectionReadOnlyRequest.ts
+++ b/jslib/common/src/models/request/selectionReadOnlyRequest.ts
@ -1,11 +0,0 @@
 export class SelectionReadOnlyRequest {
  id: string;
  readOnly: boolean;
  hidePasswords: boolean;
  constructor(id: string, readOnly: boolean, hidePasswords: boolean) {
    this.id = id;
    this.readOnly = readOnly;
    this.hidePasswords = hidePasswords;
  }
 }
--- a/jslib/common/src/models/request/sendAccessRequest.ts
+++ b/jslib/common/src/models/request/sendAccessRequest.ts
@ -1,3 +0,0 @@
 export class SendAccessRequest {
  password: string;
 }
--- a/jslib/common/src/models/request/sendRequest.ts
+++ b/jslib/common/src/models/request/sendRequest.ts
@ -1,48 +0,0 @@
 import { SendType } from "../../enums/sendType";
 import { SendFileApi } from "../api/sendFileApi";
 import { SendTextApi } from "../api/sendTextApi";
 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;
    }
  }
 }
--- a/jslib/common/src/models/request/sendWithIdRequest.ts
+++ b/jslib/common/src/models/request/sendWithIdRequest.ts
@ -1,12 +0,0 @@
 import { Send } from "../domain/send";
 import { SendRequest } from "./sendRequest";
 export class SendWithIdRequest extends SendRequest {
  id: string;
  constructor(send: Send) {
    super(send);
    this.id = send.id;
  }
 }
--- a/jslib/common/src/models/request/setPasswordRequest.ts
+++ b/jslib/common/src/models/request/setPasswordRequest.ts
@ -1,31 +0,0 @@
 import { KdfType } from "../../enums/kdfType";
 import { KeysRequest } from "./keysRequest";
 export class SetPasswordRequest {
  masterPasswordHash: string;
  key: string;
  masterPasswordHint: string;
  keys: KeysRequest;
  kdf: KdfType;
  kdfIterations: number;
  orgIdentifier: string;
  constructor(
    masterPasswordHash: string,
    key: string,
    masterPasswordHint: string,
    kdf: KdfType,
    kdfIterations: number,
    orgIdentifier: string,
    keys: KeysRequest,
  ) {
    this.masterPasswordHash = masterPasswordHash;
    this.key = key;
    this.masterPasswordHint = masterPasswordHint;
    this.kdf = kdf;
    this.kdfIterations = kdfIterations;
    this.orgIdentifier = orgIdentifier;
    this.keys = keys;
  }
 }
--- a/jslib/common/src/models/request/storageRequest.ts
+++ b/jslib/common/src/models/request/storageRequest.ts
@ -1,3 +0,0 @@
 export class StorageRequest {
  storageGbAdjustment: number;
 }
--- a/jslib/common/src/models/request/taxInfoUpdateRequest.ts
+++ b/jslib/common/src/models/request/taxInfoUpdateRequest.ts
@ -1,4 +0,0 @@
 export class TaxInfoUpdateRequest {
  country: string;
  postalCode: string;
 }
--- a/jslib/common/src/models/request/twoFactorEmailRequest.ts
+++ b/jslib/common/src/models/request/twoFactorEmailRequest.ts
@ -1,5 +0,0 @@
 import { SecretVerificationRequest } from "./secretVerificationRequest";
 export class TwoFactorEmailRequest extends SecretVerificationRequest {
  email: string;
 }
--- a/jslib/common/src/models/request/twoFactorProviderRequest.ts
+++ b/jslib/common/src/models/request/twoFactorProviderRequest.ts
@ -1,7 +0,0 @@
 import { TwoFactorProviderType } from "../../enums/twoFactorProviderType";
 import { SecretVerificationRequest } from "./secretVerificationRequest";
 export class TwoFactorProviderRequest extends SecretVerificationRequest {
  type: TwoFactorProviderType;
 }
--- a/jslib/common/src/models/request/twoFactorRecoveryRequest.ts
+++ b/jslib/common/src/models/request/twoFactorRecoveryRequest.ts
@ -1,6 +0,0 @@
 import { SecretVerificationRequest } from "./secretVerificationRequest";
 export class TwoFactorRecoveryRequest extends SecretVerificationRequest {
  recoveryCode: string;
  email: string;
 }
--- a/jslib/common/src/models/request/updateDomainsRequest.ts
+++ b/jslib/common/src/models/request/updateDomainsRequest.ts
@ -1,4 +0,0 @@
 export class UpdateDomainsRequest {
  equivalentDomains: string[][];
  excludedGlobalEquivalentDomains: number[];
 }
--- a/jslib/common/src/models/request/updateKeyRequest.ts
+++ b/jslib/common/src/models/request/updateKeyRequest.ts
@ -1,12 +0,0 @@
 import { CipherWithIdRequest } from "./cipherWithIdRequest";
 import { FolderWithIdRequest } from "./folderWithIdRequest";
 import { SendWithIdRequest } from "./sendWithIdRequest";
 export class UpdateKeyRequest {
  ciphers: CipherWithIdRequest[] = [];
  folders: FolderWithIdRequest[] = [];
  sends: SendWithIdRequest[] = [];
  masterPasswordHash: string;
  privateKey: string;
  key: string;
 }
--- a/jslib/common/src/models/request/updateProfileRequest.ts
+++ b/jslib/common/src/models/request/updateProfileRequest.ts
@ -1,10 +0,0 @@
 export class UpdateProfileRequest {
  name: string;
  masterPasswordHint: string;
  culture = "en-US"; // deprecated
  constructor(name: string, masterPasswordHint: string) {
    this.name = name;
    this.masterPasswordHint = masterPasswordHint ? masterPasswordHint : null;
  }
 }
--- a/jslib/common/src/models/request/updateTempPasswordRequest.ts
+++ b/jslib/common/src/models/request/updateTempPasswordRequest.ts
@ -1,5 +0,0 @@
 import { OrganizationUserResetPasswordRequest } from "./organizationUserResetPasswordRequest";
 export class UpdateTempPasswordRequest extends OrganizationUserResetPasswordRequest {
  masterPasswordHint: string;
 }
--- a/jslib/common/src/models/request/updateTwoFactorAuthenticatorRequest.ts
+++ b/jslib/common/src/models/request/updateTwoFactorAuthenticatorRequest.ts
@ -1,6 +0,0 @@
 import { SecretVerificationRequest } from "./secretVerificationRequest";
 export class UpdateTwoFactorAuthenticatorRequest extends SecretVerificationRequest {
  token: string;
  key: string;
 }
--- a/jslib/common/src/models/request/updateTwoFactorDuoRequest.ts
+++ b/jslib/common/src/models/request/updateTwoFactorDuoRequest.ts
@ -1,7 +0,0 @@
 import { SecretVerificationRequest } from "./secretVerificationRequest";
 export class UpdateTwoFactorDuoRequest extends SecretVerificationRequest {
  integrationKey: string;
  secretKey: string;
  host: string;
 }
--- a/jslib/common/src/models/request/updateTwoFactorEmailRequest.ts
+++ b/jslib/common/src/models/request/updateTwoFactorEmailRequest.ts
@ -1,6 +0,0 @@
 import { SecretVerificationRequest } from "./secretVerificationRequest";
 export class UpdateTwoFactorEmailRequest extends SecretVerificationRequest {
  token: string;
  email: string;
 }
--- a/jslib/common/src/models/request/updateTwoFactorWebAuthnDeleteRequest.ts
+++ b/jslib/common/src/models/request/updateTwoFactorWebAuthnDeleteRequest.ts
@ -1,5 +0,0 @@
 import { SecretVerificationRequest } from "./secretVerificationRequest";
 export class UpdateTwoFactorWebAuthnDeleteRequest extends SecretVerificationRequest {
  id: number;
 }
--- a/jslib/common/src/models/request/updateTwoFactorWebAuthnRequest.ts
+++ b/jslib/common/src/models/request/updateTwoFactorWebAuthnRequest.ts
@ -1,7 +0,0 @@
 import { SecretVerificationRequest } from "./secretVerificationRequest";
 export class UpdateTwoFactorWebAuthnRequest extends SecretVerificationRequest {
  deviceResponse: PublicKeyCredential;
  name: string;
  id: number;
 }
--- a/jslib/common/src/models/request/updateTwoFactorYubioOtpRequest.ts
+++ b/jslib/common/src/models/request/updateTwoFactorYubioOtpRequest.ts
@ -1,10 +0,0 @@
 import { SecretVerificationRequest } from "./secretVerificationRequest";
 export class UpdateTwoFactorYubioOtpRequest extends SecretVerificationRequest {
  key1: string;
  key2: string;
  key3: string;
  key4: string;
  key5: string;
  nfc: boolean;
 }
--- a/jslib/common/src/models/request/verifyBankRequest.ts
+++ b/jslib/common/src/models/request/verifyBankRequest.ts
@ -1,4 +0,0 @@
 export class VerifyBankRequest {
  amount1: number;
  amount2: number;
 }
--- a/jslib/common/src/models/request/verifyDeleteRecoverRequest.ts
+++ b/jslib/common/src/models/request/verifyDeleteRecoverRequest.ts
@ -1,9 +0,0 @@
 export class VerifyDeleteRecoverRequest {
  userId: string;
  token: string;
  constructor(userId: string, token: string) {
    this.userId = userId;
    this.token = token;
  }
 }
--- a/jslib/common/src/models/request/verifyEmailRequest.ts
+++ b/jslib/common/src/models/request/verifyEmailRequest.ts
@ -1,9 +0,0 @@
 export class VerifyEmailRequest {
  userId: string;
  token: string;
  constructor(userId: string, token: string) {
    this.userId = userId;
    this.token = token;
  }
 }
--- a/jslib/common/src/services/api.service.ts
+++ b/jslib/common/src/services/api.service.ts