mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-10-31 15:15:34 +03:00
Code Issues Projects Releases Packages Wiki Activity

friendly message for webauthn errors (#1534)

Browse source 
* friendly error message for webauthn error flow

* combine original plus friendly message

* remove redundant phrasing
This commit is contained in:
Matt Portune 2021-09-09 10:04:49 -04:00 committed by GitHub
parent 4667a9d643
commit 14b51b1a7f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/App/Pages/Accounts/TwoFactorPageViewModel.cs
View file

@ -242,11 +242,12 @@ namespace Bit.App.Pages
await _deviceActionService.HideLoadingAsync(); await _deviceActionService.HideLoadingAsync();
if (authResult != null && authResult.Properties.TryGetValue("error", out var resultError)) if (authResult != null && authResult.Properties.TryGetValue("error", out var resultError))
{ {
await _platformUtilsService.ShowDialogAsync(resultError, AppResources.AnErrorHasOccurred); var message = AppResources.Fido2CheckBrowser + "\n\n" + resultError;
await _platformUtilsService.ShowDialogAsync(message, AppResources.AnErrorHasOccurred);
} }
else else
{ {
await _platformUtilsService.ShowDialogAsync(AppResources.Fido2SomethingWentWrong, await _platformUtilsService.ShowDialogAsync(AppResources.Fido2CheckBrowser,
AppResources.AnErrorHasOccurred); AppResources.AnErrorHasOccurred);
} }
} }

4
src/App/Resources/AppResources.Designer.cs generated
View file

@ -3585,9 +3585,9 @@ namespace Bit.App.Resources {
} }
} }
public static string Fido2SomethingWentWrong { public static string Fido2CheckBrowser {
get { get {
return ResourceManager.GetString("Fido2SomethingWentWrong", resourceCulture); return ResourceManager.GetString("Fido2CheckBrowser", resourceCulture);
} }
} }

4
src/App/Resources/AppResources.resx
View file

@ -2028,8 +2028,8 @@
<data name="Fido2AuthenticateWebAuthn" xml:space="preserve"> <data name="Fido2AuthenticateWebAuthn" xml:space="preserve">
<value>Authenticate WebAuthn</value> <value>Authenticate WebAuthn</value>
</data> </data>
<data name="Fido2SomethingWentWrong" xml:space="preserve"> <data name="Fido2CheckBrowser" xml:space="preserve">
<value>Something Went Wrong. Try again.</value> <value>Please make sure your default browser supports WebAuthn and try again.</value>
</data> </data>
<data name="ResetPasswordAutoEnrollInviteWarning" xml:space="preserve"> <data name="ResetPasswordAutoEnrollInviteWarning" xml:space="preserve">
<value>This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password.</value> <value>This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password.</value>