Merge branch 'develop'

benmccallum · Jan 24, 2021 · 720d1f3 · 720d1f3
2 parents a265376 + fa130f7
commit 720d1f3
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 25 deletions.
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -17,7 +17,7 @@
     <PackageIconUrl>https://github.com/benmccallum/fairybread/raw/master/logo-400x400.png</PackageIconUrl>
     <PackageLicenseUrl>https://github.com/benmccallum/fairybread/blob/master/LICENSE</PackageLicenseUrl>
 
-    <Version>3.0.0</Version>
+    <Version>3.0.1</Version>
 
     <HotChocolateVersion>11.0.0</HotChocolateVersion>
 

diff --git a/src/FairyBread.Tests/FairyBread.Tests.csproj b/src/FairyBread.Tests/FairyBread.Tests.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>$(TestTargetFrameworks)</TargetFrameworks>
+    <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

diff --git a/src/FairyBread.Tests/InputValidationMiddlewareTests.Ignores_Null_Argument_Value.verified.txt b/src/FairyBread.Tests/InputValidationMiddlewareTests.Ignores_Null_Argument_Value.verified.txt
@@ -0,0 +1,5 @@
+{
+  Data: {
+    read: 'SomeInteger: 1, SomeString: hello; '
+  }
+}
diff --git a/src/FairyBread.Tests/InputValidationMiddlewareTests.cs b/src/FairyBread.Tests/InputValidationMiddlewareTests.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using FluentValidation;
 using HotChocolate;
@@ -59,6 +60,49 @@ public async Task Query_Works(CaseData caseData)
             await Verifier.Verify(result, verifySettings);
         }
 
+
+        [Theory]
+        [MemberData(nameof(Cases))]
+        public async Task Mutation_Works(CaseData caseData)
+        {
+            // Arrange
+            var executor = await GetRequestExecutorAsync();
+
+            var query = "mutation { write(foo: " + caseData.FooInput + ", bar: " + caseData.BarInput + ") }";
+
+            // Act
+            var result = await executor.ExecuteAsync(query);
+
+            // Assert
+            var verifySettings = new VerifySettings();
+            verifySettings.UseParameters(caseData);
+            await Verifier.Verify(result, verifySettings);
+        }
+
+        [Fact]
+        public async Task Ignores_Null_Argument_Value()
+        {
+            // Arrange
+            var caseData = (CaseData)Cases().First()[0];
+            var executor = await GetRequestExecutorAsync(options =>
+            {
+                options.ShouldValidate = (ctx, arg) => ctx.Operation.Operation == OperationType.Query;
+            });
+
+            var query = "query { read(foo: " + caseData.FooInput + ") }";
+
+            // Act
+            var result = await executor.ExecuteAsync(query);
+
+            // Assert
+            var verifySettings = new VerifySettings();
+            await Verifier.Verify(result, verifySettings);
+        }
+
+
+        // TODO: Unit tests for:
+        // - cancellation
+
         public static IEnumerable<object[]> Cases()
         {
             var caseId = 1;
@@ -98,30 +142,9 @@ public CaseData(int caseId, string fooInput, string barInput)
             }
         }
 
-        [Theory]
-        [MemberData(nameof(Cases))]
-        public async Task Mutation_Works(CaseData caseData)
-        {
-            // Arrange
-            var executor = await GetRequestExecutorAsync();
-
-            var query = "mutation { write(foo: " + caseData.FooInput + ", bar: " + caseData.BarInput + ") }";
-
-            // Act
-            var result = await executor.ExecuteAsync(query);
-
-            // Assert
-            var verifySettings = new VerifySettings();
-            verifySettings.UseParameters(caseData);
-            await Verifier.Verify(result, verifySettings);
-        }
-
-        // TODO: Unit tests for:
-        // - cancellation
-
         public class QueryType
         {
-            public string Read(FooInputDto foo, BarInputDto bar) => $"{foo}; {bar}";
+            public string Read(FooInputDto foo, BarInputDto? bar) => $"{foo}; {bar}";
         }
 
         public class MutationType

diff --git a/src/FairyBread/FairyBread.csproj b/src/FairyBread/FairyBread.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>$(LibraryTargetFrameworks)</TargetFrameworks>
     <Description>Input validation for HotChocolate</Description>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/FairyBread/IFairyBreadOptions.cs b/src/FairyBread/IFairyBreadOptions.cs
@@ -16,7 +16,8 @@ public interface IFairyBreadOptions
         /// <summary>
         /// Function used to determine if an argument should be validated by
         /// FairyBread's <see cref="InputValidationMiddleware"/>.
-        /// The default implementation is <see cref="DefaultImplementations.ShouldValidate(IMiddlewareContext, Argument)"/>
+        /// The default implementation is
+        /// <see cref="DefaultImplementations.ShouldValidate(IMiddlewareContext, Argument)"/>
         /// </summary>
         Func<IMiddlewareContext, IInputField, bool> ShouldValidate { get; set; }
     }

diff --git a/src/FairyBread/InputValidationMiddleware.cs b/src/FairyBread/InputValidationMiddleware.cs
@@ -42,7 +42,12 @@ public async Task InvokeAsync(IMiddlewareContext context)
                 var resolvedValidators = _validatorProvider.GetValidators(context, argument);
                 try
                 {
-                    var value = context.ArgumentValue<object>(argument.Name);
+                    var value = context.ArgumentValue<object?>(argument.Name);
+                    if (value == null)
+                    {
+                        continue;
+                    }
+
                     foreach (var resolvedValidator in resolvedValidators)
                     {
                         var validationContext = new ValidationContext<object>(value);