Fixed Middleware Issues (#782)

ChilliCream · May 23, 2019 · 04e7d1a · 04e7d1a
1 parent e81aa18
commit 04e7d1a
Show file tree

Hide file tree

Showing 48 changed files with 1,007 additions and 291 deletions.
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -29,8 +29,8 @@
       }
     },
     {
-      "label": "build benchmarks",
-      "command": "dotnet build benchmarks /property:GenerateFullPaths=true",
+      "label": "build server",
+      "command": "dotnet build src/Server /property:GenerateFullPaths=true",
       "type": "shell",
       "presentation": {
         "reveal": "silent"

diff --git a/...pshots__/NullErrorPropagation.List_NonNullElementIsNull_nonnull_list_nonnull_element.snap b/...pshots__/NullErrorPropagation.List_NonNullElementIsNull_nonnull_list_nonnull_element.snap
@@ -6,7 +6,7 @@
   "Errors": [
     {
       "Message": "Cannot return null for non-nullable field.",
-      "Code": null,
+      "Code": "EXEC_NON_NULL_VIOLATION",
       "Path": [
         "foo",
         "nonnull_list_nonnull_element",
@@ -20,7 +20,9 @@
         }
       ],
       "Exception": null,
-      "Extensions": {}
+      "Extensions": {
+        "code": "EXEC_NON_NULL_VIOLATION"
+      }
     }
   ],
   "ContextData": {}

diff --git a/...shots__/NullErrorPropagation.List_NonNullElementIsNull_nonnull_list_nullable_element.snap b/...shots__/NullErrorPropagation.List_NonNullElementIsNull_nonnull_list_nullable_element.snap
@@ -10,7 +10,7 @@
   "Errors": [
     {
       "Message": "Cannot return null for non-nullable field.",
-      "Code": null,
+      "Code": "EXEC_NON_NULL_VIOLATION",
       "Path": [
         "foo",
         "nonnull_list_nullable_element",
@@ -24,7 +24,9 @@
         }
       ],
       "Exception": null,
-      "Extensions": {}
+      "Extensions": {
+        "code": "EXEC_NON_NULL_VIOLATION"
+      }
     }
   ],
   "ContextData": {}

diff --git a/...shots__/NullErrorPropagation.List_NonNullElementIsNull_nullable_list_nonnull_element.snap b/...shots__/NullErrorPropagation.List_NonNullElementIsNull_nullable_list_nonnull_element.snap
@@ -8,7 +8,7 @@
   "Errors": [
     {
       "Message": "Cannot return null for non-nullable field.",
-      "Code": null,
+      "Code": "EXEC_NON_NULL_VIOLATION",
       "Path": [
         "foo",
         "nullable_list_nonnull_element",
@@ -22,7 +22,9 @@
         }
       ],
       "Exception": null,
-      "Extensions": {}
+      "Extensions": {
+        "code": "EXEC_NON_NULL_VIOLATION"
+      }
     }
   ],
   "ContextData": {}

diff --git a/...hots__/NullErrorPropagation.List_NonNullElementIsNull_nullable_list_nullable_element.snap b/...hots__/NullErrorPropagation.List_NonNullElementIsNull_nullable_list_nullable_element.snap
@@ -10,7 +10,7 @@
   "Errors": [
     {
       "Message": "Cannot return null for non-nullable field.",
-      "Code": null,
+      "Code": "EXEC_NON_NULL_VIOLATION",
       "Path": [
         "foo",
         "nullable_list_nullable_element",
@@ -24,7 +24,9 @@
         }
       ],
       "Exception": null,
-      "Extensions": {}
+      "Extensions": {
+        "code": "EXEC_NON_NULL_VIOLATION"
+      }
     }
   ],
   "ContextData": {}

diff --git a/...tilities/__snapshots__/NullErrorPropagation.Object_NonNullElementIsNull_nonnull_prop.snap b/...tilities/__snapshots__/NullErrorPropagation.Object_NonNullElementIsNull_nonnull_prop.snap
@@ -6,7 +6,7 @@
   "Errors": [
     {
       "Message": "Cannot return null for non-nullable field.",
-      "Code": null,
+      "Code": "EXEC_NON_NULL_VIOLATION",
       "Path": [
         "foo",
         "nonnull_prop",
@@ -19,7 +19,9 @@
         }
       ],
       "Exception": null,
-      "Extensions": {}
+      "Extensions": {
+        "code": "EXEC_NON_NULL_VIOLATION"
+      }
     }
   ],
   "ContextData": {}

diff --git a/...ilities/__snapshots__/NullErrorPropagation.Object_NonNullElementIsNull_nullable_prop.snap b/...ilities/__snapshots__/NullErrorPropagation.Object_NonNullElementIsNull_nullable_prop.snap
@@ -8,7 +8,7 @@
   "Errors": [
     {
       "Message": "Cannot return null for non-nullable field.",
-      "Code": null,
+      "Code": "EXEC_NON_NULL_VIOLATION",
       "Path": [
         "foo",
         "nullable_prop",
@@ -21,7 +21,9 @@
         }
       ],
       "Exception": null,
-      "Extensions": {}
+      "Extensions": {
+        "code": "EXEC_NON_NULL_VIOLATION"
+      }
     }
   ],
   "ContextData": {}

