Fixed HTTP Spec issues

ChilliCream · Nov 14, 2022 · f3239e4 · f3239e4
1 parent 96c46b7
commit f3239e4
Show file tree

Hide file tree

Showing 120 changed files with 241 additions and 184 deletions.
diff --git a/src/HotChocolate/AspNetCore/src/AspNetCore/Serialization/DefaultHttpResponseFormatter.cs b/src/HotChocolate/AspNetCore/src/AspNetCore/Serialization/DefaultHttpResponseFormatter.cs
@@ -180,10 +180,17 @@ public class DefaultHttpResponseFormatter : IHttpResponseFormatter
                 var contextData = result.ContextData;
 
                 // first we check if there is an explicit HTTP status code override by the user.
-                if (contextData.TryGetValue(WellKnownContextData.HttpStatusCode, out var value) &&
-                    value is HttpStatusCode statusCode)
+                if (contextData.TryGetValue(WellKnownContextData.HttpStatusCode, out var value))
                 {
-                    return statusCode;
+                    if (value is HttpStatusCode statusCode)
+                    {
+                        return statusCode;
+                    }
+
+                    if (value is int statusCodeInt)
+                    {
+                        return (HttpStatusCode)statusCodeInt;
+                    }
                 }
 
                 // next we check if the validation of the request failed.
@@ -250,15 +257,15 @@ public class DefaultHttpResponseFormatter : IHttpResponseFormatter
         formatInfo = default;
 
         // if the request does not specify the accept header then we will
