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>
124 lines
4.0 KiB
C#
124 lines
4.0 KiB
C#
using Bit.App.Models;
|
|
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 LoginSsoPage : BaseContentPage
|
|
{
|
|
private readonly IVaultTimeoutService _vaultTimeoutService;
|
|
private readonly LoginSsoPageViewModel _vm;
|
|
private readonly AppOptions _appOptions;
|
|
|
|
private AppOptions _appOptionsCopy;
|
|
|
|
public LoginSsoPage(AppOptions appOptions = null)
|
|
{
|
|
_vaultTimeoutService = ServiceContainer.Resolve<IVaultTimeoutService>("vaultTimeoutService");
|
|
_appOptions = appOptions;
|
|
InitializeComponent();
|
|
_vm = BindingContext as LoginSsoPageViewModel;
|
|
_vm.Page = this;
|
|
_vm.StartTwoFactorAction = () => Device.BeginInvokeOnMainThread(async () => await StartTwoFactorAsync());
|
|
_vm.StartSetPasswordAction = () =>
|
|
Device.BeginInvokeOnMainThread(async () => await StartSetPasswordAsync());
|
|
_vm.SsoAuthSuccessAction = () => Device.BeginInvokeOnMainThread(async () => await SsoAuthSuccessAsync());
|
|
_vm.UpdateTempPasswordAction =
|
|
() => Device.BeginInvokeOnMainThread(async () => await UpdateTempPasswordAsync());
|
|
_vm.CloseAction = async () =>
|
|
{
|
|
await Navigation.PopModalAsync();
|
|
};
|
|
if (Device.RuntimePlatform == Device.Android)
|
|
{
|
|
ToolbarItems.RemoveAt(0);
|
|
}
|
|
}
|
|
|
|
protected override async void OnAppearing()
|
|
{
|
|
base.OnAppearing();
|
|
await _vm.InitAsync();
|
|
if (string.IsNullOrWhiteSpace(_vm.OrgIdentifier))
|
|
{
|
|
RequestFocus(_orgIdentifier);
|
|
}
|
|
}
|
|
|
|
private void CopyAppOptions()
|
|
{
|
|
if (_appOptions != null)
|
|
{
|
|
// create an object copy of _appOptions to persist values when app is exited during web auth flow
|
|
_appOptionsCopy = new AppOptions();
|
|
_appOptionsCopy.SetAllFrom(_appOptions);
|
|
}
|
|
}
|
|
|
|
private void RestoreAppOptionsFromCopy()
|
|
{
|
|
if (_appOptions != null)
|
|
{
|
|
// restore values to original readonly _appOptions object from copy
|
|
_appOptions.SetAllFrom(_appOptionsCopy);
|
|
_appOptionsCopy = null;
|
|
}
|
|
}
|
|
|
|
private async void LogIn_Clicked(object sender, EventArgs e)
|
|
{
|
|
if (DoOnce())
|
|
{
|
|
CopyAppOptions();
|
|
await _vm.LogInAsync();
|
|
}
|
|
}
|
|
|
|
private void Close_Clicked(object sender, EventArgs e)
|
|
{
|
|
if (DoOnce())
|
|
{
|
|
_vm.CloseAction();
|
|
}
|
|
}
|
|
|
|
private async Task StartTwoFactorAsync()
|
|
{
|
|
RestoreAppOptionsFromCopy();
|
|
var page = new TwoFactorPage(true, _appOptions, _vm.OrgIdentifier);
|
|
await Navigation.PushModalAsync(new NavigationPage(page));
|
|
}
|
|
|
|
private async Task StartSetPasswordAsync()
|
|
{
|
|
RestoreAppOptionsFromCopy();
|
|
var page = new SetPasswordPage(_appOptions, _vm.OrgIdentifier);
|
|
await Navigation.PushModalAsync(new NavigationPage(page));
|
|
}
|
|
|
|
private async Task UpdateTempPasswordAsync()
|
|
{
|
|
var page = new UpdateTempPasswordPage();
|
|
await Navigation.PushModalAsync(new NavigationPage(page));
|
|
}
|
|
|
|
private async Task SsoAuthSuccessAsync()
|
|
{
|
|
RestoreAppOptionsFromCopy();
|
|
await AppHelpers.ClearPreviousPage();
|
|
if (await _vaultTimeoutService.IsLockedAsync())
|
|
{
|
|
Application.Current.MainPage = new NavigationPage(new LockPage(_appOptions));
|
|
}
|
|
else
|
|
{
|
|
Application.Current.MainPage = new TabsPage(_appOptions, null);
|
|
}
|
|
}
|
|
}
|
|
}
|