Upstream/bitwarden-mobile
1
0
Fork 0
mirror of https://github.com/bitwarden/mobile.git synced 2024-12-26 16:57:59 +01:00
Code Issues Projects 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Android/MainActivity.cs
View File

@ -12,6 +12,7 @@ using Plugin.Fingerprint.Abstractions;
using Plugin.Settings.Abstractions;
using Plugin.Connectivity.Abstractions;
using Acr.UserDialogs;
using PushNotification.Plugin.Abstractions;
namespace Bit.Android
{
@ -32,7 +33,8 @@ namespace Bit.Android
Resolver.Resolve<IDatabaseService>(),
Resolver.Resolve<ISyncService>(),
Resolver.Resolve<IFingerprint>(),
Resolver.Resolve<ISettings>()));
Resolver.Resolve<ISettings>(),
Resolver.Resolve<IPushNotification>()));
}
protected override void OnPause()

25
src/App/App.cs
View File

@ -13,6 +13,7 @@ using Bit.App.Controls;
using Plugin.Connectivity.Abstractions;
using System.Net;
using Acr.UserDialogs;
using PushNotification.Plugin.Abstractions;
namespace Bit.App
{
@ -25,6 +26,7 @@ namespace Bit.App
private readonly IAuthService _authService;
private readonly IFingerprint _fingerprint;
private readonly ISettings _settings;
private readonly IPushNotification _pushNotification;
public App(
IAuthService authService,
@ -33,7 +35,8 @@ namespace Bit.App
IDatabaseService databaseService,
ISyncService syncService,
IFingerprint fingerprint,
ISettings settings)
ISettings settings,
IPushNotification pushNotification)
{
_databaseService = databaseService;
_connectivity = connectivity;
@ -42,6 +45,7 @@ namespace Bit.App
_authService = authService;
_fingerprint = fingerprint;
_settings = settings;
_pushNotification = pushNotification;
SetStyles();
@ -64,6 +68,11 @@ namespace Bit.App
{
await CheckLockAsync(args);
});
MessagingCenter.Subscribe<Application, string>(Current, "Logout", (sender, args) =>
{
Logout(args);
});
}
protected async override void OnStart()
@ -166,6 +175,20 @@ namespace Bit.App
}
}
private void Logout(string logoutMessage)
{
_authService.LogOut();
Device.BeginInvokeOnMainThread(() =>
{
_pushNotification.Unregister();
});
Current.MainPage = new HomePage();
if(!string.IsNullOrWhiteSpace(logoutMessage))
{
_userDialogs.WarnToast("Logged out", logoutMessage);
}
}
private async Task CheckLockAsync(bool forceLock)
{
// Only lock if they are logged in

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";

11
src/App/Services/FolderService.cs
View File

@ -6,6 +6,7 @@ using Bit.App.Abstractions;
using Bit.App.Models;
using Bit.App.Models.Data;
using Bit.App.Models.Api;
using Xamarin.Forms;
namespace Bit.App.Services
{
@ -71,6 +72,11 @@ namespace Bit.App.Services
await _folderRepository.UpdateAsync(data);
}
}
else if(response.StatusCode == System.Net.HttpStatusCode.Forbidden
|| response.StatusCode == System.Net.HttpStatusCode.Unauthorized)
{
MessagingCenter.Send(Application.Current, "Logout", (string)null);
}
return response;
}
@ -82,6 +88,11 @@ namespace Bit.App.Services
{
await _folderRepository.DeleteAsync(folderId);
}
else if(response.StatusCode == System.Net.HttpStatusCode.Forbidden
|| response.StatusCode == System.Net.HttpStatusCode.Unauthorized)
{
MessagingCenter.Send(Application.Current, "Logout", (string)null);
}
return response;
}

11
src/App/Services/SiteService.cs
View File

@ -6,6 +6,7 @@ using Bit.App.Abstractions;
using Bit.App.Models;
using Bit.App.Models.Api;
using Bit.App.Models.Data;
using Xamarin.Forms;
namespace Bit.App.Services
{
@ -78,6 +79,11 @@ namespace Bit.App.Services
await _siteRepository.UpdateAsync(data);
}
}
else if(response.StatusCode == System.Net.HttpStatusCode.Forbidden
|| response.StatusCode == System.Net.HttpStatusCode.Unauthorized)
{
MessagingCenter.Send(Application.Current, "Logout", (string)null);
}
return response;
}
@ -89,6 +95,11 @@ namespace Bit.App.Services
{
await _siteRepository.DeleteAsync(id);
}
else if(response.StatusCode == System.Net.HttpStatusCode.Forbidden
|| response.StatusCode == System.Net.HttpStatusCode.Unauthorized)
{
MessagingCenter.Send(Application.Current, "Logout", (string)null);
}
return response;
}

21
src/App/Services/SyncService.cs
View File

@ -56,6 +56,13 @@ namespace Bit.App.Services
if(!cipher.Succeeded)
{
SyncCompleted(false);
if(cipher.StatusCode == System.Net.HttpStatusCode.Forbidden
|| cipher.StatusCode == System.Net.HttpStatusCode.Unauthorized)
{
MessagingCenter.Send(Application.Current, "Logout", (string)null);
}
return false;
}
@ -136,6 +143,13 @@ namespace Bit.App.Services
if(!ciphers.Succeeded)
{
SyncCompleted(false);
if(ciphers.StatusCode == System.Net.HttpStatusCode.Forbidden
|| ciphers.StatusCode == System.Net.HttpStatusCode.Unauthorized)
{
MessagingCenter.Send(Application.Current, "Logout", (string)null);
}
return false;
}
@ -174,6 +188,13 @@ namespace Bit.App.Services
if(!ciphers.Succeeded)
{
SyncCompleted(false);
if(ciphers.StatusCode == System.Net.HttpStatusCode.Forbidden
|| ciphers.StatusCode == System.Net.HttpStatusCode.Unauthorized)
{
MessagingCenter.Send(Application.Current, "Logout", (string)null);
}
return false;
}

4
src/iOS/AppDelegate.cs
View File

@ -24,6 +24,7 @@ using PushNotification.Plugin;
using Plugin.DeviceInfo;
using Plugin.Connectivity.Abstractions;
using Bit.App.Pages;
using PushNotification.Plugin.Abstractions;
namespace Bit.iOS
{
@ -48,7 +49,8 @@ namespace Bit.iOS
Resolver.Resolve<IDatabaseService>(),
Resolver.Resolve<ISyncService>(),
Resolver.Resolve<IFingerprint>(),
Resolver.Resolve<ISettings>()));
Resolver.Resolve<ISettings>(),
Resolver.Resolve<IPushNotification>()));
// Appearance stuff