wismna/modernkeepass
1
0
Fork 0
mirror of https://github.com/wismna/ModernKeePass.git synced 2025-10-04 08:00:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

WIP

Browse Source
This commit is contained in:
Geoffroy BONNEVILLE
2020-03-24 19:14:34 +01:00
parent f208e2d0b6
commit 4b1210f414
9 changed files with 121 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
ModernKeePass/ViewModels/CompositeKeyVm.cs
View File

@@ -3,12 +3,16 @@ using System.Runtime.InteropServices.WindowsRuntime;
using System.Text;
using System.Threading.Tasks;
using Windows.Storage;
using Windows.Storage.AccessCache;
using MediatR;
using ModernKeePass.Application.Database.Commands.UpdateCredentials;
using ModernKeePass.Application.Database.Queries.OpenDatabase;
using ModernKeePass.Common;
using ModernKeePass.Domain.Dtos;
using ModernKeePass.Interfaces;
using ModernKeePass.Services;
using ModernKeePassLib.Cryptography;
using ModernKeePassLib.Keys;
using ModernKeePassLib.Serialization;
namespace ModernKeePass.ViewModels
{
@@ -21,9 +25,7 @@ namespace ModernKeePass.ViewModels
Warning = 3,
Success = 5
}
public IDatabaseService Database { get; set; }
public bool HasPassword
{
get { return _hasPassword; }
@@ -110,15 +112,16 @@ namespace ModernKeePass.ViewModels
private StatusTypes _statusType;
private StorageFile _keyFile;
private string _keyFileText;
private readonly IMediator _mediator;
private readonly IResourceService _resource;
public CompositeKeyVm() : this(DatabaseService.Instance, new ResourcesService()) { }
public CompositeKeyVm() : this(App.Mediator, new ResourcesService()) { }
public CompositeKeyVm(IDatabaseService database, IResourceService resource)
public CompositeKeyVm(IMediator mediator, IResourceService resource)
{
_mediator = mediator;
_resource = resource;
_keyFileText = _resource.GetResourceValue("CompositeKeyDefaultKeyFile");
Database = database;
}
public async Task<bool> OpenDatabase(StorageFile databaseFile, bool createNew)
@@ -126,9 +129,15 @@ namespace ModernKeePass.ViewModels
try
{
_isOpening = true;
OnPropertyChanged("IsValid");
await Database.Open(databaseFile, await CreateCompositeKey(), createNew);
await Task.Run(() => RootGroup = Database.RootGroup);
OnPropertyChanged("IsValid");;
var fileInfo = new FileInfo
{
Name = databaseFile.DisplayName,
Path = StorageApplicationPermissions.FutureAccessList.Add(databaseFile)
};
var database = await _mediator.Send(new OpenDatabaseQuery { FileInfo = fileInfo, Credentials = CreateCredentials()});
await Task.Run(() => RootGroup = new GroupVm(database.RootGroup));
return true;
}
catch (ArgumentException)
@@ -154,7 +163,8 @@ namespace ModernKeePass.ViewModels
public async Task UpdateKey()
{
Database.UpdateCompositeKey(await CreateCompositeKey());
//Database.UpdateCompositeKey(await CreateCompositeKey());
await _mediator.Send(new UpdateCredentialsCommand {Credentials = CreateCredentials()});
UpdateStatus(_resource.GetResourceValue("CompositeKeyUpdated"), StatusTypes.Success);
}
@@ -172,17 +182,14 @@ namespace ModernKeePass.ViewModels
StatusType = (int)type;
}
private async Task<CompositeKey> CreateCompositeKey()
private Credentials CreateCredentials()
{
var compositeKey = new CompositeKey();
if (HasPassword) compositeKey.AddUserKey(new KcpPassword(Password));
if (HasKeyFile && KeyFile != null)
var credentials = new Credentials
{
var fileContents = await FileIO.ReadBufferAsync(KeyFile);
compositeKey.AddUserKey(new KcpKeyFile(IOConnectionInfo.FromByteArray(fileContents.ToArray())));
}
if (HasUserAccount) compositeKey.AddUserKey(new KcpUserAccount());
return compositeKey;
Password = HasPassword ? Password: null,
KeyFilePath = HasKeyFile && KeyFile != null ? StorageApplicationPermissions.FutureAccessList.Add(KeyFile) : null
};
return credentials;
}
}
}

18
ModernKeePass/ViewModels/MainVm.cs
View File

@@ -3,6 +3,8 @@ using System.Linq;
using Windows.ApplicationModel;
using Windows.Storage;
using Windows.UI.Xaml.Controls;
using MediatR;
using ModernKeePass.Application.Database.Queries.GetDatabase;
using ModernKeePass.Common;
using ModernKeePass.Interfaces;
using ModernKeePass.Services;
@@ -46,12 +48,12 @@ namespace ModernKeePass.ViewModels
public MainVm() {}
internal MainVm(Frame referenceFrame, Frame destinationFrame, StorageFile databaseFile = null) : this(referenceFrame, destinationFrame,
DatabaseService.Instance, new ResourcesService(), RecentService.Instance, databaseFile)
App.Mediator, new ResourcesService(), RecentService.Instance, databaseFile)
{ }
public MainVm(Frame referenceFrame, Frame destinationFrame, IDatabaseService database, IResourceService resource, IRecentService recent, StorageFile databaseFile = null)
public MainVm(Frame referenceFrame, Frame destinationFrame, IMediator mediator, IResourceService resource, IRecentService recent, StorageFile databaseFile = null)
{
var isDatabaseOpen = database != null && database.IsOpen;
var database = mediator.Send(new GetDatabaseQuery()).GetAwaiter().GetResult();
var mainMenuItems = new ObservableCollection<MainMenuItemVm>
{
@@ -79,8 +81,8 @@ namespace ModernKeePass.ViewModels
Destination = destinationFrame,
Parameter = referenceFrame,
SymbolIcon = Symbol.Save,
IsSelected = isDatabaseOpen,
IsEnabled = isDatabaseOpen
IsSelected = database.IsOpen,
IsEnabled = database.IsOpen
},
new MainMenuItemVm
{
@@ -89,9 +91,7 @@ namespace ModernKeePass.ViewModels
Destination = destinationFrame,
Parameter = referenceFrame,
SymbolIcon = Symbol.Copy,
IsSelected =
(database == null || !database.IsOpen) &&
recent.EntryCount > 0,
IsSelected = !database.IsOpen && recent.EntryCount > 0,
IsEnabled = recent.EntryCount > 0
},
new MainMenuItemVm
@@ -120,7 +120,7 @@ namespace ModernKeePass.ViewModels
SelectedItem = mainMenuItems.FirstOrDefault(m => m.IsSelected);
// Add currently opened database to the menu
if (database != null && database.IsOpen)
if (database.IsOpen)
mainMenuItems.Add(new MainMenuItemVm
{
Title = database.Name,