diff --git a/src/Core/Core/Execution/ExecErrorCodes.cs b/src/Core/Core/Execution/ExecErrorCodes.cs
@@ -0,0 +1,7 @@
+namespace HotChocolate.Execution
+{
+    internal static class ExecErrorCodes
+    {
+        public const string NonNullViolation = "EXEC_NON_NULL_VIOLATION";
+    }
+}
diff --git a/src/Core/Core/Execution/ExecutionContext.cs b/src/Core/Core/Execution/ExecutionContext.cs
@@ -52,6 +52,7 @@ public ExecutionContext(
                 requestContext.ServiceScope.ServiceProvider);
         }
 
+
         public ISchema Schema { get; }
 
         public IRequestServiceScope ServiceScope =>

diff --git a/src/Core/Core/Execution/Utilities/DirectiveMiddlewareCompiler.cs b/src/Core/Core/Execution/Utilities/DirectiveMiddlewareCompiler.cs
@@ -155,7 +155,6 @@ private static FieldDelegate BuildComponent(
 
             for (int i = components.Count - 1; i >= 0; i--)
             {
-
                 DirectiveDelegate component = components[i].Invoke(next);
 
                 next = context =>

diff --git a/src/Core/Core/Execution/Utilities/ValueCompletion.cs b/src/Core/Core/Execution/Utilities/ValueCompletion.cs
@@ -196,8 +196,10 @@ private static void HandleNonNullViolation(
             {
                 if (!context.HasErrors)
                 {
-                    context.AddError(b => b.SetMessage(
-                        CoreResources.HandleNonNullViolation_Message));
+                    context.AddError(b => b
+                        .SetMessage(CoreResources
+                            .HandleNonNullViolation_Message)
+                        .SetCode(ExecErrorCodes.NonNullViolation));
                 }
 
                 context.IsViolatingNonNullType = true;

diff --git a/src/Core/Types.Tests/Types/DirectiveTypeTests.cs b/src/Core/Types.Tests/Types/DirectiveTypeTests.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using HotChocolate.Language;
+using HotChocolate.Resolvers;
 using HotChocolate.Types.Descriptors;
 using Snapshooter.Xunit;
 using Xunit;
@@ -279,6 +280,194 @@ public void Ignore_Argument2_Property()
             schema.ToString().MatchSnapshot();
         }
 
+        [Fact]
+        public void Use_DelegateMiddleware()
+        {
+            // arrange
+            // act
+            ISchema schema = SchemaBuilder.New()
+                .AddQueryType(c => c
+                    .Name("Query")
+                    .Directive("foo")
+                    .Field("foo")
+                    .Type<StringType>()
+                    .Resolver("bar"))
+                .AddDirectiveType(new DirectiveType<CustomDirective2>(d => d
+                    .Name("foo")
+                    .Location(DirectiveLocation.Object)
+                    .Use(next => context => Task.CompletedTask)))
+                .Create();
+
+            // assert
+            DirectiveType directive = schema.GetDirectiveType("foo");
+            Assert.Collection(directive.MiddlewareComponents,
+                t => Assert.NotNull(t));
+        }
+
+        [Fact]
+        public void Use_ClassMiddleware()
+        {
+            // arrange
+            // act
+            ISchema schema = SchemaBuilder.New()
+                .AddQueryType(c => c
+                    .Name("Query")
+                    .Directive("foo")
+                    .Field("foo")
+                    .Type<StringType>()
+                    .Resolver("bar"))
+                .AddDirectiveType(new DirectiveType<CustomDirective2>(d => d
+                    .Name("foo")
+                    .Location(DirectiveLocation.Object)
+                    .Use<DirectiveMiddleware>()))
+                .Create();
+
+            // assert
+            DirectiveType directive = schema.GetDirectiveType("foo");
+            Assert.Collection(directive.MiddlewareComponents,
+                t => Assert.NotNull(t));
+        }
+
+        [Fact]
+        public void Use_ClassMiddleware_WithFactory()
+        {
+            // arrange
+            // act
+            ISchema schema = SchemaBuilder.New()
+                .AddQueryType(c => c
+                    .Name("Query")
+                    .Directive("foo")
+                    .Field("foo")
+                    .Type<StringType>()
+                    .Resolver("bar"))
+                .AddDirectiveType(new DirectiveType<CustomDirective2>(d => d
+                    .Name("foo")
+                    .Location(DirectiveLocation.Object)
+                    .Use((sp, next) => new DirectiveMiddleware(next))))
+                .Create();
+
+            // assert
+            DirectiveType directive = schema.GetDirectiveType("foo");
+            Assert.Collection(directive.MiddlewareComponents,
+                t => Assert.NotNull(t));
+        }
+
+        [Fact]
+        public void Use_ClassMiddleware_WithFactoryNull_ArgumentNullException()
+        {
+            // arrange
+            // act
+            Action action = () => SchemaBuilder.New()
+                .AddQueryType(c => c
+                    .Name("Query")
+                    .Directive("foo")
+                    .Field("foo")
+                    .Type<StringType>()
+                    .Resolver("bar"))
+                .AddDirectiveType(new DirectiveType<CustomDirective2>(d => d
+                    .Name("foo")
+                    .Location(DirectiveLocation.Object)
+                    .Use(null)))
+                .Create();
+
+            // assert
+            Assert.Throws<SchemaException>(action);
+        }
+
+        [Fact]
+        public void Use2_DelegateMiddleware()
+        {
+            // arrange
+            // act
+            ISchema schema = SchemaBuilder.New()
+                .AddQueryType(c => c
+                    .Name("Query")
+                    .Directive("foo")
+                    .Field("foo")
+                    .Type<StringType>()
+                    .Resolver("bar"))
+                .AddDirectiveType(new DirectiveType(d => d
+                    .Name("foo")
+                    .Location(DirectiveLocation.Object)
+                    .Use(next => context => Task.CompletedTask)))
+                .Create();
+
+            // assert
+            DirectiveType directive = schema.GetDirectiveType("foo");
+            Assert.Collection(directive.MiddlewareComponents,
+                t => Assert.NotNull(t));
+        }
+
+        [Fact]
+        public void Use2_ClassMiddleware()
+        {
+            // arrange
+            // act
+            ISchema schema = SchemaBuilder.New()
+                .AddQueryType(c => c
+                    .Name("Query")
+                    .Directive("foo")
+                    .Field("foo")
+                    .Type<StringType>()
+                    .Resolver("bar"))
+                .AddDirectiveType(new DirectiveType(d => d
+                    .Name("foo")
+                    .Location(DirectiveLocation.Object)
+                    .Use<DirectiveMiddleware>()))
+                .Create();
+
+            // assert
+            DirectiveType directive = schema.GetDirectiveType("foo");
+            Assert.Collection(directive.MiddlewareComponents,
+                t => Assert.NotNull(t));
+        }
+
+        [Fact]
+        public void Use2_ClassMiddleware_WithFactory()
+        {
+            // arrange
+            // act
+            ISchema schema = SchemaBuilder.New()
+                .AddQueryType(c => c
+                    .Name("Query")
+                    .Directive("foo")
+                    .Field("foo")
+                    .Type<StringType>()
+                    .Resolver("bar"))
+                .AddDirectiveType(new DirectiveType(d => d
+                    .Name("foo")
+                    .Location(DirectiveLocation.Object)
+                    .Use((sp, next) => new DirectiveMiddleware(next))))
+                .Create();
+
+            // assert
+            DirectiveType directive = schema.GetDirectiveType("foo");
+            Assert.Collection(directive.MiddlewareComponents,
+                t => Assert.NotNull(t));
+        }
+
+        [Fact]
+        public void Use2_ClassMiddleware_WithFactoryNull_ArgumentNullException()
+        {
+            // arrange
+            // act
+            Action action = () => SchemaBuilder.New()
+                .AddQueryType(c => c
+                    .Name("Query")
+                    .Directive("foo")
+                    .Field("foo")
+                    .Type<StringType>()
+                    .Resolver("bar"))
+                .AddDirectiveType(new DirectiveType(d => d
+                    .Name("foo")
+                    .Location(DirectiveLocation.Object)
+                    .Use(null)))
+                .Create();
+
+            // assert
+            Assert.Throws<SchemaException>(action);
+        }
+
         public class CustomDirectiveType
             : DirectiveType<CustomDirective>
         {
@@ -292,6 +481,19 @@ protected override void Configure(
             }
         }
 
+        public class DirectiveMiddleware
+        {
+            private FieldDelegate _next;
+
+            public DirectiveMiddleware(FieldDelegate next)
+            {
+                _next = next;
+            }
+
+            public Task InvokeAsync(IDirectiveContext context) =>
+                Task.CompletedTask;
+        }
+
         public class CustomDirective
         {
             public string Argument { get; set; }

diff --git a/src/Core/Types/Resolvers/ClassMiddlewareFactory.cs b/src/Core/Types/Resolvers/ClassMiddlewareFactory.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Reflection;
 using HotChocolate.Utilities;
-Original file line number
+Diff line change
@@ Expand Up / @@ -52,6 +52,7 @@ public ExecutionContext( @@
                     requestContext.ServiceScope.ServiceProvider);
             }
             public ISchema Schema { get; }
             public IRequestServiceScope ServiceScope =>
@@ Expand Down @@