mirror of
https://github.com/wismna/ModernKeePass.git
synced 2025-10-03 15:40:18 -04:00
Added lots of commands
Simplified KeePass client
This commit is contained in:
@@ -1,6 +1,8 @@
|
||||
using MediatR;
|
||||
using AutoMapper;
|
||||
using MediatR;
|
||||
using ModernKeePass.Application.Common.Interfaces;
|
||||
using ModernKeePass.Application.Database.Models;
|
||||
using ModernKeePass.Application.Group.Models;
|
||||
|
||||
namespace ModernKeePass.Application.Database.Queries.GetDatabase
|
||||
{
|
||||
@@ -9,10 +11,12 @@ namespace ModernKeePass.Application.Database.Queries.GetDatabase
|
||||
public class GetDatabaseQueryHandler : IRequestHandler<GetDatabaseQuery, DatabaseVm>
|
||||
{
|
||||
private readonly IDatabaseProxy _databaseProxy;
|
||||
private readonly IMapper _mapper;
|
||||
|
||||
public GetDatabaseQueryHandler(IDatabaseProxy databaseProxy)
|
||||
public GetDatabaseQueryHandler(IDatabaseProxy databaseProxy, IMapper mapper)
|
||||
{
|
||||
_databaseProxy = databaseProxy;
|
||||
_mapper = mapper;
|
||||
}
|
||||
|
||||
public DatabaseVm Handle(GetDatabaseQuery request)
|
||||
@@ -20,7 +24,13 @@ namespace ModernKeePass.Application.Database.Queries.GetDatabase
|
||||
var database = new DatabaseVm
|
||||
{
|
||||
IsOpen = _databaseProxy.IsOpen,
|
||||
Name = _databaseProxy.Name
|
||||
Name = _databaseProxy.Name,
|
||||
RootGroup = _mapper.Map<GroupVm>(_databaseProxy.RootGroup),
|
||||
IsRecycleBinEnabled = _databaseProxy.IsRecycleBinEnabled,
|
||||
RecycleBinId = _databaseProxy.RecycleBinId,
|
||||
Compression = _databaseProxy.Compression,
|
||||
CipherId = _databaseProxy.CipherId,
|
||||
KeyDerivationId = _databaseProxy.CipherId
|
||||
};
|
||||
return database;
|
||||
}
|
||||
|
@@ -1,9 +1,7 @@
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using System.Threading.Tasks;
|
||||
using AutoMapper;
|
||||
using MediatR;
|
||||
using ModernKeePass.Application.Common.Interfaces;
|
||||
using ModernKeePass.Application.Database.Models;
|
||||
using ModernKeePass.Application.Database.Queries.IsDatabaseOpen;
|
||||
using ModernKeePass.Application.Group.Models;
|
||||
using ModernKeePass.Domain.Dtos;
|
||||
@@ -11,12 +9,12 @@ using ModernKeePass.Domain.Exceptions;
|
||||
|
||||
namespace ModernKeePass.Application.Database.Queries.OpenDatabase
|
||||
{
|
||||
public class OpenDatabaseQuery: IRequest<DatabaseVm>
|
||||
public class OpenDatabaseQuery: IRequest<GroupVm>
|
||||
{
|
||||
public FileInfo FileInfo { get; set; }
|
||||
public Credentials Credentials { get; set; }
|
||||
|
||||
public class OpenDatabaseQueryHandler : IAsyncRequestHandler<OpenDatabaseQuery, DatabaseVm>
|
||||
public class OpenDatabaseQueryHandler : IAsyncRequestHandler<OpenDatabaseQuery, GroupVm>
|
||||
{
|
||||
private readonly IMapper _mapper;
|
||||
private readonly IMediator _mediator;
|
||||
@@ -29,19 +27,13 @@ namespace ModernKeePass.Application.Database.Queries.OpenDatabase
|
||||
_databaseProxy = databaseProxy;
|
||||
}
|
||||
|
||||
public async Task<DatabaseVm> Handle(OpenDatabaseQuery request)
|
||||
public async Task<GroupVm> Handle(OpenDatabaseQuery request)
|
||||
{
|
||||
var isDatabaseOpen = await _mediator.Send(new IsDatabaseOpenQuery());
|
||||
if (isDatabaseOpen) throw new DatabaseOpenException();
|
||||
|
||||
var database = await _databaseProxy.Open(request.FileInfo, request.Credentials);
|
||||
var databaseVm = new DatabaseVm
|
||||
{
|
||||
IsOpen = true,
|
||||
Name = database.Name,
|
||||
RootGroup = _mapper.Map<GroupVm>(database.RootGroupEntity)
|
||||
};
|
||||
return databaseVm;
|
||||
var rootGroup = await _databaseProxy.Open(request.FileInfo, request.Credentials);
|
||||
return _mapper.Map<GroupVm>(rootGroup);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -0,0 +1,36 @@
|
||||
using System.Threading.Tasks;
|
||||
using AutoMapper;
|
||||
using MediatR;
|
||||
using ModernKeePass.Application.Common.Interfaces;
|
||||
using ModernKeePass.Application.Database.Queries.IsDatabaseOpen;
|
||||
using ModernKeePass.Application.Group.Models;
|
||||
using ModernKeePass.Domain.Exceptions;
|
||||
|
||||
namespace ModernKeePass.Application.Database.Queries.ReOpenDatabase
|
||||
{
|
||||
public class ReOpenDatabaseQuery: IRequest<GroupVm>
|
||||
{
|
||||
public class ReOpenDatabaseQueryHandler : IAsyncRequestHandler<ReOpenDatabaseQuery, GroupVm>
|
||||
{
|
||||
private readonly IMapper _mapper;
|
||||
private readonly IMediator _mediator;
|
||||
private readonly IDatabaseProxy _databaseProxy;
|
||||
|
||||
public ReOpenDatabaseQueryHandler(IMapper mapper, IMediator mediator, IDatabaseProxy databaseProxy)
|
||||
{
|
||||
_mapper = mapper;
|
||||
_mediator = mediator;
|
||||
_databaseProxy = databaseProxy;
|
||||
}
|
||||
|
||||
public async Task<GroupVm> Handle(ReOpenDatabaseQuery request)
|
||||
{
|
||||
var isDatabaseOpen = await _mediator.Send(new IsDatabaseOpenQuery());
|
||||
if (!isDatabaseOpen) throw new DatabaseClosedException();
|
||||
|
||||
var rootGroup = await _databaseProxy.ReOpen();
|
||||
return _mapper.Map<GroupVm>(rootGroup);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user