Merge branch 'master' into api

Author: sungam3r

src/GraphQL.Client/GraphQLHttpClientOptions.cs

@@ -61,9 +61,17 @@ public class GraphQLHttpClientOptions
     /// Note that compatible to the draft graphql-over-http spec GraphQL Server MAY return 4xx status codes (401/403, etc.)
     /// with well-formed GraphQL response containing errors collection.
     /// </summary>
-    public Func<HttpResponseMessage, bool> IsValidResponseToDeserialize { get; set; } = r =>
-        // Why not application/json? See https://github.com/graphql/graphql-over-http/blob/main/spec/GraphQLOverHTTP.md#processing-the-response
-        r.IsSuccessStatusCode || r.StatusCode == HttpStatusCode.BadRequest || r.Content.Headers.ContentType?.MediaType == "application/graphql+json";
+    public Func<HttpResponseMessage, bool> IsValidResponseToDeserialize { get; set; } = DefaultIsValidResponseToDeserialize;
+
+    private static readonly IReadOnlyCollection<string> _acceptedResponseContentTypes = new[] { "application/graphql+json", "application/json", "application/graphql-response+json" };
+
+    public static bool DefaultIsValidResponseToDeserialize(HttpResponseMessage r)
+    {
+        if (r.Content.Headers.ContentType?.MediaType != null && !_acceptedResponseContentTypes.Contains(r.Content.Headers.ContentType.MediaType))
+            return false;
+
+        return r.IsSuccessStatusCode || r.StatusCode == HttpStatusCode.BadRequest;
+    }
 
     /// <summary>
     /// This callback is called after successfully establishing a websocket connection but before any regular request is made.

src/GraphQL.Client/GraphQLHttpRequest.cs

@@ -11,11 +11,13 @@ public GraphQLHttpRequest()
     {
     }
 
-    public GraphQLHttpRequest(string query, object? variables = null, string? operationName = null) : base(query, variables, operationName)
+    public GraphQLHttpRequest(string query, object? variables = null, string? operationName = null, Dictionary<string, object?>? extensions = null)
+        : base(query, variables, operationName, extensions)
     {
     }
 
-    public GraphQLHttpRequest(GraphQLRequest other) : base(other)
+    public GraphQLHttpRequest(GraphQLRequest other)
+        : base(other)
     {
     }
 

src/GraphQL.Primitives/GraphQLRequest.cs

@@ -40,15 +40,15 @@ public object? Variables
     /// <summary>
     /// Represents the request extensions
     /// </summary>
-    public object? Extensions
+    public Dictionary<string, object?>? Extensions
     {
-        get => TryGetValue(EXTENSIONS_KEY, out object value) ? value : null;
+        get => TryGetValue(EXTENSIONS_KEY, out object value) && value is Dictionary<string, object?> d ? d : null;
         set => this[EXTENSIONS_KEY] = value;
     }
 
     public GraphQLRequest() { }
 
-    public GraphQLRequest(string query, object? variables = null, string? operationName = null, object? extensions = null)
+    public GraphQLRequest(string query, object? variables = null, string? operationName = null, Dictionary<string, object?>? extensions = null)
     {
         Query = query;
         Variables = variables;

tests/GraphQL.Client.Serializer.Tests/DefaultValidationTest.cs

@@ -0,0 +1,28 @@
+using System.Net;
+using System.Net.Http.Headers;
+using FluentAssertions;
+using GraphQL.Client.Http;
+using Xunit;
+
+namespace GraphQL.Client.Serializer.Tests;
+
+public class DefaultValidationTest
+{
+    [Theory]
+    [InlineData(HttpStatusCode.OK, "application/json", true)]
+    [InlineData(HttpStatusCode.OK, "application/graphql-response+json", true)]
+    [InlineData(HttpStatusCode.BadRequest, "application/json", true)]
+    [InlineData(HttpStatusCode.BadRequest, "text/html", false)]
+    [InlineData(HttpStatusCode.OK, "text/html", false)]
+    [InlineData(HttpStatusCode.Forbidden, "text/html", false)]
+    [InlineData(HttpStatusCode.Forbidden, "application/json", false)]
+    public void IsValidResponse_OkJson_True(HttpStatusCode statusCode, string mediaType, bool expectedResult)
+    {
+        var response = new HttpResponseMessage(statusCode);
+        response.Content.Headers.ContentType = new MediaTypeHeaderValue(mediaType);
+
+        bool isValid = new GraphQLHttpClientOptions().IsValidResponseToDeserialize(response);
+
+        isValid.Should().Be(expectedResult);
+    }
+}

tests/GraphQL.Client.Serializer.Tests/TestData/SerializeToStringTestData.cs

@@ -10,6 +10,10 @@ public IEnumerator<object[]> GetEnumerator()
             "{\"query\":\"simplequerystring\",\"variables\":null,\"operationName\":null,\"extensions\":null}",
             new GraphQLRequest("simple query string")
         };
+        yield return new object[] {
+            "{\"query\":\"simplequerystring\",\"variables\":null,\"operationName\":null,\"extensions\":{\"a\":\"abc\",\"b\":true,\"c\":{\"d\":42}}}",
+            new GraphQLRequest("simple query string", extensions: new Dictionary<string, object?> { ["a"] = "abc", ["b"] = true, ["c"] = new Dictionary<string, object> { ["d"] = 42 } })
+        };
         yield return new object[] {
             "{\"query\":\"simplequerystring\",\"variables\":{\"camelCaseProperty\":\"camelCase\",\"PascalCaseProperty\":\"PascalCase\"},\"operationName\":null,\"extensions\":null}",
             new GraphQLRequest("simple query string", new { camelCaseProperty = "camelCase", PascalCaseProperty = "PascalCase"})

tests/GraphQL.Client.Tests.Common/GraphQL.Client.Tests.Common.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="FluentAssertions.Reactive" Version="0.2.0" />
-    <PackageReference Include="GraphQL" Version="7.4.0" />
+    <PackageReference Include="GraphQL" Version="7.4.1" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
   </ItemGroup>