bitwarden/mobile
1
0
Fork 0
mirror of https://github.com/bitwarden/mobile synced 2026-01-08 11:33:31 +00:00
Code Issues Releases Wiki Activity

Centralized logout into a message subscription in app class. Logout when API results are forbidden or unauthorized.

Browse Source
This commit is contained in:
Kyle Spearrin
2016-07-19 18:46:39 -04:00
parent a5d2ae9637
commit d07210c7dc
14 changed files with 119 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/App/Pages/Lock/LockFingerprintPage.cs
View File

@@ -14,7 +14,6 @@ namespace Bit.App.Pages
public class LockFingerprintPage : ExtendedContentPage
{
private readonly IFingerprint _fingerprint;
private readonly IAuthService _authService;
private readonly IUserDialogs _userDialogs;
private readonly ISettings _settings;
private readonly bool _checkFingerprintImmediately;
@@ -24,7 +23,6 @@ namespace Bit.App.Pages
{
_checkFingerprintImmediately = checkFingerprintImmediately;
_fingerprint = Resolver.Resolve<IFingerprint>();
_authService = Resolver.Resolve<IAuthService>();
_userDialogs = Resolver.Resolve<IUserDialogs>();
_settings = Resolver.Resolve<ISettings>();
@@ -79,9 +77,7 @@ namespace Bit.App.Pages
return;
}
_authService.LogOut();
await Navigation.PopModalAsync();
Application.Current.MainPage = new HomePage();
MessagingCenter.Send(Application.Current, "Logout", (string)null);
}
public async Task CheckFingerprintAsync()

4
src/App/Pages/Lock/LockPasswordPage.cs
View File

@@ -123,9 +123,7 @@ namespace Bit.App.Pages
return;
}
_authService.LogOut();
await Navigation.PopModalAsync();
Application.Current.MainPage = new HomePage();
MessagingCenter.Send(Application.Current, "Logout", (string)null);
}
}
}

4
src/App/Pages/Lock/LockPinPage.cs
View File

@@ -102,9 +102,7 @@ namespace Bit.App.Pages
return;
}
_authService.LogOut();
await Navigation.PopModalAsync();
Application.Current.MainPage = new HomePage();
MessagingCenter.Send(Application.Current, "Logout", (string)null);
}
}
}

13
src/App/Pages/Settings/SettingsAddFolderPage.cs
View File

@@ -7,6 +7,7 @@ using Bit.App.Resources;
using Plugin.Connectivity.Abstractions;
using Xamarin.Forms;
using XLabs.Ioc;
using System.Linq;
namespace Bit.App.Pages
{
@@ -74,8 +75,16 @@ namespace Bit.App.Pages
await saveTask;
_userDialogs.HideLoading();
await Navigation.PopModalAsync();
_userDialogs.SuccessToast(nameCell.Entry.Text, "New folder created.");
if(saveTask.Result.Succeeded)
{
await Navigation.PopModalAsync();
_userDialogs.SuccessToast(nameCell.Entry.Text, "New folder created.");
}
else if(saveTask.Result.Errors.Count() > 0)
{
await _userDialogs.AlertAsync(saveTask.Result.Errors.First().Message, AppResources.AnErrorHasOccurred);
}
}, ToolbarItemOrder.Default, 0);
Title = "Add Folder";

13
src/App/Pages/Settings/SettingsEditFolderPage.cs
View File

@@ -6,6 +6,7 @@ using Bit.App.Resources;
using Plugin.Connectivity.Abstractions;
using Xamarin.Forms;
using XLabs.Ioc;
using System.Linq;
namespace Bit.App.Pages
{
@@ -87,8 +88,16 @@ namespace Bit.App.Pages
await saveTask;
_userDialogs.HideLoading();
await Navigation.PopModalAsync();
_userDialogs.SuccessToast(nameCell.Entry.Text, "Folder updated.");
if(saveTask.Result.Succeeded)
{
await Navigation.PopModalAsync();
_userDialogs.SuccessToast(nameCell.Entry.Text, "Folder updated.");
}
else if(saveTask.Result.Errors.Count() > 0)
{
await _userDialogs.AlertAsync(saveTask.Result.Errors.First().Message, AppResources.AnErrorHasOccurred);
}
}, ToolbarItemOrder.Default, 0);
Title = "Edit Folder";

6
src/App/Pages/Settings/SettingsPage.cs
View File

@@ -129,7 +129,7 @@ namespace Bit.App.Pages
}
};
if( Device.OS == TargetPlatform.iOS )
if(Device.OS == TargetPlatform.iOS)
{
table.RowHeight = -1;
table.EstimatedRowHeight = 44;
@@ -199,9 +199,7 @@ namespace Bit.App.Pages
return;
}
_authService.LogOut();
_pushNotification.Unregister();
Application.Current.MainPage = new HomePage();
MessagingCenter.Send(Application.Current, "Logout", (string)null);
}
private async void ChangeMasterPasswordCell_Tapped(object sender, EventArgs e)

11
src/App/Pages/Vault/VaultAddSitePage.cs
View File

@@ -134,8 +134,15 @@ namespace Bit.App.Pages
await saveTask;
_userDialogs.HideLoading();
await Navigation.PopModalAsync();
_userDialogs.SuccessToast(nameCell.Entry.Text, "New site created.");
if(saveTask.Result.Succeeded)
{
await Navigation.PopModalAsync();
_userDialogs.SuccessToast(nameCell.Entry.Text, "New site created.");
}
else if(saveTask.Result.Errors.Count() > 0)
{
await _userDialogs.AlertAsync(saveTask.Result.Errors.First().Message, AppResources.AnErrorHasOccurred);
}
}, ToolbarItemOrder.Default, 0);
Title = AppResources.AddSite;

12
src/App/Pages/Vault/VaultEditSitePage.cs
View File

@@ -168,8 +168,16 @@ namespace Bit.App.Pages
await saveTask;
_userDialogs.HideLoading();
await Navigation.PopModalAsync();
_userDialogs.SuccessToast(nameCell.Entry.Text, "Site updated.");
if(saveTask.Result.Succeeded)
{
await Navigation.PopModalAsync();
_userDialogs.SuccessToast(nameCell.Entry.Text, "Site updated.");
}
else if(saveTask.Result.Errors.Count() > 0)
{
await _userDialogs.AlertAsync(saveTask.Result.Errors.First().Message, AppResources.AnErrorHasOccurred);
}
}, ToolbarItemOrder.Default, 0);
Title = "Edit Site";