Ported: Fixed issue where mutating the result object would drop the C…

…ontextData #5211
ChilliCream · Jan 31, 2023 · 3a21ba1 · 3a21ba1
1 parent 7f7f0d2
commit 3a21ba1
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 11 deletions.
diff --git a/src/HotChocolate/AspNetCore/test/AspNetCore.Tests.Utilities/TestServerExtensions.cs b/src/HotChocolate/AspNetCore/test/AspNetCore.Tests.Utilities/TestServerExtensions.cs
@@ -189,13 +189,15 @@ await using (section.Body)
     public static async Task<ClientRawResult> PostRawAsync(
         this TestServer testServer,
         ClientQueryRequest request,
-        string path = "/graphql")
+        string path = "/graphql",
+        bool enableApolloTracing = false)
     {
         var response =
             await SendPostRequestAsync(
                 testServer,
                 JsonConvert.SerializeObject(request),
-                path);
+                path,
+                enableApolloTracing: enableApolloTracing);
 
         if (response.StatusCode == HttpStatusCode.NotFound)
         {

diff --git a/src/HotChocolate/AspNetCore/test/AspNetCore.Tests/HttpPostMiddlewareTests.cs b/src/HotChocolate/AspNetCore/test/AspNetCore.Tests/HttpPostMiddlewareTests.cs
@@ -1,14 +1,14 @@
 using System.Net;
 using System.Net.Http.Json;
 using CookieCrumble;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.DependencyInjection;
 using HotChocolate.AspNetCore.Instrumentation;
 using HotChocolate.AspNetCore.Serialization;
 using HotChocolate.AspNetCore.Tests.Utilities;
 using HotChocolate.Execution;
 using HotChocolate.Execution.Serialization;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.DependencyInjection;
 using Newtonsoft.Json;
 using static HotChocolate.Execution.Serialization.JsonNullIgnoreCondition;
 
@@ -194,7 +194,7 @@ public async Task Complexity_Exceeded()
     {
         // arrange
         var server = CreateStarWarsServer(
-            configureServices: c => c.AddGraphQLServer().ModifyRequestOptions(o=>
+            configureServices: c => c.AddGraphQLServer().ModifyRequestOptions(o =>
             {
                 o.Complexity.Enable = true;
                 o.Complexity.MaximumAllowed = 1;
@@ -369,6 +369,34 @@ public async Task Aggregate_Diagnostic_All_Listeners_Are_Triggered()
         Assert.True(listenerB.Triggered);
     }
 
+    [Fact]
+    public async Task Apollo_Tracing_Invalid_Field()
+    {
+        // arrange
+        var server = CreateStarWarsServer(
+            configureServices: s => s
+                .AddGraphQLServer()
+                .AddApolloTracing());
+
+        // act
+        var response = await server.PostRawAsync(
+            new ClientQueryRequest
+            {
+                Query =
+                    @"{
+                        hero123(episode: NEW_HOPE)
+                        {
+                            name
+                        }
+                    }"
+
+            },
+            enableApolloTracing: true);
+
+        // assert
+        Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
+    }
+
     [Fact]
     public async Task Ensure_Multipart_Format_Is_Correct_With_Defer()
     {

diff --git a/src/HotChocolate/Core/src/Abstractions/Execution/QueryResultBuilder.cs b/src/HotChocolate/Core/src/Abstractions/Execution/QueryResultBuilder.cs
@@ -2,11 +2,9 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-#nullable enable
-
 namespace HotChocolate.Execution;
 
-public class QueryResultBuilder : IQueryResultBuilder
+public sealed class QueryResultBuilder : IQueryResultBuilder
 {
     private IReadOnlyDictionary<string, object?>? _data;
     private IReadOnlyList<object?>? _items;
@@ -191,9 +189,9 @@ public static QueryResultBuilder FromResult(IQueryResult result)
             builder._errors = new List<IError>(result.Errors);
         }
 
-        if (result.Extensions is ExtensionData d)
+        if (result.Extensions is ExtensionData ext)
         {
-            builder._extensionData = new ExtensionData(d);
+            builder._extensionData = new ExtensionData(ext);
         }
         else if (result.Extensions is not null)
         {
@@ -209,6 +207,10 @@ public static QueryResultBuilder FromResult(IQueryResult result)
             builder._contextData = new ExtensionData(result.ContextData);
         }
 
+        builder._label = result.Label;
+        builder._path = result.Path;
+        builder._hasNext = result.HasNext;
+
         return builder;
     }