Add validation extensions

aimenux · Aug 6, 2023 · 37dd825 · 37dd825
1 parent 157f7fe
commit 37dd825
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 16 deletions.
diff --git a/global.json b/global.json
@@ -0,0 +1,5 @@
+{
+    "sdk": {
+      "allowPrerelease": false
+    }
+}
diff --git a/src/App/Extensions/FluentValidationExtensions.cs b/src/App/Extensions/FluentValidationExtensions.cs
@@ -0,0 +1,23 @@
+using FluentValidation;
+
+namespace App.Extensions;
+
+public static class FluentValidationExtensions
+{
+    public static IRuleBuilderOptions<T, TProperty> Required<T, TProperty>(this IRuleBuilderInitial<T, TProperty> ruleBuilder)
+    {
+        DefaultValidatorOptions.Configurable(ruleBuilder).CascadeMode = CascadeMode.Stop;
+
+        return ruleBuilder
+            .NotNull()
+            .NotEmpty()
+            .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.");
+    }
+}
diff --git a/src/App/Validators/JwtDecodeCommandValidator.cs b/src/App/Validators/JwtDecodeCommandValidator.cs
@@ -1,4 +1,5 @@
 using App.Commands;
+using App.Extensions;
 using FluentValidation;
 
 namespace App.Validators;
@@ -8,6 +9,6 @@ public class JwtDecodeCommandValidator : AbstractValidator<JwtDecodeCommand>
     public JwtDecodeCommandValidator()
     {
         RuleFor(x => x.Token)
-            .NotEmpty();
+            .Required();
     }
 }
diff --git a/src/App/Validators/JwtGenerateCommandValidator.cs b/src/App/Validators/JwtGenerateCommandValidator.cs
@@ -14,18 +14,16 @@ public JwtGenerateCommandValidator()
         When(x => string.IsNullOrWhiteSpace(x.ParametersFile), () =>
             {
                 RuleFor(x => x.Certificate)
-                    .Cascade(CascadeMode.Stop)
-                    .NotEmpty()
-                    .Must(File.Exists).WithMessage("File '{PropertyValue}' does not exist.");
+                    .Required()
+                    .FileExists();
                 RuleFor(x => x.Password)
-                    .NotEmpty();
+                    .Required();
             })
             .Otherwise(() =>
             {
                 RuleFor(x => x.ParametersFile)
-                    .Cascade(CascadeMode.Stop)
-                    .NotEmpty()
-                    .Must(File.Exists);
+                    .Required()
+                    .FileExists();
             });
     }
 }
diff --git a/src/App/Validators/JwtValidateCommandValidator.cs b/src/App/Validators/JwtValidateCommandValidator.cs
@@ -1,4 +1,5 @@
 using App.Commands;
+using App.Extensions;
 using FluentValidation;
 
 namespace App.Validators;
@@ -8,23 +9,21 @@ public class JwtValidateCommandValidator : AbstractValidator<JwtValidateCommand>
     public JwtValidateCommandValidator()
     {
         RuleFor(x => x.Token)
-            .NotEmpty();
+            .Required();
 
         When(x => string.IsNullOrWhiteSpace(x.ParametersFile), () =>
             {
                 RuleFor(x => x.Certificate)
-                    .Cascade(CascadeMode.Stop)
-                    .NotEmpty()
-                    .Must(File.Exists).WithMessage("File '{PropertyValue}' does not exist.");
+                    .Required()
+                    .FileExists();
                 RuleFor(x => x.Password)
-                    .NotEmpty();
+                    .Required();
             })
             .Otherwise(() =>
             {
                 RuleFor(x => x.ParametersFile)
-                    .Cascade(CascadeMode.Stop)
-                    .NotEmpty()
-                    .Must(File.Exists);
+                    .Required()
+                    .FileExists();
             });
     }
 }