mirror of
https://github.com/bitwarden/mobile.git
synced 2024-06-23 10:04:49 +02:00
* Account Switching (#1720) * Account switching * WIP * wip * wip * updates to send test logic * fixed Send tests * fixes for theme handling on account switching and re-adding existing account * switch fixes * fixes * fixes * cleanup * vault timeout fixes * account list status enhancements * logout fixes and token handling improvements * merge latest (#1727) * remove duplicate dependency * fix for initial login token storage paradox (#1730) * Fix avatar color update toolbar item issue on iOS for account switching (#1735) * Updated account switching menu UI (#1733) * updated account switching menu UI * additional changes * add key suffix to constant * GetFirstLetters method tweaks * Fix crash on account switching when logging out when having more than user at a time (#1740) * single account migration to multi-account on app update (#1741) * Account Switching Tap to dismiss (#1743) * Added tap to dismiss on the Account switching overlay and improved a bit the code * Fix account switching overlay background transparent on the proper place * Fixed transparent background and the shadow on the account switching overlay * Fix iOS top space on Account switching list overlay after modal (#1746) * Fix top space added to Account switching list overlay after closing modal * Fix top space added to Account switching list overlay after closing modal on lock, login and home views just in case we add modals in the future there as well * Usability: dismiss account list on certain events (#1748) * dismiss account list on certain events * use new FireAndForget method for back button logic * Create and use Account Switching overlay control (#1753) * Added Account switching overlay control and its own ViewModel and refactored accordingly * Fix account switching Accounts list binding update * Implemented dismiss account switching overlay when changing tabs and when selecting the same tab. Also updated the deprecated listener on CustomTabbedRenderer on Android (#1755) * Overriden Equals on AvatarImageSource so it doesn't get set multiple times when it's the same image thus producing blinking on tab chaged (#1756) * Usability improvements for logout on vault timeout (#1781) * accountswitching fixes (#1784) * Fix for invalid PIN lock state when switching accounts (#1792) * fix for pin lock flow * named tuple values and updated async * clear send service cache on account switch (#1796) * Global theme and account removal (#1793) * Global theme and account removal * remove redundant call to hide account list overlay * cleanup and additional tweaks * add try/catch to remove account dialog flow Co-authored-by: Federico Maccaroni <fedemkr@gmail.com>
220 lines
7.1 KiB
C#
220 lines
7.1 KiB
C#
using Bit.App.Controls;
|
|
using Bit.App.Models;
|
|
using Bit.App.Resources;
|
|
using Bit.Core.Abstractions;
|
|
using Bit.Core.Utilities;
|
|
using System;
|
|
using System.Threading.Tasks;
|
|
using Bit.App.Utilities;
|
|
using Xamarin.Forms;
|
|
|
|
namespace Bit.App.Pages
|
|
{
|
|
public partial class TwoFactorPage : BaseContentPage
|
|
{
|
|
private readonly IBroadcasterService _broadcasterService;
|
|
private readonly IMessagingService _messagingService;
|
|
private readonly AppOptions _appOptions;
|
|
|
|
private TwoFactorPageViewModel _vm;
|
|
private bool _inited;
|
|
private bool _authingWithSso;
|
|
private string _orgIdentifier;
|
|
|
|
public TwoFactorPage(bool? authingWithSso = false, AppOptions appOptions = null, string orgIdentifier = null)
|
|
{
|
|
InitializeComponent();
|
|
SetActivityIndicator();
|
|
_authingWithSso = authingWithSso ?? false;
|
|
_appOptions = appOptions;
|
|
_orgIdentifier = orgIdentifier;
|
|
_broadcasterService = ServiceContainer.Resolve<IBroadcasterService>("broadcasterService");
|
|
_messagingService = ServiceContainer.Resolve<IMessagingService>("messagingService");
|
|
_vm = BindingContext as TwoFactorPageViewModel;
|
|
_vm.Page = this;
|
|
_vm.StartSetPasswordAction = () =>
|
|
Device.BeginInvokeOnMainThread(async () => await StartSetPasswordAsync());
|
|
_vm.TwoFactorAuthSuccessAction = () =>
|
|
Device.BeginInvokeOnMainThread(async () => await TwoFactorAuthSuccessAsync());
|
|
_vm.UpdateTempPasswordAction =
|
|
() => Device.BeginInvokeOnMainThread(async () => await UpdateTempPasswordAsync());
|
|
_vm.CloseAction = async () => await Navigation.PopModalAsync();
|
|
DuoWebView = _duoWebView;
|
|
if (Device.RuntimePlatform == Device.Android)
|
|
{
|
|
ToolbarItems.Remove(_cancelItem);
|
|
}
|
|
if (Device.RuntimePlatform == Device.iOS)
|
|
{
|
|
ToolbarItems.Add(_moreItem);
|
|
} else
|
|
{
|
|
ToolbarItems.Add(_useAnotherTwoStepMethod);
|
|
}
|
|
}
|
|
|
|
public HybridWebView DuoWebView { get; set; }
|
|
|
|
protected async override void OnAppearing()
|
|
{
|
|
base.OnAppearing();
|
|
_broadcasterService.Subscribe(nameof(TwoFactorPage), (message) =>
|
|
{
|
|
if (message.Command == "gotYubiKeyOTP")
|
|
{
|
|
var token = (string)message.Data;
|
|
if (_vm.YubikeyMethod && !string.IsNullOrWhiteSpace(token) &&
|
|
token.Length == 44 && !token.Contains(" "))
|
|
{
|
|
Device.BeginInvokeOnMainThread(async () =>
|
|
{
|
|
_vm.Token = token;
|
|
await _vm.SubmitAsync();
|
|
});
|
|
}
|
|
}
|
|
else if (message.Command == "resumeYubiKey")
|
|
{
|
|
if (_vm.YubikeyMethod)
|
|
{
|
|
_messagingService.Send("listenYubiKeyOTP", true);
|
|
}
|
|
}
|
|
});
|
|
|
|
await LoadOnAppearedAsync(_scrollView, true, () =>
|
|
{
|
|
if (!_inited)
|
|
{
|
|
_inited = true;
|
|
_vm.Init();
|
|
}
|
|
if (_vm.TotpMethod)
|
|
{
|
|
RequestFocus(_totpEntry);
|
|
} else if (_vm.YubikeyMethod)
|
|
{
|
|
RequestFocus(_yubikeyTokenEntry);
|
|
}
|
|
return Task.FromResult(0);
|
|
});
|
|
}
|
|
|
|
protected override void OnDisappearing()
|
|
{
|
|
base.OnDisappearing();
|
|
if (!_vm.YubikeyMethod)
|
|
{
|
|
_messagingService.Send("listenYubiKeyOTP", false);
|
|
_broadcasterService.Unsubscribe(nameof(TwoFactorPage));
|
|
}
|
|
}
|
|
protected override bool OnBackButtonPressed()
|
|
{
|
|
if (_vm.YubikeyMethod)
|
|
{
|
|
_messagingService.Send("listenYubiKeyOTP", false);
|
|
_broadcasterService.Unsubscribe(nameof(TwoFactorPage));
|
|
}
|
|
return base.OnBackButtonPressed();
|
|
}
|
|
|
|
private async void Continue_Clicked(object sender, EventArgs e)
|
|
{
|
|
if (DoOnce())
|
|
{
|
|
await _vm.SubmitAsync();
|
|
}
|
|
}
|
|
|
|
private async void Methods_Clicked(object sender, EventArgs e)
|
|
{
|
|
if (DoOnce())
|
|
{
|
|
await _vm.AnotherMethodAsync();
|
|
}
|
|
}
|
|
|
|
private async void More_Clicked(object sender, EventArgs e)
|
|
{
|
|
if (!DoOnce())
|
|
{
|
|
return;
|
|
}
|
|
|
|
var selection = await DisplayActionSheet(AppResources.Options, AppResources.Cancel, null, AppResources.UseAnotherTwoStepMethod);
|
|
|
|
if (selection == AppResources.UseAnotherTwoStepMethod)
|
|
{
|
|
await _vm.AnotherMethodAsync();
|
|
}
|
|
}
|
|
|
|
private async void ResendEmail_Clicked(object sender, EventArgs e)
|
|
{
|
|
if (DoOnce())
|
|
{
|
|
await _vm.SendEmailAsync(true, true);
|
|
}
|
|
}
|
|
|
|
private void Close_Clicked(object sender, System.EventArgs e)
|
|
{
|
|
if (DoOnce())
|
|
{
|
|
_vm.CloseAction();
|
|
}
|
|
}
|
|
|
|
private async void TryAgain_Clicked(object sender, EventArgs e)
|
|
{
|
|
if (DoOnce())
|
|
{
|
|
if (_vm.Fido2Method)
|
|
{
|
|
await _vm.Fido2AuthenticateAsync();
|
|
}
|
|
else if (_vm.YubikeyMethod)
|
|
{
|
|
_messagingService.Send("listenYubiKeyOTP", true);
|
|
}
|
|
}
|
|
}
|
|
|
|
private async Task StartSetPasswordAsync()
|
|
{
|
|
_vm.CloseAction();
|
|
var page = new SetPasswordPage(_appOptions, _orgIdentifier);
|
|
await Navigation.PushModalAsync(new NavigationPage(page));
|
|
}
|
|
|
|
private async Task UpdateTempPasswordAsync()
|
|
{
|
|
var page = new UpdateTempPasswordPage();
|
|
await Navigation.PushModalAsync(new NavigationPage(page));
|
|
}
|
|
|
|
private async Task TwoFactorAuthSuccessAsync()
|
|
{
|
|
if (_authingWithSso)
|
|
{
|
|
Application.Current.MainPage = new NavigationPage(new LockPage(_appOptions));
|
|
}
|
|
else
|
|
{
|
|
if (AppHelpers.SetAlternateMainPage(_appOptions))
|
|
{
|
|
return;
|
|
}
|
|
var previousPage = await AppHelpers.ClearPreviousPage();
|
|
Application.Current.MainPage = new TabsPage(_appOptions, previousPage);
|
|
}
|
|
}
|
|
|
|
private void Token_TextChanged(object sender, TextChangedEventArgs e)
|
|
{
|
|
_vm.EnableContinue = !string.IsNullOrWhiteSpace(e.NewTextValue);
|
|
}
|
|
}
|
|
}
|