From e157d5be6d5789231ae3d66f0db096590d411403 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Sat, 20 Jan 2018 14:12:18 -0500
Subject: [PATCH] remove model window assignments

---
 src/models/data/attachmentData.ts                  | 5 +----
 src/models/data/cardData.ts                        | 5 +----
 src/models/data/cipherData.ts                      | 5 +----
 src/models/data/collectionData.ts                  | 5 +----
 src/models/data/fieldData.ts                       | 5 +----
 src/models/data/folderData.ts                      | 5 +----
 src/models/data/identityData.ts                    | 5 +----
 src/models/data/loginData.ts                       | 5 +----
 src/models/data/secureNoteData.ts                  | 5 +----
 src/models/domain/attachment.ts                    | 5 +----
 src/models/domain/card.ts                          | 5 +----
 src/models/domain/cipher.ts                        | 5 +----
 src/models/domain/cipherString.ts                  | 5 +----
 src/models/domain/collection.ts                    | 5 +----
 src/models/domain/field.ts                         | 5 +----
 src/models/domain/folder.ts                        | 5 +----
 src/models/domain/identity.ts                      | 5 +----
 src/models/domain/login.ts                         | 5 +----
 src/models/domain/secureNote.ts                    | 5 +----
 src/models/request/cipherRequest.ts                | 5 +----
 src/models/request/deviceRequest.ts                | 5 +----
 src/models/request/deviceTokenRequest.ts           | 5 +----
 src/models/request/folderRequest.ts                | 5 +----
 src/models/request/passwordHintRequest.ts          | 5 +----
 src/models/request/registerRequest.ts              | 5 +----
 src/models/request/tokenRequest.ts                 | 5 +----
 src/models/request/twoFactorEmailRequest.ts        | 5 +----
 src/models/response/attachmentResponse.ts          | 5 +----
 src/models/response/cipherResponse.ts              | 5 +----
 src/models/response/collectionResponse.ts          | 5 +----
 src/models/response/deviceResponse.ts              | 5 +----
 src/models/response/domainsResponse.ts             | 5 +----
 src/models/response/errorResponse.ts               | 5 +----
 src/models/response/folderResponse.ts              | 5 +----
 src/models/response/globalDomainResponse.ts        | 5 +----
 src/models/response/identityTokenResponse.ts       | 5 +----
 src/models/response/keysResponse.ts                | 5 +----
 src/models/response/listResponse.ts                | 5 +----
 src/models/response/profileOrganizationResponse.ts | 5 +----
 src/models/response/profileResponse.ts             | 5 +----
 src/models/response/syncResponse.ts                | 5 +----
 41 files changed, 41 insertions(+), 164 deletions(-)

diff --git a/src/models/data/attachmentData.ts b/src/models/data/attachmentData.ts
index 2ff3ab423c..85aa452e1e 100644
--- a/src/models/data/attachmentData.ts
+++ b/src/models/data/attachmentData.ts
@@ -1,6 +1,6 @@
 import { AttachmentResponse } from '../response/attachmentResponse';
 
