From 2730e04a0571a7cfa2455309ab641c1180c96df8 Mon Sep 17 00:00:00 2001
From: Matt Gibson <mgibson@bitwarden.com>
Date: Mon, 8 Feb 2021 14:11:44 -0600
Subject: [PATCH] Match tslint rules (#264)

---
 .../importers/onepasswordMacCsvImporter.spec.ts      |  2 +-
 .../importers/onepasswordWinCsvImporter.spec.ts      |  6 +++---
 spec/common/services/consoleLog.service.spec.ts      |  2 +-
 spec/common/services/export.service.spec.ts          |  4 ++--
 src/angular/components/sso.component.ts              |  2 +-
 tslint.json                                          | 12 ++++++++++++
 6 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/spec/common/importers/onepasswordMacCsvImporter.spec.ts b/spec/common/importers/onepasswordMacCsvImporter.spec.ts
index 4cc270f492..748a2623d2 100644
--- a/spec/common/importers/onepasswordMacCsvImporter.spec.ts
+++ b/spec/common/importers/onepasswordMacCsvImporter.spec.ts
@@ -17,7 +17,7 @@ function expectIdentity(cipher: CipherView) {
         username: 'userNam3',
         company: 'bitwarden',
         phone: '8005555555',
-        email: 'email@bitwarden.com'
+        email: 'email@bitwarden.com',
     }));
 
     expect(cipher.notes).toContain('address\ncity state zip\nUnited States');
diff --git a/spec/common/importers/onepasswordWinCsvImporter.spec.ts b/spec/common/importers/onepasswordWinCsvImporter.spec.ts
index a456d0bbd1..19e6026d2f 100644
--- a/spec/common/importers/onepasswordWinCsvImporter.spec.ts
+++ b/spec/common/importers/onepasswordWinCsvImporter.spec.ts
@@ -18,15 +18,15 @@ function expectIdentity(cipher: CipherView) {
         username: 'userNam3',
         company: 'bitwarden',
         phone: '8005555555',
-        email: 'email@bitwarden.com'
+        email: 'email@bitwarden.com',
     }));
 
     expect(cipher.fields).toEqual(jasmine.arrayContaining([
         Object.assign(new FieldView(), {
             type: FieldType.Text,
             name: 'address',
-            value: 'address city state zip us'
-        })
+            value: 'address city state zip us',
+        }),
     ]));
 }
 
diff --git a/spec/common/services/consoleLog.service.spec.ts b/spec/common/services/consoleLog.service.spec.ts
index 2aa062418b..57cb8a3e9b 100644
--- a/spec/common/services/consoleLog.service.spec.ts
+++ b/spec/common/services/consoleLog.service.spec.ts
@@ -18,7 +18,7 @@ export function interceptConsole(interceptions: any): object {
         // tslint:disable-next-line
         error: function () {
             interceptions.error = arguments;
-        }
+        },
     };
     return interceptions;
 }
diff --git a/spec/common/services/export.service.spec.ts b/spec/common/services/export.service.spec.ts
index 4cbcf2831a..dd209e8b3d 100644
--- a/spec/common/services/export.service.spec.ts
+++ b/spec/common/services/export.service.spec.ts
@@ -20,13 +20,13 @@ import { BuildTestObject, GetUniqueString } from '../../utils';
 const UserCipherViews = [
     generateCipherView(false),
     generateCipherView(false),
-    generateCipherView(true)
+    generateCipherView(true),
 ];
 
 const UserCipherDomains = [
     generateCipherDomain(false),
     generateCipherDomain(false),
-    generateCipherDomain(true)
+    generateCipherDomain(true),
 ];
 
 function generateCipherView(deleted: boolean) {
diff --git a/src/angular/components/sso.component.ts b/src/angular/components/sso.component.ts
index 7fbdb37211..94f44040de 100644
--- a/src/angular/components/sso.component.ts
+++ b/src/angular/components/sso.component.ts
@@ -145,7 +145,7 @@ export class SsoComponent {
                     this.router.navigate([this.twoFactorRoute], {
                         queryParams: {
                             identifier: orgIdFromState,
-                            sso: 'true'
+                            sso: 'true',
                         },
                     });
                 }
diff --git a/tslint.json b/tslint.json
index 76f1843ee8..d0c32a3677 100644
--- a/tslint.json
+++ b/tslint.json
@@ -59,6 +59,18 @@
     "semicolon": [
       true,
       "always"
+    ],
+    "trailing-comma": [
+      true,
+      {
+        "multiline": {
+          "objects": "always",
+          "arrays": "always",
+          "functions": "ignore",
+          "typeLiterals": "ignore"
+        },
+        "singleline": "never"
+      }
     ]
   }
 }