Added support for middleware on introspection fields (#962)

src/Core/Core.Tests/Execution/IntrospectionTests.cs

@@ -1,5 +1,6 @@
 using System.Threading.Tasks;
 using ChilliCream.Testing;
+using HotChocolate.Configuration;
 using HotChocolate.Types;
 using Snapshooter.Xunit;
 using Xunit;
@@ -117,6 +118,37 @@ public async Task FieldMiddlewareDoesNotHaveAnEffectOnIntrospection()
             result.MatchSnapshot();
         }
 
+        [Fact]
+        public async Task FieldMiddlewareHasAnEffectOnIntrospectIfSwitchedOn()
+        {
+            // arrange
+            string query = "{ __typename a }";
+
+            ISchema schema = SchemaBuilder.New()
+                .AddQueryType<Query>()
+                .Use(next => async context =>
+                {
+                    await next.Invoke(context);
+
+                    if (context.Result is string s)
+                    {
+                        context.Result = s.ToUpperInvariant();
+                    }
+                })
+                .ModifyOptions(o =>
+                    o.FieldMiddleware = FieldMiddlewareApplication.AllFields)
+                .Create();
+
+            IQueryExecutor executor = schema.MakeExecutable();
+
+            // act
+            IExecutionResult result = await executor.ExecuteAsync(query);
+
+            // assert
+            Assert.Empty(result.Errors);
+            result.MatchSnapshot();
+        }
+
         [Fact]
         public async Task DirectiveMiddlewareDoesWorkOnIntrospection()
         {

src/Core/Core.Tests/Execution/__snapshots__/IntrospectionTests.FieldMiddlewareHasAnEffectOnIntrospectIfSwitchedOn.snap

@@ -0,0 +1,9 @@
+{
+  "Data": {
+    "__typename": "QUERY",
+    "a": "A"
+  },
+  "Extensions": {},
+  "Errors": [],
+  "ContextData": {}
+}

src/Core/Types/Configuration/Contracts/FieldMiddlewareApplication.cs

@@ -0,0 +1,21 @@
+namespace HotChocolate.Configuration
+{
+    /// <summary>
+    /// This enum specified on which fields custom field
+    /// middleware is applied to.
+    /// </summary>
+    public enum FieldMiddlewareApplication : byte
+    {
+        /// <summary>
+        /// Custom field middleware is only applied to
+        /// user-defined fields and not to introspection fields.
+        /// </summary>
+        UserDefinedFields = 0,
+
+        /// <summary>
+        /// Custom field middleware is applied to all fields
+        /// (user-defined fields and introspection fields).
+        /// </summary>
+        AllFields = 1
+    }
+}

src/Core/Types/Configuration/Contracts/IReadOnlySchemaOptions.cs

@@ -11,5 +11,10 @@ public interface IReadOnlySchemaOptions
         bool StrictValidation { get; }
 
         bool UseXmlDocumentation { get; }
+
+        /// <summary>
+        /// Defines on which fields a middleware pipeline can be applied on.
+        /// </summary>
+        FieldMiddlewareApplication FieldMiddleware { get; }
     }
 }

src/Core/Types/Configuration/Contracts/ISchemaOptions.cs

@@ -12,5 +12,7 @@ public interface ISchemaOptions
         new bool StrictValidation { get; set; }
 
         new bool UseXmlDocumentation { get; set; }
+
+        new FieldMiddlewareApplication FieldMiddleware { get; set; }
     }
 }

src/Core/Types/Configuration/ReadOnlySchemaOptions.cs

@@ -20,6 +20,7 @@ public ReadOnlySchemaOptions(IReadOnlySchemaOptions options)
                 ?? "Subscription";
             StrictValidation = options.StrictValidation;
             UseXmlDocumentation = options.UseXmlDocumentation;
+            FieldMiddleware = options.FieldMiddleware;
         }
 
         public string QueryTypeName { get; }
@@ -31,5 +32,7 @@ public ReadOnlySchemaOptions(IReadOnlySchemaOptions options)
         public bool StrictValidation { get; }
 
         public bool UseXmlDocumentation { get; }
+
+        public FieldMiddlewareApplication FieldMiddleware { get; }
     }
 }

src/Core/Types/Configuration/SchemaOptions.cs

@@ -13,6 +13,12 @@ public class SchemaOptions
 
         public bool UseXmlDocumentation { get; set; } = true;
 
+        public FieldMiddlewareApplication FieldMiddleware
+        {
+            get;
+            set;
+        } = FieldMiddlewareApplication.UserDefinedFields;
+
         public static SchemaOptions FromOptions(IReadOnlySchemaOptions options)
         {
             return new SchemaOptions
@@ -21,7 +27,8 @@ public static SchemaOptions FromOptions(IReadOnlySchemaOptions options)
                 MutationTypeName = options.MutationTypeName,
                 SubscriptionTypeName = options.SubscriptionTypeName,
                 StrictValidation = options.StrictValidation,
-                UseXmlDocumentation = options.UseXmlDocumentation
+                UseXmlDocumentation = options.UseXmlDocumentation,
+                FieldMiddleware = options.FieldMiddleware
             };
         }
     }

src/Core/Types/Types/Helpers/FieldMiddlewareCompiler.cs

@@ -11,7 +11,7 @@ public static FieldDelegate Compile(
             IReadOnlyList<FieldMiddleware> globalComponents,
             IReadOnlyList<FieldMiddleware> fieldComponents,
             FieldResolverDelegate fieldResolver,
-            bool isIntrospection)
+            bool skipMiddleware)
         {
             if (globalComponents == null)
             {
@@ -23,7 +23,7 @@ public static FieldDelegate Compile(
                 throw new ArgumentNullException(nameof(fieldComponents));
             }
 
-            if (isIntrospection
+            if (skipMiddleware
                 || (globalComponents.Count == 0
                     && fieldComponents.Count == 0))
             {

src/Core/Types/Types/ObjectField.cs

@@ -110,11 +110,18 @@ private void CompleteResolver(
                     context.Type.Name, Resolver, resolver);
             }
 
+            IReadOnlySchemaOptions options = context.DescriptorContext.Options;
+
+            bool skipMiddleware =
+                options.FieldMiddleware == FieldMiddlewareApplication.AllFields
+                    ? false
+                    : isIntrospectionField;
+
             Middleware = FieldMiddlewareCompiler.Compile(
                 context.GlobalComponents,
                 definition.MiddlewareComponents.ToArray(),
                 Resolver,
-                isIntrospectionField);
+                skipMiddleware);
 
             if (Resolver == null && Middleware == null)
             {