bitwarden/mobile
1
0
Fork 0
mirror of https://github.com/bitwarden/mobile synced 2026-01-07 02:53:56 +00:00
Code Issues Releases Wiki Activity

add support for Duo Organization 2FA

Browse Source
This commit is contained in:
Kyle Spearrin
2018-04-03 15:59:58 -04:00
parent 10df9e7cd5
commit ddeae3b5ba
5 changed files with 47 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/App/Pages/LoginTwoFactorPage.cs
View File

@@ -31,10 +31,12 @@ namespace Bit.App.Pages
private readonly Dictionary<TwoFactorProviderType, Dictionary<string, object>> _providers;
private TwoFactorProviderType? _providerType;
private readonly FullLoginResult _result;
private readonly string _duoOrgTitle;
public LoginTwoFactorPage(string email, FullLoginResult result, TwoFactorProviderType? type = null)
: base(updateActivity: false, requireAuth: false)
{
_duoOrgTitle = $"Duo ({AppResources.Organization})";
_deviceInfoService = Resolver.Resolve<IDeviceInfoService>();
_email = email;
@@ -180,9 +182,10 @@ namespace Bit.App.Pages
Content = scrollView;
TokenCell.Entry.FocusWithDelay();
}
else if(_providerType == TwoFactorProviderType.Duo)
else if(_providerType == TwoFactorProviderType.Duo ||
_providerType == TwoFactorProviderType.OrganizationDuo)
{
var duoParams = _providers[TwoFactorProviderType.Duo];
var duoParams = _providers[_providerType.Value];
var host = WebUtility.UrlEncode(duoParams["Host"].ToString());
var req = WebUtility.UrlEncode(duoParams["Signature"].ToString());
@@ -224,7 +227,7 @@ namespace Bit.App.Pages
table.WrappingStackLayout = () => layout;
scrollView.Content = layout;
Title = "Duo";
Title = _providerType == TwoFactorProviderType.Duo ? "Duo" : _duoOrgTitle;
Content = scrollView;
}
else if(_providerType == TwoFactorProviderType.YubiKey)
@@ -312,6 +315,11 @@ namespace Bit.App.Pages
var beforeProviderType = _providerType;
var options = new List<string>();
if(_providers.ContainsKey(TwoFactorProviderType.OrganizationDuo))
{
options.Add(_duoOrgTitle);
}
if(_providers.ContainsKey(TwoFactorProviderType.Authenticator))
{
options.Add(AppResources.AuthenticatorAppTitle);
@@ -349,6 +357,10 @@ namespace Bit.App.Pages
{
_providerType = TwoFactorProviderType.Duo;
}
else if(selection == _duoOrgTitle)
{
_providerType = TwoFactorProviderType.OrganizationDuo;
}
else if(selection == AppResources.YubiKeyTitle)
{
_providerType = TwoFactorProviderType.YubiKey;
@@ -448,7 +460,8 @@ namespace Bit.App.Pages
switch(p.Key)
{
case TwoFactorProviderType.Authenticator:
if(provider == TwoFactorProviderType.Duo || provider == TwoFactorProviderType.YubiKey)
if(provider == TwoFactorProviderType.Duo || provider == TwoFactorProviderType.YubiKey ||
provider == TwoFactorProviderType.OrganizationDuo)
{
continue;
}
@@ -460,18 +473,26 @@ namespace Bit.App.Pages
}
break;
case TwoFactorProviderType.Duo:
if(provider == TwoFactorProviderType.YubiKey)
if(provider == TwoFactorProviderType.YubiKey ||
provider == TwoFactorProviderType.OrganizationDuo)
{
continue;
}
break;
case TwoFactorProviderType.YubiKey:
if(provider == TwoFactorProviderType.OrganizationDuo)
{
continue;
}
var nfcKey = p.Value.ContainsKey("Nfc") && (bool)p.Value["Nfc"];
if((!_deviceInfoService.NfcEnabled || !nfcKey) && Device.RuntimePlatform != Device.UWP)
{
continue;
}
break;
case TwoFactorProviderType.OrganizationDuo:
break;
default:
continue;
}