-        // use the `application/json` response content-type,
-        // which is the legacy behavior.
+        // use the `application/graphql-response+json` response content-type,
+        // which is the new response content-type.
         if (acceptMediaTypes.Length == 0)
         {
             if (result.Kind is SingleResult)
             {
                 formatInfo = new FormatInfo(
-                    ContentType.Json,
-                    ResponseContentType.Json,
+                    ContentType.GraphQLResponse,
+                    ResponseContentType.GraphQLResponse,
                     _jsonFormatter);
                 return true;
             }
@@ -301,7 +308,7 @@ public class DefaultHttpResponseFormatter : IHttpResponseFormatter
             var mediaType = acceptMediaTypes[0];
 
             if (resultKind is ResultKind.Single &&
-                mediaType.Kind is ApplicationGraphQL or AllApplication)
+                mediaType.Kind is ApplicationGraphQL or AllApplication or All)
             {
                 formatInfo = new FormatInfo(
                     ContentType.GraphQLResponse,
@@ -311,7 +318,7 @@ public class DefaultHttpResponseFormatter : IHttpResponseFormatter
             }
 
             if (resultKind is ResultKind.Single &&
-                mediaType.Kind is ApplicationJson or All)
+                mediaType.Kind is ApplicationJson)
             {
                 formatInfo = new FormatInfo(
                     ContentType.Json,
@@ -352,7 +359,7 @@ public class DefaultHttpResponseFormatter : IHttpResponseFormatter
             var mediaType = Unsafe.Add(ref searchSpace, i);
 
             if (resultKind is ResultKind.Single &&
-                mediaType.Kind is ApplicationGraphQL or AllApplication)
+                mediaType.Kind is ApplicationGraphQL or AllApplication or All)
             {
                 formatInfo = new FormatInfo(
                     ContentType.GraphQLResponse,
@@ -362,7 +369,7 @@ public class DefaultHttpResponseFormatter : IHttpResponseFormatter
             }
 
             if (resultKind is ResultKind.Single &&
-                mediaType.Kind is ApplicationJson or All)
+                mediaType.Kind is ApplicationJson)
             {
                 // application/json is a legacy response content-type.
                 // We will create a formatInfo but keep on validating for

diff --git a/...pNetCore.Authorization.Tests/__snapshots__/AuthorizationTests.DefaultPolicy_NotFound.snap b/...pNetCore.Authorization.Tests/__snapshots__/AuthorizationTests.DefaultPolicy_NotFound.snap
@@ -1,5 +1,5 @@
 {
-  "ContentType": "application/json; charset=utf-8",
+  "ContentType": "application/graphql-response+json; charset=utf-8",
   "StatusCode": "OK",
   "Data": {
     "default": null

diff --git a/...horization.Tests/__snapshots__/AuthorizationTests.NoAuthServices_Authenticated_False.snap b/...horization.Tests/__snapshots__/AuthorizationTests.NoAuthServices_Authenticated_False.snap
@@ -1,5 +1,5 @@
 {
-  "ContentType": "application/json; charset=utf-8",
+  "ContentType": "application/graphql-response+json; charset=utf-8",
   "StatusCode": "OK",
   "Data": {
     "default": null

diff --git a/...thorization.Tests/__snapshots__/AuthorizationTests.NoAuthServices_Authenticated_True.snap b/...thorization.Tests/__snapshots__/AuthorizationTests.NoAuthServices_Authenticated_True.snap
@@ -1,5 +1,5 @@
 {
-  "ContentType": "application/json; charset=utf-8",
+  "ContentType": "application/graphql-response+json; charset=utf-8",
   "StatusCode": "OK",
   "Data": {
     "default": "foo"

diff --git a/...orization.Tests/__snapshots__/AuthorizationTests.PipedAuthorizeDirectives_Authorized.snap b/...orization.Tests/__snapshots__/AuthorizationTests.PipedAuthorizeDirectives_Authorized.snap
@@ -1,5 +1,5 @@
 {
-  "ContentType": "application/json; charset=utf-8",
+  "ContentType": "application/graphql-response+json; charset=utf-8",
   "StatusCode": "OK",
   "Data": {
     "piped": "foo"

diff --git a/.../__snapshots__/AuthorizationTests.PipedAuthorizeDirectives_SecondFails_NotAuthorized.snap b/.../__snapshots__/AuthorizationTests.PipedAuthorizeDirectives_SecondFails_NotAuthorized.snap
@@ -1,5 +1,5 @@
 {
-  "ContentType": "application/json; charset=utf-8",
+  "ContentType": "application/graphql-response+json; charset=utf-8",
   "StatusCode": "OK",
   "Data": {
     "piped": null

diff --git a/...st/AspNetCore.Authorization.Tests/__snapshots__/AuthorizationTests.Policy_Authorized.snap b/...st/AspNetCore.Authorization.Tests/__snapshots__/AuthorizationTests.Policy_Authorized.snap
@@ -1,5 +1,5 @@
 {
-  "ContentType": "application/json; charset=utf-8",
+  "ContentType": "application/graphql-response+json; charset=utf-8",
   "StatusCode": "OK",
   "Data": {
     "age": "foo"

diff --git a/...s/__snapshots__/AuthorizationTests.Policy_Is_Executed_After_Resolver_User_Is_Allowed.snap b/...s/__snapshots__/AuthorizationTests.Policy_Is_Executed_After_Resolver_User_Is_Allowed.snap
@@ -1,5 +1,5 @@
 {
-  "ContentType": "application/json; charset=utf-8",
+  "ContentType": "application/graphql-response+json; charset=utf-8",
   "StatusCode": "OK",
   "Data": {
     "afterResolver": "foo"

diff --git a/...ts/__snapshots__/AuthorizationTests.Policy_Is_Executed_After_Resolver_User_Is_Denied.snap b/...ts/__snapshots__/AuthorizationTests.Policy_Is_Executed_After_Resolver_User_Is_Denied.snap
@@ -1,5 +1,5 @@
 {
-  "ContentType": "application/json; charset=utf-8",
+  "ContentType": "application/graphql-response+json; charset=utf-8",
   "StatusCode": "OK",
   "Data": {
     "afterResolver": null

diff --git a/...AspNetCore.Authorization.Tests/__snapshots__/AuthorizationTests.Policy_NotAuthorized.snap b/...AspNetCore.Authorization.Tests/__snapshots__/AuthorizationTests.Policy_NotAuthorized.snap
@@ -1,5 +1,5 @@
 {
-  "ContentType": "application/json; charset=utf-8",
+  "ContentType": "application/graphql-response+json; charset=utf-8",
   "StatusCode": "OK",
   "Data": {
     "age": null

diff --git a/...test/AspNetCore.Authorization.Tests/__snapshots__/AuthorizationTests.Policy_NotFound.snap b/...test/AspNetCore.Authorization.Tests/__snapshots__/AuthorizationTests.Policy_NotFound.snap
@@ -1,5 +1,5 @@
 {
-  "ContentType": "application/json; charset=utf-8",
+  "ContentType": "application/graphql-response+json; charset=utf-8",
   "StatusCode": "OK",
   "Data": {
     "age": null

diff --git a/...rization.Tests/__snapshots__/AuthorizationTests.Policy_Resources_Is_IResolverContext.snap b/...rization.Tests/__snapshots__/AuthorizationTests.Policy_Resources_Is_IResolverContext.snap
@@ -1,5 +1,5 @@
 {
-  "ContentType": "application/json; charset=utf-8",
+  "ContentType": "application/graphql-response+json; charset=utf-8",
   "StatusCode": "OK",
   "Data": {
     "age": "foo"

diff --git a/...est/AspNetCore.Authorization.Tests/__snapshots__/AuthorizationTests.Roles_Authorized.snap b/...est/AspNetCore.Authorization.Tests/__snapshots__/AuthorizationTests.Roles_Authorized.snap
@@ -1,5 +1,5 @@
 {
-  "ContentType": "application/json; charset=utf-8",
+  "ContentType": "application/graphql-response+json; charset=utf-8",
   "StatusCode": "OK",
   "Data": {
     "roles": "foo"

diff --git a/...ization.Tests/__snapshots__/AuthorizationTests.Roles_UserHasAllOfTheRoles_Authorized.snap b/...ization.Tests/__snapshots__/AuthorizationTests.Roles_UserHasAllOfTheRoles_Authorized.snap
@@ -1,5 +1,5 @@
 {
-  "ContentType": "application/json; charset=utf-8",
+  "ContentType": "application/graphql-response+json; charset=utf-8",
   "StatusCode": "OK",
   "Data": {
     "roles_ab": "foo"

diff --git a/...ion.Tests/__snapshots__/AuthorizationTests.Roles_UserHasDifferentRoles_NotAuthorized.snap b/...ion.Tests/__snapshots__/AuthorizationTests.Roles_UserHasDifferentRoles_NotAuthorized.snap
@@ -1,5 +1,5 @@
 {
-  "ContentType": "application/json; charset=utf-8",
+  "ContentType": "application/graphql-response+json; charset=utf-8",
   "StatusCode": "OK",
   "Data": {
     "roles": null

diff --git a/...horization.Tests/__snapshots__/AuthorizationTests.Roles_UserHasNoRoles_NotAuthorized.snap b/...horization.Tests/__snapshots__/AuthorizationTests.Roles_UserHasNoRoles_NotAuthorized.snap
@@ -1,5 +1,5 @@
 {
-  "ContentType": "application/json; charset=utf-8",
+  "ContentType": "application/graphql-response+json; charset=utf-8",
   "StatusCode": "OK",
   "Data": {
     "roles": null

diff --git a/...ion.Tests/__snapshots__/AuthorizationTests.Roles_UserHasNoneOfTheRoles_NotAuthorized.snap b/...ion.Tests/__snapshots__/AuthorizationTests.Roles_UserHasNoneOfTheRoles_NotAuthorized.snap
@@ -1,5 +1,5 @@
 {
-  "ContentType": "application/json; charset=utf-8",
+  "ContentType": "application/graphql-response+json; charset=utf-8",
   "StatusCode": "OK",
   "Data": {
     "roles_ab": null

diff --git a/...ization.Tests/__snapshots__/AuthorizationTests.Roles_UserHasOneOfTheRoles_Authorized.snap b/...ization.Tests/__snapshots__/AuthorizationTests.Roles_UserHasOneOfTheRoles_Authorized.snap
@@ -1,5 +1,5 @@
 {
-  "ContentType": "application/json; charset=utf-8",
+  "ContentType": "application/graphql-response+json; charset=utf-8",
   "StatusCode": "OK",
   "Data": {
     "roles_ab": "foo"

diff --git a/src/HotChocolate/AspNetCore/test/AspNetCore.Tests/GraphQLOverHttpSpecTests.cs b/src/HotChocolate/AspNetCore/test/AspNetCore.Tests/GraphQLOverHttpSpecTests.cs
@@ -47,13 +47,50 @@ public async Task Legacy_Query_No_Streams_1()
             .Add(response)
             .MatchInline(
                 @"Headers:
-                Content-Type: application/json; charset=utf-8
+                Content-Type: application/graphql-response+json; charset=utf-8
                 -------------------------->
                 Status Code: OK
                 -------------------------->
                 {""data"":{""__typename"":""Query""}}");
     }
 
+     /// <summary>
+        /// This request does not specify a accept header.
+        /// expected response content-type: application/json
+        /// expected status code: 200
+        /// </summary>
+        [Fact]
+        public async Task Query_No_Body()
+        {
+            // arrange
+            var server = CreateStarWarsServer();
+            var client = server.CreateClient();
+
+            // act
+            using var request = new HttpRequestMessage(HttpMethod.Post, _url)
+            {
+                Content = new ByteArrayContent(Array.Empty<byte>())
+                {
+                    Headers = { ContentType = new("application/json") { CharSet = "utf-8" } }
+                }
+            };
+            using var response = await client.SendAsync(request);
+
+            // assert
+            // expected response content-type: application/json
+            // expected status code: 200
+            Snapshot
+                .Create()
+                .Add(response)
+                .MatchInline(
+                    @"Headers:
+                    Content-Type: application/graphql-response+json; charset=utf-8
+                    -------------------------->
+                    Status Code: BadRequest
+                    -------------------------->
+                    {""errors"":[{""message"":""The GraphQL request is empty."",""extensions"":{""code"":""HC0012""}}]}");
+        }
+
     /// <summary>
     /// This request does not specify a accept header and has a syntax error.
     /// expected response content-type: application/json
@@ -86,9 +123,9 @@ public async Task Legacy_Query_No_Streams_2()
             .Add(response)
             .MatchInline(
                 @"Headers:
-                Content-Type: application/json; charset=utf-8
+                Content-Type: application/graphql-response+json; charset=utf-8
                 -------------------------->
-                Status Code: OK
+                Status Code: BadRequest
                 -------------------------->
                 {""errors"":[{""message"":""Expected a \u0060Name\u0060-token, but found a " +
                 @"\u0060Dollar\u0060-token."",""locations"":[{""line"":1,""column"":8}]," +
@@ -127,9 +164,9 @@ public async Task Legacy_Query_No_Streams_3()
             .Add(response)
             .MatchInline(
                 @"Headers:
-                Content-Type: application/json; charset=utf-8
+                Content-Type: application/graphql-response+json; charset=utf-8
                 -------------------------->
-                Status Code: OK
+                Status Code: BadRequest
                 -------------------------->
                 {""errors"":[{""message"":""\u0060__type\u0060 is an object, interface or " +
                 "union type field. Leaf selections on objects, interfaces, and unions without " +
@@ -420,7 +457,7 @@ public async Task New_Query_No_Streams_5()
             .Add(response)
             .MatchInline(
                 @"Headers:
-                Content-Type: application/json; charset=utf-8
+                Content-Type: application/graphql-response+json; charset=utf-8
                 -------------------------->
                 Status Code: OK
                 -------------------------->

diff --git a/src/HotChocolate/AspNetCore/test/AspNetCore.Tests/HttpGetSchemaMiddlewareTests.cs b/src/HotChocolate/AspNetCore/test/AspNetCore.Tests/HttpGetSchemaMiddlewareTests.cs
@@ -165,7 +165,7 @@ public async Task Download_GraphQL_SDL_Disabled()
         var response = await server.CreateClient().SendAsync(request);
 
         // assert
-        Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+        Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
         var result = await response.Content.ReadAsStringAsync();
         result.MatchSnapshot();
     }

diff --git a/.../test/AspNetCore.Tests/__snapshots__/HttpGetMiddlewareTests.Get_ActivePersistedQuery.snap b/.../test/AspNetCore.Tests/__snapshots__/HttpGetMiddlewareTests.Get_ActivePersistedQuery.snap
@@ -1,5 +1,5 @@
 {
-  "ContentType": "application/json; charset=utf-8",
+  "ContentType": "application/graphql-response+json; charset=utf-8",
   "StatusCode": "OK",
   "Data": {
     "hero": {

diff --git a/...NetCore.Tests/__snapshots__/HttpGetMiddlewareTests.Get_ActivePersistedQuery_AddQuery.snap b/...NetCore.Tests/__snapshots__/HttpGetMiddlewareTests.Get_ActivePersistedQuery_AddQuery.snap
@@ -1,6 +1,6 @@
 [
   {
-    "ContentType": "application/json; charset=utf-8",
+    "ContentType": "application/graphql-response+json; charset=utf-8",
     "StatusCode": "OK",
     "Data": {
       "__typename": "Query"
@@ -14,7 +14,7 @@
     }
   },
   {
-    "ContentType": "application/json; charset=utf-8",
+    "ContentType": "application/graphql-response+json; charset=utf-8",
     "StatusCode": "OK",
     "Data": {
       "__typename": "Query"

diff --git a/...s/__snapshots__/HttpGetMiddlewareTests.Get_ActivePersistedQuery_AddQuery_Unformatted.snap b/...s/__snapshots__/HttpGetMiddlewareTests.Get_ActivePersistedQuery_AddQuery_Unformatted.snap
@@ -1,6 +1,6 @@
 [
   {
-    "ContentType": "application/json; charset=utf-8",
+    "ContentType": "application/graphql-response+json; charset=utf-8",
     "StatusCode": "OK",
     "Data": {
       "__typename": "Query"
@@ -14,7 +14,7 @@
     }
   },
   {
-    "ContentType": "application/json; charset=utf-8",
+    "ContentType": "application/graphql-response+json; charset=utf-8",
     "StatusCode": "OK",
     "Data": {
       "__typename": "Query"

diff --git a/...NetCore.Tests/__snapshots__/HttpGetMiddlewareTests.Get_ActivePersistedQuery_NotFound.snap b/...NetCore.Tests/__snapshots__/HttpGetMiddlewareTests.Get_ActivePersistedQuery_NotFound.snap
@@ -1,6 +1,6 @@
 {
-  "ContentType": "application/json; charset=utf-8",
-  "StatusCode": "OK",
+  "ContentType": "application/graphql-response+json; charset=utf-8",
+  "StatusCode": "BadRequest",
   "Data": null,
   "Errors": [
     {

diff --git a/...etCore.Tests/__snapshots__/HttpGetMiddlewareTests.MapGraphQLHttp_Simple_IsAlive_Test.snap b/...etCore.Tests/__snapshots__/HttpGetMiddlewareTests.MapGraphQLHttp_Simple_IsAlive_Test.snap
@@ -1,5 +1,5 @@
 {
-  "ContentType": "application/json; charset=utf-8",
+  "ContentType": "application/graphql-response+json; charset=utf-8",
   "StatusCode": "OK",
   "Data": {
     "__typename": "Query"

diff --git a/..._snapshots__/HttpGetMiddlewareTests.MapGraphQLHttp_Simple_IsAlive_Test_Explicit_Path.snap b/..._snapshots__/HttpGetMiddlewareTests.MapGraphQLHttp_Simple_IsAlive_Test_Explicit_Path.snap
@@ -1,5 +1,5 @@
 {
-  "ContentType": "application/json; charset=utf-8",
+  "ContentType": "application/graphql-response+json; charset=utf-8",
   "StatusCode": "OK",
   "Data": {
     "__typename": "Query"

diff --git a/...tCore/test/AspNetCore.Tests/__snapshots__/HttpGetMiddlewareTests.Simple_IsAlive_Test.snap b/...tCore/test/AspNetCore.Tests/__snapshots__/HttpGetMiddlewareTests.Simple_IsAlive_Test.snap
@@ -1,5 +1,5 @@
 {
-  "ContentType": "application/json; charset=utf-8",
+  "ContentType": "application/graphql-response+json; charset=utf-8",
   "StatusCode": "OK",
   "Data": {
     "__typename": "Query"

diff --git a/...e.Tests/__snapshots__/HttpGetMiddlewareTests.Simple_IsAlive_Test_On_Non_GraphQL_Path.snap b/...e.Tests/__snapshots__/HttpGetMiddlewareTests.Simple_IsAlive_Test_On_Non_GraphQL_Path.snap
@@ -1,5 +1,5 @@
 {
-  "ContentType": "application/json; charset=utf-8",
+  "ContentType": "application/graphql-response+json; charset=utf-8",
   "StatusCode": "OK",
   "Data": {
     "__typename": "Query"

diff --git a/...__/HttpGetMiddlewareTests.SingleRequest_CreateReviewForEpisode_Omit_NonNull_Variable.snap b/...__/HttpGetMiddlewareTests.SingleRequest_CreateReviewForEpisode_Omit_NonNull_Variable.snap
@@ -1,6 +1,6 @@
 {
-  "ContentType": "application/json; charset=utf-8",
-  "StatusCode": "OK",
+  "ContentType": "application/graphql-response+json; charset=utf-8",
+  "StatusCode": "InternalServerError",
   "Data": null,
   "Errors": [
     {

diff --git a/...HttpGetMiddlewareTests.SingleRequest_CreateReviewForEpisode_Variables_In_ObjectValue.snap b/...HttpGetMiddlewareTests.SingleRequest_CreateReviewForEpisode_Variables_In_ObjectValue.snap
@@ -1,5 +1,5 @@
 {
-  "ContentType": "application/json; charset=utf-8",
+  "ContentType": "application/graphql-response+json; charset=utf-8",
   "StatusCode": "OK",
   "Data": {
     "createReview": {

diff --git a/...shots__/HttpGetMiddlewareTests.SingleRequest_CreateReviewForEpisode_Variables_Unused.snap b/...shots__/HttpGetMiddlewareTests.SingleRequest_CreateReviewForEpisode_Variables_Unused.snap
@@ -1,6 +1,6 @@
 {
-  "ContentType": "application/json; charset=utf-8",
-  "StatusCode": "OK",
+  "ContentType": "application/graphql-response+json; charset=utf-8",
+  "StatusCode": "BadRequest",
   "Data": null,
   "Errors": [
     {

diff --git a/...ts__/HttpGetMiddlewareTests.SingleRequest_CreateReviewForEpisode_With_ObjectVariable.snap b/...ts__/HttpGetMiddlewareTests.SingleRequest_CreateReviewForEpisode_With_ObjectVariable.snap
@@ -1,5 +1,5 @@
 {
-  "ContentType": "application/json; charset=utf-8",
+  "ContentType": "application/graphql-response+json; charset=utf-8",
   "StatusCode": "OK",
   "Data": {
     "createReview": {