vaultwarden
/
Bitwarden-app-android-iphone-ios
mirror of https://github.com/bitwarden/mobile
1
0
Fork 0
Code Issues 2 Releases Wiki Activity

Fix iphone captcha throws (#1495)

This commit is contained in:
Matt Gibson 2021-08-12 09:23:02 -04:00 committed by GitHub
parent 7f7b673b0a
commit 24a0396d0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/App/Pages/CaptchaProtectedViewModel.cs
View File

@ -30,7 +30,7 @@ namespace Bit.App.Pages
captchaRequiredText = AppResources.CaptchaRequired, captchaRequiredText = AppResources.CaptchaRequired,
}); });
var url = environmentService.WebVaultUrl + "/captcha-mobile-connector.html?" + "data=" + data + var url = environmentService.GetWebVaultUrl() + "/captcha-mobile-connector.html?" + "data=" + data +
"&parent=" + Uri.EscapeDataString(callbackUri) + "&v=1"; "&parent=" + Uri.EscapeDataString(callbackUri) + "&v=1";
WebAuthenticatorResult authResult = null; WebAuthenticatorResult authResult = null;

2
src/Core/Models/Response/ErrorResponse.cs
View File

@ -29,7 +29,7 @@ namespace Bit.Core.Models.Response
{ {
var model = errorModel.ToObject<ErrorModel>(); var model = errorModel.ToObject<ErrorModel>();
Message = model.Message; Message = model.Message;
ValidationErrors = model.ValidationErrors; ValidationErrors = model.ValidationErrors ?? new Dictionary<string, List<string>>();
CaptchaSiteKey = ValidationErrors.ContainsKey("HCaptcha_SiteKey") ? CaptchaSiteKey = ValidationErrors.ContainsKey("HCaptcha_SiteKey") ?
ValidationErrors["HCaptcha_SiteKey"]?.FirstOrDefault() : ValidationErrors["HCaptcha_SiteKey"]?.FirstOrDefault() :
null; null;

2
src/iOS.Core/Services/DeviceActionService.cs
View File

@ -106,7 +106,9 @@ namespace Bit.iOS.Core.Services
if (_progressAlert == null) if (_progressAlert == null)
{ {
result.TrySetResult(0); result.TrySetResult(0);
return result.Task;
} }
_progressAlert.DismissViewController(false, () => result.TrySetResult(0)); _progressAlert.DismissViewController(false, () => result.TrySetResult(0));
_progressAlert.Dispose(); _progressAlert.Dispose();
_progressAlert = null; _progressAlert = null;