From 9201da85153640a2e4b390b6656ab727b466cad9 Mon Sep 17 00:00:00 2001
From: Matt Portune <59324545+mportune-bw@users.noreply.github.com>
Date: Wed, 23 Feb 2022 15:30:49 -0500
Subject: [PATCH] take environment into account when checking for existing
 account (#1808)

---
 src/App/Pages/Accounts/LoginPageViewModel.cs | 23 ++++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/App/Pages/Accounts/LoginPageViewModel.cs b/src/App/Pages/Accounts/LoginPageViewModel.cs
index df2641b64..7514e9047 100644
--- a/src/App/Pages/Accounts/LoginPageViewModel.cs
+++ b/src/App/Pages/Accounts/LoginPageViewModel.cs
@@ -141,15 +141,12 @@ namespace Bit.App.Pages
                     var userId = await _stateService.GetUserIdAsync(Email);
                     if (!string.IsNullOrWhiteSpace(userId))
                     {
-                        var switchToAccount = await _platformUtilsService.ShowDialogAsync(
-                            AppResources.SwitchToAlreadyAddedAccountConfirmation,
-                            AppResources.AccountAlreadyAdded, AppResources.Yes, AppResources.Cancel);
-                        if (switchToAccount)
+                        var userEnvUrls = await _stateService.GetEnvironmentUrlsAsync(userId);
+                        if (userEnvUrls?.Base == _environmentService.BaseUrl)
                         {
-                            await _stateService.SetActiveUserAsync(userId);
-                            _messagingService.Send("switchedAccount");
+                            await PromptToSwitchToExistingAccountAsync(userId);
+                            return;
                         }
-                        return;
                     }
                 }
 
@@ -229,5 +226,17 @@ namespace Bit.App.Pages
 #endif
             }
         }
+
+        private async Task PromptToSwitchToExistingAccountAsync(string userId)
+        {
+            var switchToAccount = await _platformUtilsService.ShowDialogAsync(
+                AppResources.SwitchToAlreadyAddedAccountConfirmation,
+                AppResources.AccountAlreadyAdded, AppResources.Yes, AppResources.Cancel);
+            if (switchToAccount)
+            {
+                await _stateService.SetActiveUserAsync(userId);
+                _messagingService.Send("switchedAccount");
+            }
+        }
     }
 }