From f30ee9fe70cb39e51c8277ef5c1d1dfa16848bbb Mon Sep 17 00:00:00 2001
From: TheXamlGuy <dan_clark@outlook.com>
Date: Tue, 23 Jul 2024 18:20:58 +0100
Subject: [PATCH] prevent dup wallets

---
 Wallet.Avalonia/CreateWalletView.axaml | 11 ++++--
 Wallet/CreateWalletHandler.cs          | 47 +++++++++++++++-----------
 Wallet/CreateWalletViewModel.cs        | 13 +++++--
 Wallet/OpenWalletViewModel.cs          |  6 ++--
 4 files changed, 49 insertions(+), 28 deletions(-)

diff --git a/Wallet.Avalonia/CreateWalletView.axaml b/Wallet.Avalonia/CreateWalletView.axaml
index 5ad551b..f778515 100644
--- a/Wallet.Avalonia/CreateWalletView.axaml
+++ b/Wallet.Avalonia/CreateWalletView.axaml
@@ -60,7 +60,7 @@
             Width="400"
             Margin="0,-24,0,0"
             IsEnabled="{Binding !IsActive}"
-            Spacing="18">
+            Spacing="16">
             <Grid HorizontalAlignment="Center">
                 <PersonPicture
                     Width="{StaticResource PersonPictureSize}"
@@ -100,16 +100,21 @@
                 </DropDownButton>
             </Grid>
             <StackPanel>
-                <TextBlock Margin="0,0,0,6" Text="Name" />
+                <TextBlock Margin="0,0,0,8" Text="Name" />
                 <TextBox Text="{Binding Name}" Watermark="e.g. Personal" />
             </StackPanel>
             <StackPanel>
-                <TextBlock Margin="0,0,0,6" Text="Password" />
+                <TextBlock Margin="0,0,0,8" Text="Password" />
                 <TextBox
                     Classes="revealPasswordButton"
                     PasswordChar="&#x25CF;"
                     Text="{Binding Password}" />
             </StackPanel>
+            <InfoBar
+                IsClosable="False"
+                IsOpen="{Binding Validation.Errors[Name], Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
+                Message="{Binding Validation.Errors[Name]}"
+                Severity="Error" />
         </StackPanel>
         <ProgressRing
             Width="48"
diff --git a/Wallet/CreateWalletHandler.cs b/Wallet/CreateWalletHandler.cs
index 7a3a911..8d25fea 100644
--- a/Wallet/CreateWalletHandler.cs
+++ b/Wallet/CreateWalletHandler.cs
@@ -4,36 +4,45 @@ using Toolkit.Foundation;
 
 namespace Wallet;
 
-public class CreateWalletHandler(IWalletHostFactory componentFactory,
+public class CreateWalletHandler(IHostEnvironment environment,
+    IWalletHostFactory componentFactory,
     IWalletHostCollection wallets,
     IPublisher publisher) :
-    IHandler<CreateEventArgs<Wallet<(string, string, IImageDescriptor?)>>, bool>
+    IHandler<CreateEventArgs<Wallet<(string, string, IImageDescriptor?)>>, Result>
 {
-    public async Task<bool> Handle(CreateEventArgs<Wallet<(string, string, IImageDescriptor?)>> args,
+    public async Task<Result> Handle(CreateEventArgs<Wallet<(string, string, IImageDescriptor?)>> args,
         CancellationToken cancellationToken)
     {
-        if (args.Sender is Wallet<(string, string, IImageDescriptor?)> wallet)
+        if (args.Sender is not Wallet<(string, string, IImageDescriptor?)> wallet)
         {
-            (string name, string password, IImageDescriptor? imageDescriptor) = wallet.Value;
+            return Result.Failure(Error.Failure);
+        }
 
-            if (name is { Length: > 0 } &&
-                password is { Length: > 0 })
+        (string name, string password, IImageDescriptor? imageDescriptor) = wallet.Value;
+        name = name.Trim();
+
+        if (Directory.Exists(Path.Combine(environment.ContentRootPath, "Wallet", name)))
+        {
+            return Result.Failure(Error.Duplicated);
+        }
+
+        if (string.IsNullOrEmpty(name) || string.IsNullOrEmpty(password))
+        {
+            return Result.Failure(Error.Null);
+        }
+
+        if (componentFactory.Create(name) is IComponentHost host)
+        {
+            IWalletFactory walletFactory = host.Services.GetRequiredService<IWalletFactory>();
+            if (await walletFactory.Create(name, password, imageDescriptor))
             {
-                if (componentFactory.Create(name) is IComponentHost host)
-                {
-                    IWalletFactory walletFactory = host.Services.GetRequiredService<IWalletFactory>();
-                    if (await walletFactory.Create(name, password, imageDescriptor))
-                    {
-                        wallets.Add(host);
-                        host.Start();
+                wallets.Add(host);
+                host.Start();
 
-                        publisher.Publish(Activated.As(new Wallet<IComponentHost>(host)));
-                        return true;
-                    }
-                }
+                publisher.Publish(Activated.As(new Wallet<IComponentHost>(host)));
             }
         }
 
-        return false;
+        return Result.Success();
     }
 }
\ No newline at end of file
diff --git a/Wallet/CreateWalletViewModel.cs b/Wallet/CreateWalletViewModel.cs
index c371165..5655090 100644
--- a/Wallet/CreateWalletViewModel.cs
+++ b/Wallet/CreateWalletViewModel.cs
@@ -50,8 +50,15 @@ public partial class CreateWalletViewModel :
     {
         using (await new ActivityLock(this))
         {
-            IsConfirmed = await Mediator.Handle<CreateEventArgs<Wallet<(string, string, IImageDescriptor?)>>,
-                bool>(Create.As(new Wallet<(string, string, IImageDescriptor?)>((Name, Password, ImageDescriptor))));
+            if (await Mediator.Handle<CreateEventArgs<Wallet<(string, string, IImageDescriptor?)>>,
+                Result>(Create.As(new Wallet<(string, string, IImageDescriptor?)>((Name, Password, ImageDescriptor)))) is Result result)
+            {
+                if (await Validation.Validate(() => Name, [new ValidationRule(() => result.Error != Error.Duplicated, 
+                    "This wallet name already exist.")]))
+                {
+                    IsConfirmed = true;
+                }
+            }
 
             return IsConfirmed;
         }
@@ -68,7 +75,7 @@ public partial class CreateWalletViewModel :
     {
         if (args.PropertyName is string name)
         {
-            _ = Validation.Validate(name);
+            Validation.Validate(name);
         }
 
         base.OnPropertyChanged(args);
diff --git a/Wallet/OpenWalletViewModel.cs b/Wallet/OpenWalletViewModel.cs
index f5e1ff3..3867111 100644
--- a/Wallet/OpenWalletViewModel.cs
+++ b/Wallet/OpenWalletViewModel.cs
@@ -42,9 +42,9 @@ public partial class OpenWalletViewModel :
     {
         using (await new ActivityLock(this))
         {
-            if (await Validation.Validate(() => Password, [new ValidationRule(async () =>
-                await Mediator.Handle<OpenEventArgs<Wallet<string>>, bool>(Open.As(new Wallet<string>(Password))),
-                    "The password is incorrect, please try again.")]))
+            bool result = await Mediator.Handle<OpenEventArgs<Wallet<string>>, bool>(Open.As(new Wallet<string>(Password)));
+            if (await Validation.Validate(() => Password, [new ValidationRule(() => result,
+                "The password is incorrect, please try again.")]))
             {
                 Publisher.Publish(Opened.As<Wallet>());
             }