bitwarden/mobile
1
0
Fork 0
mirror of https://github.com/bitwarden/mobile synced 2025-12-15 15:53:44 +00:00
Code Issues Releases Wiki Activity

listen to yubikey

Browse Source
This commit is contained in:
Kyle Spearrin
2019-05-28 09:54:08 -04:00
parent 822fc7f308
commit 58d101659a
4 changed files with 121 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/App/Pages/Accounts/TwoFactorPageViewModel.cs
View File

@@ -21,6 +21,8 @@ namespace Bit.App.Pages
private readonly IApiService _apiService;
private readonly IPlatformUtilsService _platformUtilsService;
private readonly IEnvironmentService _environmentService;
private readonly IMessagingService _messagingService;
private readonly IBroadcasterService _broadcasterService;
private bool _u2fSupported = false;
private TwoFactorProviderType? _selectedProviderType;
@@ -36,6 +38,8 @@ namespace Bit.App.Pages
_apiService = ServiceContainer.Resolve<IApiService>("apiService");
_platformUtilsService = ServiceContainer.Resolve<IPlatformUtilsService>("platformUtilsService");
_environmentService = ServiceContainer.Resolve<IEnvironmentService>("environmentService");
_messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
_broadcasterService = ServiceContainer.Resolve<IBroadcasterService>("broadcasterService");
PageTitle = AppResources.TwoStepLogin;
}
@@ -122,9 +126,11 @@ namespace Bit.App.Pages
case TwoFactorProviderType.U2f:
// TODO
break;
case TwoFactorProviderType.YubiKey:
_messagingService.Send("listenYubiKeyOTP", true);
break;
case TwoFactorProviderType.Duo:
case TwoFactorProviderType.OrganizationDuo:
page.RemoveContinueButton();
var host = WebUtility.UrlEncode(providerData["Host"] as string);
var req = WebUtility.UrlEncode(providerData["Signature"] as string);
page.DuoWebView.Uri = $"{_webVaultUrl}/duo-connector.html?host={host}&request={req}";
@@ -135,7 +141,6 @@ namespace Bit.App.Pages
});
break;
case TwoFactorProviderType.Email:
page.AddContinueButton();
TwoFactorEmail = providerData["Email"] as string;
if(_authService.TwoFactorProvidersData.Count > 1)
{
@@ -143,9 +148,21 @@ namespace Bit.App.Pages
}
break;
default:
page.AddContinueButton();
break;
}
if(!YubikeyMethod)
{
_messagingService.Send("listenYubiKeyOTP", false);
}
if(DuoMethod)
{
page.RemoveContinueButton();
}
else
{
page.AddContinueButton();
}
}
public async Task SubmitAsync()
@@ -172,6 +189,8 @@ namespace Bit.App.Pages
await _authService.LogInTwoFactorAsync(SelectedProviderType.Value, Token, Remember);
await _deviceActionService.HideLoadingAsync();
var task = Task.Run(() => _syncService.FullSyncAsync(true));
_messagingService.Send("listenYubiKeyOTP", false);
_broadcasterService.Unsubscribe(nameof(TwoFactorPage));
Application.Current.MainPage = new TabsPage();
}
catch(ApiException e)
@@ -202,7 +221,7 @@ namespace Bit.App.Pages
public async Task<bool> SendEmailAsync(bool showLoading, bool doToast)
{
if(SelectedProviderType != TwoFactorProviderType.Email)
if(!EmailMethod)
{
return false;
}