From 54b4154c022eead93b2277f0ddb5b75ec12a863b Mon Sep 17 00:00:00 2001
From: Thomas Rittson <trittson@bitwarden.com>
Date: Mon, 20 Dec 2021 14:15:53 +1000
Subject: [PATCH] Make authResult.twoFactor a getter

---
 common/src/models/domain/authResult.ts    |  3 +--
 common/src/services/auth.service.ts       | 10 ++++------
 spec/common/services/auth.service.spec.ts |  2 --
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/common/src/models/domain/authResult.ts b/common/src/models/domain/authResult.ts
index 50b70f72..bba3f7f3 100644
--- a/common/src/models/domain/authResult.ts
+++ b/common/src/models/domain/authResult.ts
@@ -3,7 +3,6 @@ import { TwoFactorProviderType } from "../../enums/twoFactorProviderType";
 import { Utils } from "../../misc/utils";
 
 export class AuthResult {
-  twoFactor: boolean = false;
   captchaSiteKey: string = "";
   resetMasterPassword: boolean = false;
   forcePasswordReset: boolean = false;
@@ -14,6 +13,6 @@ export class AuthResult {
   }
 
   get requiresTwoFactor() {
-    return this.twoFactor;
+    return this.twoFactorProviders != null;
   }
 }
diff --git a/common/src/services/auth.service.ts b/common/src/services/auth.service.ts
index 36199416..5f4fb9f3 100644
--- a/common/src/services/auth.service.ts
+++ b/common/src/services/auth.service.ts
@@ -94,7 +94,7 @@ export class AuthService implements AuthServiceAbstraction {
       return result;
     }
 
-    if (result.twoFactor) {
+    if (result.requiresTwoFactor) {
       this.saveState(tokenRequest, result.twoFactorProviders, localHashedPassword, key);
       return result;
     }
@@ -140,7 +140,7 @@ export class AuthService implements AuthServiceAbstraction {
       return result;
     }
 
-    if (result.twoFactor) {
+    if (result.requiresTwoFactor) {
       this.saveState(tokenRequest, result.twoFactorProviders);
       return result;
     }
@@ -191,7 +191,7 @@ export class AuthService implements AuthServiceAbstraction {
       return result;
     }
 
-    if (result.twoFactor) {
+    if (result.requiresTwoFactor) {
       this.saveState(tokenRequest, result.twoFactorProviders);
       return result;
     }
@@ -274,10 +274,8 @@ export class AuthService implements AuthServiceAbstraction {
       return result;
     }
 
-    const twoFactorResponse = response as IdentityTwoFactorResponse;
-    result.twoFactor = twoFactorResponse.twoFactorProviders2 != null;
+    result.twoFactorProviders = (response as IdentityTwoFactorResponse).twoFactorProviders2;
     if (result.requiresTwoFactor) {
-      result.twoFactorProviders = twoFactorResponse.twoFactorProviders2;
       return result;
     }
 
diff --git a/spec/common/services/auth.service.spec.ts b/spec/common/services/auth.service.spec.ts
index a0c205ee..127bb209 100644
--- a/spec/common/services/auth.service.spec.ts
+++ b/spec/common/services/auth.service.spec.ts
@@ -172,7 +172,6 @@ describe("Cipher Service", () => {
     const expected = new AuthResult();
     expected.forcePasswordReset = false;
     expected.resetMasterPassword = false;
-    expected.twoFactor = false;
     expected.twoFactorProviders = null;
     expected.captchaSiteKey = undefined;
     return expected;
@@ -311,7 +310,6 @@ describe("Cipher Service", () => {
     apiService.postIdentityToken(Arg.any()).resolves(tokenResponse);
 
     const expected = new AuthResult();
-    expected.twoFactor = true;
     expected.twoFactorProviders = twoFactorProviders;
     expected.captchaSiteKey = undefined;