More queries/commands

This commit is contained in:
Geoffroy BONNEVILLE
2020-03-26 15:38:29 +01:00
parent a17d6b05ae
commit 903e7649e4
10 changed files with 118 additions and 29 deletions

View File

@@ -67,6 +67,7 @@
<Compile Include="Database\Queries\OpenDatabase\OpenDatabaseQueryValidator.cs" />
<Compile Include="Database\Queries\ReOpenDatabase\ReOpenDatabaseQuery.cs" />
<Compile Include="DependencyInjection.cs" />
<Compile Include="Entry\Commands\SetFieldValue\SetFieldValueCommand.cs" />
<Compile Include="Entry\Models\EntryVm.cs" />
<Compile Include="Group\Commands\AddEntry\AddEntryCommand.cs" />
<Compile Include="Group\Commands\AddGroup\AddGroupCommand.cs" />
@@ -80,25 +81,22 @@
<Compile Include="Group\Commands\SortGroups\SortGroupsCommand.cs" />
<Compile Include="Group\Models\GroupVm.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Resources\Queries\GetResourceQuery.cs" />
<Content Include="Services\CryptographyService.cs" />
<Content Include="Services\DatabaseService.cs" />
<Content Include="Services\FileService.cs" />
<Content Include="Services\ImportService.cs" />
<Content Include="Services\RecentService.cs" />
<Content Include="Services\ResourceService.cs" />
<Content Include="Services\SecurityService.cs" />
<Content Include="Services\SettingsService.cs" />
</ItemGroup>
<ItemGroup>
<Folder Include="Entry\Commands\SetFieldValue\" />
<Folder Include="Entry\Queries\GetEntry\" />
<Folder Include="Group\Commands\UpdateGroup\" />
<Folder Include="Group\Queries\GetGroup\" />
<Folder Include="Parameters\Commands\SetCipher\" />
<Folder Include="Parameters\Commands\SetCompression\" />
<Folder Include="Parameters\Commands\SetKeyDerivation\" />
<Folder Include="Resources\Commands\" />
<Folder Include="Resources\Queries\" />
<Folder Include="Settings\" />
</ItemGroup>
<ItemGroup>

View File

@@ -26,8 +26,8 @@ namespace ModernKeePass.Application.Common.Interfaces
Task AddEntry(string parentGroupId, string entryId);
Task AddGroup(string parentGroupId, string groupId);
Task UpdateEntry(string entryId);
Task UpdateGroup(string groupId);
void UpdateEntry(string entryId, string fieldName, string fieldValue);
void UpdateGroup(string groupId);
Task RemoveEntry(string parentGroupId, string entryId);
Task RemoveGroup(string parentGroupId, string groupId);
EntryEntity CreateEntry(string parentGroupId);

View File

@@ -0,0 +1,35 @@
using System.Threading.Tasks;
using MediatR;
using ModernKeePass.Application.Common.Interfaces;
using ModernKeePass.Application.Database.Queries.IsDatabaseOpen;
using ModernKeePass.Domain.Exceptions;
namespace ModernKeePass.Application.Entry.Commands.SetFieldValue
{
public class SetFieldValueCommand : IRequest
{
public string EntryId { get; set; }
public string FieldName { get; set; }
public string FieldValue { get; set; }
public class SetFieldValueCommandHandler : IAsyncRequestHandler<SetFieldValueCommand>
{
private readonly IDatabaseProxy _database;
private readonly IMediator _mediator;
public SetFieldValueCommandHandler(IDatabaseProxy database, IMediator mediator)
{
_database = database;
_mediator = mediator;
}
public async Task Handle(SetFieldValueCommand message)
{
var isDatabaseOpen = await _mediator.Send(new IsDatabaseOpenQuery());
if (!isDatabaseOpen) throw new DatabaseClosedException();
_database.UpdateEntry(message.EntryId, message.FieldName, message.FieldValue);
}
}
}
}

View File

@@ -0,0 +1,23 @@
using MediatR;
using ModernKeePass.Application.Common.Interfaces;
namespace ModernKeePass.Application.Resources.Queries
{
public class GetResourceQuery: IRequest<string>
{
public string Key { get; set; }
public class GetResourceQueryHandler: IRequestHandler<GetResourceQuery, string>
{
private readonly IResourceProxy _resourceProxy;
public GetResourceQueryHandler(IResourceProxy resourceProxy)
{
_resourceProxy = resourceProxy;
}
public string Handle(GetResourceQuery message)
{
return _resourceProxy.GetResourceValue(message.Key);
}
}
}
}

