tslint fixes

src/models/domain/encryptedObject.ts

@@ -0,0 +1,8 @@
+import SymmetricCryptoKey from './symmetricCryptoKey';
+
+export default class EncryptedObject {
+    iv: Uint8Array;
+    ct: Uint8Array;
+    mac: Uint8Array;
+    key: SymmetricCryptoKey;
+}

src/models/domain/symmetricCryptoKey.ts

@@ -1,5 +1,7 @@
 import { EncryptionType } from '../../enums/encryptionType.enum';
 
+import SymmetricCryptoKeyBuffers from './symmetricCryptoKeyBuffers';
+
 import UtilsService from '../../services/utils.service';
 
 export default class SymmetricCryptoKey {
@@ -11,27 +13,25 @@ export default class SymmetricCryptoKey {
     keyBuf: SymmetricCryptoKeyBuffers;
 
     constructor(keyBytes: string, b64KeyBytes?: boolean, encType?: EncryptionType) {
-        let win = (window as any);
-
         if (b64KeyBytes) {
-            keyBytes = win.forge.util.decode64(keyBytes);
+            keyBytes = forge.util.decode64(keyBytes);
         }
 
         if (!keyBytes) {
             throw new Error('Must provide keyBytes');
         }
 
-        let buffer = win.forge.util.createBuffer(keyBytes);
+        const buffer = forge.util.createBuffer(keyBytes);
         if (!buffer || buffer.length() === 0) {
             throw new Error('Couldn\'t make buffer');
         }
 
-        let bufferLength: number = buffer.length();
+        const bufferLength: number = buffer.length();
 
         if (encType == null) {
-            if (bufferLength == 32) {
+            if (bufferLength === 32) {
                 encType = EncryptionType.AesCbc256_B64;
-            } else if (bufferLength == 64) {
+            } else if (bufferLength === 64) {
                 encType = EncryptionType.AesCbc256_HmacSha256_B64;
             } else {
                 throw new Error('Unable to determine encType.');
@@ -39,7 +39,7 @@ export default class SymmetricCryptoKey {
         }
 
         this.key = keyBytes;
-        this.keyB64 = win.forge.util.encode64(keyBytes);
+        this.keyB64 = forge.util.encode64(keyBytes);
         this.encType = encType;
 
         if (encType === EncryptionType.AesCbc256_B64 && bufferLength === 32) {
@@ -62,7 +62,7 @@ export default class SymmetricCryptoKey {
         }
 
         const key = UtilsService.fromB64ToArray(this.keyB64);
-        let keys = new SymmetricCryptoKeyBuffers(key.buffer);
+        const keys = new SymmetricCryptoKeyBuffers(key.buffer);
 
         if (this.macKey) {
             keys.encKey = key.slice(0, key.length / 2).buffer;
@@ -76,13 +76,3 @@ export default class SymmetricCryptoKey {
         return this.keyBuf;
     }
 }
-
-class SymmetricCryptoKeyBuffers {
-    key: ArrayBuffer;
-    encKey?: ArrayBuffer;
-    macKey?: ArrayBuffer;
-
-    constructor(key: ArrayBuffer) {
-        this.key = key;
-    }
-}

src/models/domain/symmetricCryptoKeyBuffers.ts

@@ -0,0 +1,9 @@
+export default class SymmetricCryptoKeyBuffers {
+    key: ArrayBuffer;
+    encKey?: ArrayBuffer;
+    macKey?: ArrayBuffer;
+
+    constructor(key: ArrayBuffer) {
+        this.key = key;
+    }
+}