-class AttachmentData {
+export class AttachmentData {
     id: string;
     url: string;
     fileName: string;
@@ -15,6 +15,3 @@ class AttachmentData {
         this.sizeName = response.sizeName;
     }
 }
-
-export { AttachmentData };
-(window as any).AttachmentData = AttachmentData;
diff --git a/src/models/data/cardData.ts b/src/models/data/cardData.ts
index f0b9f63f2e..238621c72a 100644
--- a/src/models/data/cardData.ts
+++ b/src/models/data/cardData.ts
@@ -1,4 +1,4 @@
-class CardData {
+export class CardData {
     cardholderName: string;
     brand: string;
     number: string;
@@ -15,6 +15,3 @@ class CardData {
         this.code = data.Code;
     }
 }
-
-export { CardData };
-(window as any).CardData = CardData;
diff --git a/src/models/data/cipherData.ts b/src/models/data/cipherData.ts
index a0917ed314..0a4f83c520 100644
--- a/src/models/data/cipherData.ts
+++ b/src/models/data/cipherData.ts
@@ -9,7 +9,7 @@ import { SecureNoteData } from './secureNoteData';
 
 import { CipherResponse } from '../response/cipherResponse';
 
-class CipherData {
+export class CipherData {
     id: string;
     organizationId: string;
     folderId: string;
@@ -82,6 +82,3 @@ class CipherData {
         }
     }
 }
-
-export { CipherData };
-(window as any).CipherData = CipherData;
diff --git a/src/models/data/collectionData.ts b/src/models/data/collectionData.ts
index f2d5fc9f03..3b05b9af22 100644
--- a/src/models/data/collectionData.ts
+++ b/src/models/data/collectionData.ts
@@ -1,6 +1,6 @@
 import { CollectionResponse } from '../response/collectionResponse';
 
-class CollectionData {
+export class CollectionData {
     id: string;
     organizationId: string;
     name: string;
@@ -11,6 +11,3 @@ class CollectionData {
         this.name = response.name;
     }
 }
-
-export { CollectionData };
-(window as any).CollectionData = CollectionData;
diff --git a/src/models/data/fieldData.ts b/src/models/data/fieldData.ts
index 920d1c56fa..cd0fb2c42b 100644
--- a/src/models/data/fieldData.ts
+++ b/src/models/data/fieldData.ts
@@ -1,6 +1,6 @@
 import { FieldType } from '../../enums/fieldType';
 
-class FieldData {
+export class FieldData {
     type: FieldType;
     name: string;
     value: string;
@@ -11,6 +11,3 @@ class FieldData {
         this.value = response.Value;
     }
 }
-
-export { FieldData };
-(window as any).FieldData = FieldData;
diff --git a/src/models/data/folderData.ts b/src/models/data/folderData.ts
index 6f03781cc7..509267c9d4 100644
--- a/src/models/data/folderData.ts
+++ b/src/models/data/folderData.ts
@@ -1,6 +1,6 @@
 import { FolderResponse } from '../response/folderResponse';
 
-class FolderData {
+export class FolderData {
     id: string;
     userId: string;
     name: string;
@@ -13,6 +13,3 @@ class FolderData {
         this.revisionDate = response.revisionDate;
     }
 }
-
-export { FolderData };
-(window as any).FolderData = FolderData;
diff --git a/src/models/data/identityData.ts b/src/models/data/identityData.ts
index ee849166ee..34f2099595 100644
--- a/src/models/data/identityData.ts
+++ b/src/models/data/identityData.ts
@@ -1,4 +1,4 @@
-class IdentityData {
+export class IdentityData {
     title: string;
     firstName: string;
     middleName: string;
@@ -39,6 +39,3 @@ class IdentityData {
         this.licenseNumber = data.LicenseNumber;
     }
 }
-
-export { IdentityData };
-(window as any).IdentityData = IdentityData;
diff --git a/src/models/data/loginData.ts b/src/models/data/loginData.ts
index de0aecc133..2052a7a889 100644
--- a/src/models/data/loginData.ts
+++ b/src/models/data/loginData.ts
@@ -1,4 +1,4 @@
-class LoginData {
+export class LoginData {
     uri: string;
     username: string;
     password: string;
@@ -11,6 +11,3 @@ class LoginData {
         this.totp = data.Totp;
     }
 }
-
-export { LoginData };
-(window as any).LoginData = LoginData;
diff --git a/src/models/data/secureNoteData.ts b/src/models/data/secureNoteData.ts
index bf861a4a60..4b27125a13 100644
--- a/src/models/data/secureNoteData.ts
+++ b/src/models/data/secureNoteData.ts
@@ -1,12 +1,9 @@
 import { SecureNoteType } from '../../enums/secureNoteType';
 
-class SecureNoteData {
+export class SecureNoteData {
     type: SecureNoteType;
 
     constructor(data: any) {
         this.type = data.Type;
     }
 }
-
-export { SecureNoteData };
-(window as any).SecureNoteData = SecureNoteData;
diff --git a/src/models/domain/attachment.ts b/src/models/domain/attachment.ts
index d77152b007..28859be366 100644
--- a/src/models/domain/attachment.ts
+++ b/src/models/domain/attachment.ts
@@ -3,7 +3,7 @@ import { AttachmentData } from '../data/attachmentData';
 import { CipherString } from './cipherString';
 import Domain from './domain';
 
-class Attachment extends Domain {
+export class Attachment extends Domain {
     id: string;
     url: string;
     size: number;
@@ -38,6 +38,3 @@ class Attachment extends Domain {
         }, orgId);
     }
 }
-
-export { Attachment };
-(window as any).Attachment = Attachment;
diff --git a/src/models/domain/card.ts b/src/models/domain/card.ts
index 3e42f7affb..ee6fbd0616 100644
--- a/src/models/domain/card.ts
+++ b/src/models/domain/card.ts
@@ -3,7 +3,7 @@ import { CardData } from '../data/cardData';
 import { CipherString } from './cipherString';
 import Domain from './domain';
 
-class Card extends Domain {
+export class Card extends Domain {
     cardholderName: CipherString;
     brand: CipherString;
     number: CipherString;
@@ -38,6 +38,3 @@ class Card extends Domain {
         }, orgId);
     }
 }
-
-export { Card };
-(window as any).Card = Card;
diff --git a/src/models/domain/cipher.ts b/src/models/domain/cipher.ts
index cae31fb260..9dfbafdac0 100644
--- a/src/models/domain/cipher.ts
+++ b/src/models/domain/cipher.ts
@@ -13,7 +13,7 @@ import { Identity } from './identity';
 import { Login } from './login';
 import { SecureNote } from './secureNote';
 
-class Cipher extends Domain {
+export class Cipher extends Domain {
     id: string;
     organizationId: string;
     folderId: string;
@@ -187,6 +187,3 @@ class Cipher extends Domain {
         return model;
     }
 }
-
-export { Cipher };
-(window as any).Cipher = Cipher;
diff --git a/src/models/domain/cipherString.ts b/src/models/domain/cipherString.ts
index 2a5890e5a6..d19d191065 100644
--- a/src/models/domain/cipherString.ts
+++ b/src/models/domain/cipherString.ts
@@ -2,7 +2,7 @@ import { EncryptionType } from '../../enums/encryptionType';
 
 import { CryptoService } from '../../abstractions/crypto.service';
 
-class CipherString {
+export class CipherString {
     encryptedString?: string;
     encryptionType?: EncryptionType;
     decryptedValue?: string;
@@ -111,6 +111,3 @@ class CipherString {
         });
     }
 }
-
-export { CipherString };
-(window as any).CipherString = CipherString;
diff --git a/src/models/domain/collection.ts b/src/models/domain/collection.ts
index 0a5079e53a..4857ec2c44 100644
--- a/src/models/domain/collection.ts
+++ b/src/models/domain/collection.ts
@@ -3,7 +3,7 @@ import { CollectionData } from '../data/collectionData';
 import { CipherString } from './cipherString';
 import Domain from './domain';
 
-class Collection extends Domain {
+export class Collection extends Domain {
     id: string;
     organizationId: string;
     name: CipherString;
@@ -32,6 +32,3 @@ class Collection extends Domain {
         }, this.organizationId);
     }
 }
-
-export { Collection };
-(window as any).Collection = Collection;
diff --git a/src/models/domain/field.ts b/src/models/domain/field.ts
index c806e2dd12..d118ad2463 100644
--- a/src/models/domain/field.ts
+++ b/src/models/domain/field.ts
@@ -5,7 +5,7 @@ import { FieldData } from '../data/fieldData';
 import { CipherString } from './cipherString';
 import Domain from './domain';
 
-class Field extends Domain {
+export class Field extends Domain {
     name: CipherString;
     vault: CipherString;
     type: FieldType;
@@ -34,6 +34,3 @@ class Field extends Domain {
         }, orgId);
     }
 }
-
-export { Field };
-(window as any).Field = Field;
diff --git a/src/models/domain/folder.ts b/src/models/domain/folder.ts
index 180cd44e4f..f25d1f8314 100644
--- a/src/models/domain/folder.ts
+++ b/src/models/domain/folder.ts
@@ -3,7 +3,7 @@ import { FolderData } from '../data/folderData';
 import { CipherString } from './cipherString';
 import Domain from './domain';
 
-class Folder extends Domain {
+export class Folder extends Domain {
     id: string;
     name: CipherString;
 
@@ -29,6 +29,3 @@ class Folder extends Domain {
         }, null);
     }
 }
-
-export { Folder };
-(window as any).Folder = Folder;
diff --git a/src/models/domain/identity.ts b/src/models/domain/identity.ts
index ede933ac30..2b8323e113 100644
--- a/src/models/domain/identity.ts
+++ b/src/models/domain/identity.ts
@@ -3,7 +3,7 @@ import { IdentityData } from '../data/identityData';
 import { CipherString } from './cipherString';
 import Domain from './domain';
 
-class Identity extends Domain {
+export class Identity extends Domain {
     title: CipherString;
     firstName: CipherString;
     middleName: CipherString;
@@ -74,6 +74,3 @@ class Identity extends Domain {
         }, orgId);
     }
 }
-
-export { Identity };
-(window as any).Identity = Identity;
diff --git a/src/models/domain/login.ts b/src/models/domain/login.ts
index 8ed1e1f7c7..5d0f50c378 100644
--- a/src/models/domain/login.ts
+++ b/src/models/domain/login.ts
@@ -3,7 +3,7 @@ import { LoginData } from '../data/loginData';
 import { CipherString } from './cipherString';
 import Domain from './domain';
 
-class Login extends Domain {
+export class Login extends Domain {
     uri: CipherString;
     username: CipherString;
     password: CipherString;
@@ -32,6 +32,3 @@ class Login extends Domain {
         }, orgId);
     }
 }
-
-export { Login };
-(window as any).Login = Login;
diff --git a/src/models/domain/secureNote.ts b/src/models/domain/secureNote.ts
index 46609a5b70..8feb7de3ad 100644
--- a/src/models/domain/secureNote.ts
+++ b/src/models/domain/secureNote.ts
@@ -4,7 +4,7 @@ import { SecureNoteData } from '../data/secureNoteData';
 
 import Domain from './domain';
 
-class SecureNote extends Domain {
+export class SecureNote extends Domain {
     type: SecureNoteType;
 
     constructor(obj?: SecureNoteData, alreadyEncrypted: boolean = false) {
@@ -22,6 +22,3 @@ class SecureNote extends Domain {
         };
     }
 }
-
-export { SecureNote };
-(window as any).SecureNote = SecureNote;
diff --git a/src/models/request/cipherRequest.ts b/src/models/request/cipherRequest.ts
index 4829b20d27..232883f323 100644
--- a/src/models/request/cipherRequest.ts
+++ b/src/models/request/cipherRequest.ts
@@ -1,6 +1,6 @@
 import { CipherType } from '../../enums/cipherType';
 
-class CipherRequest {
+export class CipherRequest {
     type: CipherType;
     folderId: string;
     organizationId: string;
@@ -84,6 +84,3 @@ class CipherRequest {
         }
     }
 }
-
-export { CipherRequest };
-(window as any).CipherRequest = CipherRequest;
diff --git a/src/models/request/deviceRequest.ts b/src/models/request/deviceRequest.ts
index 5aaec5c77e..2aaa42cbe0 100644
--- a/src/models/request/deviceRequest.ts
+++ b/src/models/request/deviceRequest.ts
@@ -2,7 +2,7 @@ import { DeviceType } from '../../enums/deviceType';
 
 import { PlatformUtilsService } from '../../abstractions/platformUtils.service';
 
-class DeviceRequest {
+export class DeviceRequest {
     type: DeviceType;
     name: string;
     identifier: string;
@@ -15,6 +15,3 @@ class DeviceRequest {
         this.pushToken = null;
     }
 }
-
-export { DeviceRequest };
-(window as any).DeviceRequest = DeviceRequest;
diff --git a/src/models/request/deviceTokenRequest.ts b/src/models/request/deviceTokenRequest.ts
index 69ef20bb9a..5d663f6096 100644
--- a/src/models/request/deviceTokenRequest.ts
+++ b/src/models/request/deviceTokenRequest.ts
@@ -1,10 +1,7 @@
-class DeviceTokenRequest {
+export class DeviceTokenRequest {
     pushToken: string;
 
     constructor() {
         this.pushToken = null;
     }
 }
-
-export { DeviceTokenRequest };
-(window as any).DeviceTokenRequest = DeviceTokenRequest;
diff --git a/src/models/request/folderRequest.ts b/src/models/request/folderRequest.ts
index 7ff9794b18..54ec76cac5 100644
--- a/src/models/request/folderRequest.ts
+++ b/src/models/request/folderRequest.ts
@@ -1,12 +1,9 @@
 import { Folder } from '../domain/folder';
 
-class FolderRequest {
+export class FolderRequest {
     name: string;
 
     constructor(folder: Folder) {
         this.name = folder.name ? folder.name.encryptedString : null;
     }
 }
-
-export { FolderRequest };
-(window as any).FolderRequest = FolderRequest;
diff --git a/src/models/request/passwordHintRequest.ts b/src/models/request/passwordHintRequest.ts
index 4feb92944b..35b37f4f36 100644
--- a/src/models/request/passwordHintRequest.ts
+++ b/src/models/request/passwordHintRequest.ts
@@ -1,10 +1,7 @@
-class PasswordHintRequest {
+export class PasswordHintRequest {
     email: string;
 
     constructor(email: string) {
         this.email = email;
     }
 }
-
-export { PasswordHintRequest };
-(window as any).PasswordHintRequest = PasswordHintRequest;
diff --git a/src/models/request/registerRequest.ts b/src/models/request/registerRequest.ts
index 4b80fb7884..fc815d5bb7 100644
--- a/src/models/request/registerRequest.ts
+++ b/src/models/request/registerRequest.ts
@@ -1,4 +1,4 @@
-class RegisterRequest {
+export class RegisterRequest {
     name: string;
     email: string;
     masterPasswordHash: string;
@@ -13,6 +13,3 @@ class RegisterRequest {
         this.key = key;
     }
 }
-
-export { RegisterRequest };
-(window as any).RegisterRequest = RegisterRequest;
diff --git a/src/models/request/tokenRequest.ts b/src/models/request/tokenRequest.ts
index 4cf7564615..6cce0f23b0 100644
--- a/src/models/request/tokenRequest.ts
+++ b/src/models/request/tokenRequest.ts
@@ -1,6 +1,6 @@
 import { DeviceRequest } from './deviceRequest';
 
-class TokenRequest {
+export class TokenRequest {
     email: string;
     masterPasswordHash: string;
     token: string;
@@ -44,6 +44,3 @@ class TokenRequest {
         return obj;
     }
 }
-
-export { TokenRequest };
-(window as any).TokenRequest = TokenRequest;
diff --git a/src/models/request/twoFactorEmailRequest.ts b/src/models/request/twoFactorEmailRequest.ts
index d540b08ecf..b506ccfa43 100644
--- a/src/models/request/twoFactorEmailRequest.ts
+++ b/src/models/request/twoFactorEmailRequest.ts
@@ -1,4 +1,4 @@
-class TwoFactorEmailRequest {
+export class TwoFactorEmailRequest {
     email: string;
     masterPasswordHash: string;
 
@@ -7,6 +7,3 @@ class TwoFactorEmailRequest {
         this.masterPasswordHash = masterPasswordHash;
     }
 }
-
-export { TwoFactorEmailRequest };
-(window as any).TwoFactorEmailRequest = TwoFactorEmailRequest;
diff --git a/src/models/response/attachmentResponse.ts b/src/models/response/attachmentResponse.ts
index df5138650c..1ad530bd6d 100644
--- a/src/models/response/attachmentResponse.ts
+++ b/src/models/response/attachmentResponse.ts
@@ -1,4 +1,4 @@
-class AttachmentResponse {
+export class AttachmentResponse {
     id: string;
     url: string;
     fileName: string;
@@ -13,6 +13,3 @@ class AttachmentResponse {
         this.sizeName = response.SizeName;
     }
 }
-
-export { AttachmentResponse };
-(window as any).AttachmentResponse = AttachmentResponse;
diff --git a/src/models/response/cipherResponse.ts b/src/models/response/cipherResponse.ts
index b2e597e23a..241b8530a0 100644
--- a/src/models/response/cipherResponse.ts
+++ b/src/models/response/cipherResponse.ts
@@ -1,6 +1,6 @@
 import { AttachmentResponse } from './attachmentResponse';
 
-class CipherResponse {
+export class CipherResponse {
     id: string;
     organizationId: string;
     folderId: string;
@@ -39,6 +39,3 @@ class CipherResponse {
         }
     }
 }
-
-export { CipherResponse };
-(window as any).CipherResponse = CipherResponse;
diff --git a/src/models/response/collectionResponse.ts b/src/models/response/collectionResponse.ts
index 8b0247720d..77b80f57ca 100644
--- a/src/models/response/collectionResponse.ts
+++ b/src/models/response/collectionResponse.ts
@@ -1,4 +1,4 @@
-class CollectionResponse {
+export class CollectionResponse {
     id: string;
     organizationId: string;
     name: string;
@@ -9,6 +9,3 @@ class CollectionResponse {
         this.name = response.Name;
     }
 }
-
-export { CollectionResponse };
-(window as any).CollectionResponse = CollectionResponse;
diff --git a/src/models/response/deviceResponse.ts b/src/models/response/deviceResponse.ts
index 5e76635d16..23d0135b76 100644
--- a/src/models/response/deviceResponse.ts
+++ b/src/models/response/deviceResponse.ts
@@ -1,6 +1,6 @@
 import { DeviceType } from '../../enums/deviceType';
 
-class DeviceResponse {
+export class DeviceResponse {
     id: string;
     name: number;
     identifier: string;
@@ -15,6 +15,3 @@ class DeviceResponse {
         this.creationDate = response.CreationDate;
     }
 }
-
-export { DeviceResponse };
-(window as any).DeviceResponse = DeviceResponse;
diff --git a/src/models/response/domainsResponse.ts b/src/models/response/domainsResponse.ts
index d65077147b..11ecfe1fbc 100644
--- a/src/models/response/domainsResponse.ts
+++ b/src/models/response/domainsResponse.ts
@@ -1,6 +1,6 @@
 import { GlobalDomainResponse } from './globalDomainResponse';
 
-class DomainsResponse {
+export class DomainsResponse {
     equivalentDomains: string[][];
     globalEquivalentDomains: GlobalDomainResponse[] = [];
 
@@ -15,6 +15,3 @@ class DomainsResponse {
         }
     }
 }
-
-export { DomainsResponse };
-(window as any).DomainsResponse = DomainsResponse;
diff --git a/src/models/response/errorResponse.ts b/src/models/response/errorResponse.ts
index 4d976932cd..4297427711 100644
--- a/src/models/response/errorResponse.ts
+++ b/src/models/response/errorResponse.ts
@@ -1,4 +1,4 @@
-class ErrorResponse {
+export class ErrorResponse {
     message: string;
     validationErrors: { [key: string]: string[]; };
     statusCode: number;
@@ -32,6 +32,3 @@ class ErrorResponse {
         return this.message;
     }
 }
-
-export { ErrorResponse };
-(window as any).ErrorResponse = ErrorResponse;
diff --git a/src/models/response/folderResponse.ts b/src/models/response/folderResponse.ts
index c5ff0ada70..1e3b4570cc 100644
--- a/src/models/response/folderResponse.ts
+++ b/src/models/response/folderResponse.ts
@@ -1,4 +1,4 @@
-class FolderResponse {
+export class FolderResponse {
     id: string;
     name: string;
     revisionDate: string;
@@ -9,6 +9,3 @@ class FolderResponse {
         this.revisionDate = response.RevisionDate;
     }
 }
-
-export { FolderResponse };
-(window as any).FolderResponse = FolderResponse;
diff --git a/src/models/response/globalDomainResponse.ts b/src/models/response/globalDomainResponse.ts
index 8e9a45df11..75f5e4ce61 100644
--- a/src/models/response/globalDomainResponse.ts
+++ b/src/models/response/globalDomainResponse.ts
@@ -1,4 +1,4 @@
-class GlobalDomainResponse {
+export class GlobalDomainResponse {
     type: number;
     domains: string[];
     excluded: number[];
@@ -9,6 +9,3 @@ class GlobalDomainResponse {
         this.excluded = response.Excluded;
     }
 }
-
-export { GlobalDomainResponse };
-(window as any).GlobalDomainResponse = GlobalDomainResponse;
diff --git a/src/models/response/identityTokenResponse.ts b/src/models/response/identityTokenResponse.ts
index 2d188707c0..2252c76c91 100644
--- a/src/models/response/identityTokenResponse.ts
+++ b/src/models/response/identityTokenResponse.ts
@@ -1,4 +1,4 @@
-class IdentityTokenResponse {
+export class IdentityTokenResponse {
     accessToken: string;
     expiresIn: number;
     refreshToken: string;
@@ -19,6 +19,3 @@ class IdentityTokenResponse {
         this.twoFactorToken = response.TwoFactorToken;
     }
 }
-
-export { IdentityTokenResponse };
-(window as any).IdentityTokenResponse = IdentityTokenResponse;
diff --git a/src/models/response/keysResponse.ts b/src/models/response/keysResponse.ts
index cb96dad51e..a357f97c44 100644
--- a/src/models/response/keysResponse.ts
+++ b/src/models/response/keysResponse.ts
@@ -1,4 +1,4 @@
-class KeysResponse {
+export class KeysResponse {
     privateKey: string;
     publicKey: string;
 
@@ -7,6 +7,3 @@ class KeysResponse {
         this.publicKey = response.PublicKey;
     }
 }
-
-export { KeysResponse };
-(window as any).KeysResponse = KeysResponse;
diff --git a/src/models/response/listResponse.ts b/src/models/response/listResponse.ts
index 9cf5455ada..4a9715c39c 100644
--- a/src/models/response/listResponse.ts
+++ b/src/models/response/listResponse.ts
@@ -1,10 +1,7 @@
-class ListResponse {
+export class ListResponse {
     data: any;
 
     constructor(data: any) {
         this.data = data;
     }
 }
-
-export { ListResponse };
-(window as any).ListResponse = ListResponse;
diff --git a/src/models/response/profileOrganizationResponse.ts b/src/models/response/profileOrganizationResponse.ts
index 484857745a..05b2b980b5 100644
--- a/src/models/response/profileOrganizationResponse.ts
+++ b/src/models/response/profileOrganizationResponse.ts
@@ -1,4 +1,4 @@
-class ProfileOrganizationResponse {
+export class ProfileOrganizationResponse {
     id: string;
     name: string;
     useGroups: boolean;
@@ -25,6 +25,3 @@ class ProfileOrganizationResponse {
         this.type = response.Type;
     }
 }
-
-export { ProfileOrganizationResponse };
-(window as any).ProfileOrganizationResponse = ProfileOrganizationResponse;
diff --git a/src/models/response/profileResponse.ts b/src/models/response/profileResponse.ts
index 69e4f3e9cb..c9d2d3d221 100644
--- a/src/models/response/profileResponse.ts
+++ b/src/models/response/profileResponse.ts
@@ -1,6 +1,6 @@
 import { ProfileOrganizationResponse } from './profileOrganizationResponse';
 
-class ProfileResponse {
+export class ProfileResponse {
     id: string;
     name: string;
     email: string;
@@ -34,6 +34,3 @@ class ProfileResponse {
         }
     }
 }
-
-export { ProfileResponse };
-(window as any).ProfileResponse = ProfileResponse;
diff --git a/src/models/response/syncResponse.ts b/src/models/response/syncResponse.ts
index 8acdc5202d..58c0280739 100644
--- a/src/models/response/syncResponse.ts
+++ b/src/models/response/syncResponse.ts
@@ -4,7 +4,7 @@ import { DomainsResponse } from './domainsResponse';
 import { FolderResponse } from './folderResponse';
 import { ProfileResponse } from './profileResponse';
 
-class SyncResponse {
+export class SyncResponse {
     profile?: ProfileResponse;
     folders: FolderResponse[] = [];
     collections: CollectionResponse[] = [];
@@ -39,6 +39,3 @@ class SyncResponse {
         }
     }
 }
-
-export { SyncResponse };
-(window as any).SyncResponse = SyncResponse;