From 62254aef8d6cded5083de0b9eb5a6d4b7921fac7 Mon Sep 17 00:00:00 2001 From: Dinis Vieira Date: Tue, 21 Nov 2023 22:39:44 +0000 Subject: [PATCH] PM-3349 PM-3350 Fixed issue where creating an account with weak/exposed password would get stuck after the Captcha (if a captcha is shown) Changed App.xaml.cs NavigateImpl to be private --- src/Core/App.xaml.cs | 2 +- src/Core/Pages/Accounts/RegisterPageViewModel.cs | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Core/App.xaml.cs b/src/Core/App.xaml.cs index 3bc442f31..7c714c03a 100644 --- a/src/Core/App.xaml.cs +++ b/src/Core/App.xaml.cs @@ -530,7 +530,7 @@ namespace Bit.App NavigateImpl(navTarget, navParams); } - public void NavigateImpl(NavigationTarget navTarget, INavigationParams navParams) + private void NavigateImpl(NavigationTarget navTarget, INavigationParams navParams) { switch (navTarget) { diff --git a/src/Core/Pages/Accounts/RegisterPageViewModel.cs b/src/Core/Pages/Accounts/RegisterPageViewModel.cs index 05d01bc05..35b577da2 100644 --- a/src/Core/Pages/Accounts/RegisterPageViewModel.cs +++ b/src/Core/Pages/Accounts/RegisterPageViewModel.cs @@ -165,7 +165,9 @@ namespace Bit.App.Pages AppResources.AnErrorHasOccurred, AppResources.Ok); return; } - if (await IsPasswordWeakOrExposed()) + + //We only test weak/exposed password when "showLoading" is true otherwise it would be called twice in scenarios this method is called again after a Captcha + if (showLoading && await IsPasswordWeakOrExposed()) { return; }