View File

@@ -1,20 +0,0 @@
using ModernKeePass.Application.Common.Interfaces;
using ModernKeePass.Domain.Interfaces;
namespace ModernKeePass.Application.Services
{
public class ResourceService: IResourceService
{
private readonly IResourceProxy _resourceProxy;
public ResourceService(IResourceProxy resourceProxy)
{
_resourceProxy = resourceProxy;
}
public string GetResourceValue(string key)
{
return _resourceProxy.GetResourceValue(key);
}
}
}

View File

@@ -47,6 +47,7 @@
<Compile Include="Entities\EntryEntity.cs" />
<Compile Include="Entities\GroupEntity.cs" />
<Compile Include="Enums\CredentialStatusTypes.cs" />
<Compile Include="Enums\EntryFieldName.cs" />
<Compile Include="Enums\Icon.cs" />
<Compile Include="Enums\ImportFormat.cs" />
<Compile Include="Exceptions\DatabaseClosedException.cs" />

View File

@@ -0,0 +1,14 @@
namespace ModernKeePass.Domain.Enums
{
public class EntryFieldName
{
public const string Title = nameof(Title);
public const string UserName = nameof(UserName);
public const string Password = nameof(Password);
public const string Url = nameof(Url);
public const string Notes = nameof(Notes);
public const string Icon = nameof(Icon);
public const string ExpirationDate = nameof(ExpirationDate);
public const string HasExpirationDate = nameof(HasExpirationDate);
}
}

View File

@@ -44,6 +44,7 @@
<Compile Include="DependencyInjection.cs" />
<Compile Include="InfrastructureModule.cs" />
<Compile Include="File\CsvImportFormat.cs" />
<Compile Include="KeePass\EntryFieldMapper.cs" />
<Compile Include="KeePass\EntryMappingProfile.cs" />
<Compile Include="KeePass\GroupMappingProfile.cs" />
<Compile Include="KeePass\IconMapper.cs" />

View File

@@ -0,0 +1,33 @@
using ModernKeePass.Domain.Enums;
using ModernKeePassLib;
namespace ModernKeePass.Infrastructure.KeePass
{
public static class EntryFieldMapper
{
public static string MapPwDefsToField(string value)
{
switch (value)
{
case PwDefs.TitleField: return EntryFieldName.Title;
case PwDefs.UserNameField: return EntryFieldName.UserName;
case PwDefs.PasswordField: return EntryFieldName.Password;
case PwDefs.NotesField: return EntryFieldName.Notes;
case PwDefs.UrlField: return EntryFieldName.Url;
default: return value;
}
}
public static string MapFieldToPwDef(string value)
{
switch (value)
{
case EntryFieldName.Title: return PwDefs.TitleField;
case EntryFieldName.UserName: return PwDefs.UserNameField;
case EntryFieldName.Password: return PwDefs.PasswordField;
case EntryFieldName.Notes: return PwDefs.NotesField;
case EntryFieldName.Url: return PwDefs.UrlField;
default: return value;
}
}
}
}

View File

@@ -10,6 +10,7 @@ using ModernKeePassLib;
using ModernKeePassLib.Cryptography.KeyDerivation;
using ModernKeePassLib.Interfaces;
using ModernKeePassLib.Keys;
using ModernKeePassLib.Security;
using ModernKeePassLib.Serialization;
using ModernKeePassLib.Utility;
@@ -196,12 +197,15 @@ namespace ModernKeePass.Infrastructure.KeePass
});
}
public Task UpdateEntry(string entry)
public void UpdateEntry(string entryId, string fieldName, string fieldValue)
{
throw new NotImplementedException();
var pwEntry = _pwDatabase.RootGroup.FindEntry(BuildIdFromString(entryId), true);
pwEntry.Touch(true);
pwEntry.CreateBackup(null);
pwEntry.Strings.Set(EntryFieldMapper.MapFieldToPwDef(fieldName), new ProtectedString(true, fieldValue));
}
public Task UpdateGroup(string group)
public void UpdateGroup(string group)
{
throw new NotImplementedException();
}