From 7e9b7398c8564b197c149781a543b105481b2b9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Filipe=20da=20Silva=20Bispo?=
 <andrefsbispo@hotmail.com>
Date: Tue, 24 May 2022 15:09:24 +0100
Subject: [PATCH] PS-90: App keeps asking for 2FA even though I've checked the
 "remember me" checkbox (#1921)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Logout was removing the 2FA token, portion of code deleted.
- Clear saved token when 2FA error is returned by the server.

Co-authored-by: André Bispo <abispo@bitwarden.com>
---
 src/Core/Services/AuthService.cs  | 1 +
 src/Core/Services/StateService.cs | 4 ----
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/Core/Services/AuthService.cs b/src/Core/Services/AuthService.cs
index 3e6517f82..c1fb38fa8 100644
--- a/src/Core/Services/AuthService.cs
+++ b/src/Core/Services/AuthService.cs
@@ -346,6 +346,7 @@ namespace Bit.Core.Services
                 TwoFactorProvidersData = response.TwoFactorResponse.TwoFactorProviders2;
                 result.TwoFactorProviders = response.TwoFactorResponse.TwoFactorProviders2;
                 CaptchaToken = response.TwoFactorResponse.CaptchaToken;
+                await _tokenService.ClearTwoFactorTokenAsync(email);
                 return result;
             }
 
diff --git a/src/Core/Services/StateService.cs b/src/Core/Services/StateService.cs
index ea70d64e7..23d8de670 100644
--- a/src/Core/Services/StateService.cs
+++ b/src/Core/Services/StateService.cs
@@ -1372,10 +1372,6 @@ namespace Bit.Core.Services
             await SetEncryptedPasswordGenerationHistoryAsync(null, userId);
             await SetEncryptedSendsAsync(null, userId);
             await SetSettingsAsync(null, userId);
-            if (!string.IsNullOrWhiteSpace(email))
-            {
-                await SetTwoFactorTokenAsync(null, email);
-            }
 
             if (userInitiated)
             {