Add GraphQL-Disable-NullBubbling header

Author: tobias-tengler

src/HotChocolate/AspNetCore/src/AspNetCore/DefaultHttpRequestInterceptor.cs

@@ -34,6 +34,11 @@ public virtual ValueTask OnCreateAsync(
             requestBuilder.TryAddGlobalState(WellKnownContextData.IncludeQueryPlan, true);
         }
 
+        if (context.IsNullBubblingDisabled())
+        {
+            requestBuilder.TryAddGlobalState(WellKnownContextData.DisableNullBubbling, true);
+        }
+
         return default;
     }
 }

src/HotChocolate/AspNetCore/src/AspNetCore/DefaultSocketSessionInterceptor.cs

@@ -42,6 +42,11 @@ public virtual ValueTask OnRequestAsync(
             requestBuilder.TryAddGlobalState(IncludeQueryPlan, true);
         }
 
+        if (context.IsNullBubblingDisabled())
+        {
+            requestBuilder.TryAddGlobalState(WellKnownContextData.DisableNullBubbling, true);
+        }
+
         return default;
     }
 

src/HotChocolate/AspNetCore/src/AspNetCore/Extensions/HttpContextExtensions.cs

@@ -35,4 +35,17 @@ public static bool IncludeQueryPlan(this HttpContext context)
 
         return false;
     }
+
+    public static bool IsNullBubblingDisabled(this HttpContext context)
+    {
+        var headers = context.Request.Headers;
+
+        if (headers.TryGetValue(HttpHeaderKeys.DisableNullBubbling, out var values) &&
+            values.Any(v => v == HttpHeaderValues.DisableNullBubbling))
+        {
+            return true;
+        }
+
+        return false;
+    }
 }

src/HotChocolate/AspNetCore/src/AspNetCore/HttpHeaderKeys.cs

@@ -11,4 +11,6 @@ internal static class HttpHeaderKeys
     public const string CacheControl = "Cache-Control";
 
     public const string Preflight = "GraphQL-Preflight";
+
+    public const string DisableNullBubbling = "GraphQL-Disable-NullBubbling";
 }

src/HotChocolate/AspNetCore/src/AspNetCore/HttpHeaderValues.cs

@@ -6,5 +6,7 @@ internal static class HttpHeaderValues
 
     public const string IncludeQueryPlan = "1";
 
+    public const string DisableNullBubbling = "1";
+
     public const string NoCache = "no-cache";
 }

src/HotChocolate/AspNetCore/src/Transport.Http/HttpRequestHeadersExtensions.cs

@@ -29,5 +29,28 @@ public static HttpRequestHeaders AddGraphQLPreflight(this HttpRequestHeaders hea
 
         headers.Add("GraphQL-Preflight", "1");
         return headers;
-    }  
-}
+    }
+
+    /// <summary>
+    /// Adds the <c>GraphQL-Disable-NullBubbling</c> header to the request.
+    /// </summary>
+    /// <param name="headers">
+    /// The <see cref="HttpRequestHeaders"/> to add the header to.
+    /// </param>
+    /// <returns>
+    /// Returns the <paramref name="headers"/> for configuration chaining.
+    /// </returns>
+    /// <exception cref="ArgumentNullException">
+    /// <paramref name="headers"/> is <see langword="null"/>.
+    /// </exception>
+    public static HttpRequestHeaders AddGraphQLDisableNullBubbling(this HttpRequestHeaders headers)
+    {
+        if (headers == null)
+        {
+            throw new ArgumentNullException(nameof(headers));
+        }
+
+        headers.Add("GraphQL-Disable-NullBubbling", "1");
+        return headers;
+    }
+}

src/HotChocolate/Core/src/Abstractions/WellKnownContextData.cs

@@ -169,11 +169,6 @@ public static class WellKnownContextData
     /// </summary>
     public const string NodeResolver = "HotChocolate.Relay.Node.Resolver";
 
-    /// <summary>
-    /// The key to check if relay support is enabled.
-    /// </summary>
-    public const string IsRelaySupportEnabled = "HotChocolate.Relay.IsEnabled";
-
     /// <summary>
     /// The key to check if the global identification spec is enabled.
     /// </summary>
@@ -281,9 +276,9 @@ public static class WellKnownContextData
     public const string EnableTrueNullability = "HotChocolate.Types.EnableTrueNullability";
 
     /// <summary>
-    /// The key to access the disable null-bubbling flag on the execution context.
+    /// Disables null-bubbling for the current request.
     /// </summary>
-    public const string DisableNullBubbling = "HotChocolate.Types.DisableNullBubbling";
+    public const string DisableNullBubbling = "HotChocolate.Execution.DisableNullBubbling";
 
     /// <summary>
     /// The key to access the tag options object.

src/HotChocolate/Core/src/Execution/Pipeline/OperationResolverMiddleware.cs

@@ -108,7 +108,8 @@ private IOperation CompileOperation(
 
     private bool IsNullBubblingEnabled(IRequestContext context, OperationDefinitionNode operationDefinition)
     {
-        if (context.Schema.ContextData.ContainsKey(DisableNullBubbling))
+        if (context.ContextData.TryGetValue(DisableNullBubbling, out var disableNullBubbling)
+            && disableNullBubbling is true)
         {
             return false;
         }

src/HotChocolate/Core/src/Types/IReadOnlySchemaOptions.cs

@@ -186,11 +186,6 @@ public interface IReadOnlySchemaOptions
     /// </summary>
     bool EnableTrueNullability { get; }
 
-    /// <summary>
-    /// Specifies whether null-bubbling shall be disabled.
-    /// </summary>
-    bool DisableNullBubbling { get; }
-
     /// <summary>
     /// Specifies that the @tag directive shall be registered with the type system.
     /// </summary>

src/HotChocolate/Core/src/Types/SchemaBuilder.cs

@@ -37,7 +37,6 @@ public partial class SchemaBuilder : ISchemaBuilder
         typeof(CostTypeInterceptor),
         typeof(MiddlewareValidationTypeInterceptor),
         typeof(EnableTrueNullabilityTypeInterceptor),
-        typeof(DisableNullBubblingTypeInterceptor),
     ];
 
     private SchemaOptions _options = new();