Quick fixes

aimenux · Aug 8, 2023 · 0fc5e1e · 0fc5e1e
1 parent 88b42e3
commit 0fc5e1e
Show file tree

Hide file tree

Showing 6 changed files with 168 additions and 169 deletions.
diff --git a/src/App/Commands/EccCommand.cs b/src/App/Commands/EccCommand.cs
@@ -13,24 +13,23 @@ public class EccCommand : PfxCommand
     public EccCommand(ICertificateService certificateService, IConsoleService consoleService) : base(certificateService, consoleService)
     {
         CertificateFile = $"ECC-{DateTime.Now:yyyyMMddTHHmmss}.pfx";
-        KeySize = KeySizes.First();
+        KeySize = KeySizes[0];
     }
 
     protected override void Execute(CommandLineApplication app)
     {
-        var parameters = new PfxParameters
-        {
-            DnsName = DnsName,
-            KeySize = KeySize,
-            ValidityInYears = ValidityInYears,
-            CertificateFile = CertificateFile,
-            CertificatePassword = CertificatePassword,
-            OutputDirectory = OutputDirectory,
-            PfxType = PfxType.Ecc
-        };
-
         ConsoleService.RenderStatus(() =>
         {
+            var parameters = new PfxParameters
+            {
+                DnsName = DnsName,
+                KeySize = KeySize,
+                ValidityInYears = ValidityInYears,
+                CertificateFile = CertificateFile,
+                CertificatePassword = CertificatePassword,
+                OutputDirectory = OutputDirectory,
+                PfxType = PfxType.Ecc
+            };
             CertificateService.GenerateEcc(parameters);
             ConsoleService.RenderPfx(parameters);
         });

diff --git a/src/App/Commands/JwkCommand.cs b/src/App/Commands/JwkCommand.cs
@@ -30,16 +30,18 @@ public JwkCommand(ICertificateService certificateService, IConsoleService consol
 
     protected override void Execute(CommandLineApplication app)
     {
-        var parameters = new JwkParameters
+        ConsoleService.RenderStatus(() =>
         {
-            KeyId = KeyId,
-            KeyUse = KeyUse,
-            CertificateFile = CertificateFile,
-            CertificatePassword = CertificatePassword
-        };
-
-        var jwk = _certificateService.GenerateJwk(parameters);
-        ConsoleService.RenderJwk(parameters, jwk);
-        ConsoleService.CopyTextToClipboard(jwk);
+            var parameters = new JwkParameters
+            {
+                KeyId = KeyId,
+                KeyUse = KeyUse,
+                CertificateFile = CertificateFile,
+                CertificatePassword = CertificatePassword
+            };
+            var jwk = _certificateService.GenerateJwk(parameters);
+            ConsoleService.RenderJwk(parameters, jwk);
+            ConsoleService.CopyTextToClipboard(jwk);
+        });
     }
 }
diff --git a/src/App/Commands/RsaCommand.cs b/src/App/Commands/RsaCommand.cs
@@ -13,24 +13,23 @@ public class RsaCommand : PfxCommand
     public RsaCommand(ICertificateService certificateService, IConsoleService consoleService) : base(certificateService, consoleService)
     {
         CertificateFile = $"RSA-{DateTime.Now:yyyyMMddTHHmmss}.pfx";
-        KeySize = KeySizes.First();
+        KeySize = KeySizes[0];
     }
 
     protected override void Execute(CommandLineApplication app)
     {
-        var parameters = new PfxParameters
-        {
-            DnsName = DnsName,
-            KeySize = KeySize,
-            ValidityInYears = ValidityInYears,
-            CertificateFile = CertificateFile,
-            CertificatePassword = CertificatePassword,
-            OutputDirectory = OutputDirectory,
-            PfxType = PfxType.Rsa
-        };
-
         ConsoleService.RenderStatus(() =>
         {
+            var parameters = new PfxParameters
+            {
+                DnsName = DnsName,
+                KeySize = KeySize,
+                ValidityInYears = ValidityInYears,
+                CertificateFile = CertificateFile,
+                CertificatePassword = CertificatePassword,
+                OutputDirectory = OutputDirectory,
+                PfxType = PfxType.Rsa
+            };
             CertificateService.GenerateRsa(parameters);
             ConsoleService.RenderPfx(parameters);
         });

diff --git a/src/App/Extensions/FluentValidationExtensions.cs b/src/App/Extensions/FluentValidationExtensions.cs
@@ -13,21 +13,21 @@ public static IRuleBuilderOptions<T, TProperty> Required<T, TProperty>(this IRul
         return ruleBuilder
             .NotNull()
             .NotEmpty()
-            .WithMessage("{PropertyName} is required.");
+            .WithMessage("'{PropertyName}' is required.");
     }
 
     public static IRuleBuilderOptions<T, string> FileExists<T>(this IRuleBuilder<T, string> ruleBuilder)
     {
         return ruleBuilder
             .Must<T, string>((Func<T, string, bool>) ((x, val) => File.Exists(val)))
-            .WithMessage("File {PropertyName} does not exist.");
+            .WithMessage("File '{PropertyValue}' does not exist.");
     }
 
     public static IRuleBuilderOptions<T, string> DirectoryExists<T>(this IRuleBuilder<T, string> ruleBuilder)
     {
         return ruleBuilder
             .Must<T, string>((Func<T, string, bool>) ((x, val) => Directory.Exists(val)))
-            .WithMessage("Directory {PropertyName} does not exist.");
+            .WithMessage("Directory '{PropertyValue}' does not exist.");
     }
 
     public static IRuleBuilderOptions<T, TProperty> In<T, TProperty>(this IRuleBuilder<T, TProperty> ruleBuilder, params TProperty[] values)
@@ -39,6 +39,6 @@ public static IRuleBuilderOptions<T, TProperty> In<T, TProperty>(this IRuleBuild
 
         return ruleBuilder
             .Must(values.Contains)
-            .WithMessage($"{{PropertyName}} must be one of these values '{string.Join(",", values)}'.");
+            .WithMessage($"'{{PropertyName}}' must be one of these values '{string.Join(",", values)}'.");
     }
 }