let GraphQLHttpResponse<T> inherit from GraphQLResponse<T>

Author: rose-a

src/GraphQL.Client/GraphQLHttpClient.cs

@@ -66,11 +66,10 @@ public GraphQLHttpClient(GraphQLHttpClientOptions options, HttpClient httpClient
 
 		/// <inheritdoc />
 		public async Task<GraphQLResponse<TResponse>> SendQueryAsync<TResponse>(GraphQLRequest request, CancellationToken cancellationToken = default) {
-			if(Options.UseWebSocketForQueriesAndMutations)
+			if (Options.UseWebSocketForQueriesAndMutations)
 				return await this.graphQlHttpWebSocket.SendRequest<TResponse>(request, cancellationToken);
-			
-			var response = await this.SendHttpPostRequestAsync<TResponse>(request, cancellationToken);
-			return response.Response;
+
+			return await this.SendHttpPostRequestAsync<TResponse>(request, cancellationToken);
 		}
 
 		/// <inheritdoc />
@@ -116,47 +115,7 @@ public IObservable<GraphQLResponse<TResponse>> CreateSubscriptionStream<TRespons
 		/// </summary>
 		/// <returns></returns>
 		public Task InitializeWebsocketConnection() => graphQlHttpWebSocket.InitializeWebSocket();
-
-		/// <summary>
-		/// Sends a query to the GraphQL server and deserializes the response. Provides access to the HTTP response headers. This method will never utilize the websocket connection!
-		/// </summary>
-		/// <typeparam name="TResponse"></typeparam>
-		/// <param name="request"></param>
-		/// <param name="cancellationToken"></param>
-		/// <returns></returns>
-		public Task<GraphQLHttpResponse<TResponse>> SendQueryHttpAsync<TResponse>(GraphQLRequest request, CancellationToken cancellationToken = default) {
-			return this.SendHttpPostRequestAsync<TResponse>(request, cancellationToken);
-		}
-		/// <inheritdoc cref="SendQueryHttpAsync{TResponse}(GraphQL.GraphQLRequest,System.Threading.CancellationToken)"/>
-		public Task<GraphQLHttpResponse<TResponse>> SendQueryHttpAsync<TResponse>(GraphQLRequest request,
-			Func<TResponse> defineResponseType, CancellationToken cancellationToken = default)
-			=> SendQueryHttpAsync<TResponse>(request, cancellationToken);
-		/// <inheritdoc cref="SendQueryHttpAsync{TResponse}(GraphQL.GraphQLRequest,System.Threading.CancellationToken)"/>
-		public Task<GraphQLHttpResponse<TResponse>> SendQueryHttpAsync<TResponse>(string query, object? variables = null,
-			string? operationName = null, Func<TResponse> defineResponseType = null, CancellationToken cancellationToken = default) {
-			return SendQueryHttpAsync<TResponse>(new GraphQLRequest(query, variables, operationName), cancellationToken: cancellationToken);
-		}
-
-		/// <summary>
-		/// Sends a mutation to the GraphQL server and deserializes the response. Provides access to the HTTP response headers. This method will never utilize the websocket connection!
-		/// </summary>
-		/// <typeparam name="TResponse"></typeparam>
-		/// <param name="request"></param>
-		/// <param name="cancellationToken"></param>
-		/// <returns></returns>
-		public Task<GraphQLHttpResponse<TResponse>> SendMutationHttpAsync<TResponse>(GraphQLRequest request,
-			CancellationToken cancellationToken = default)
-			=> SendQueryHttpAsync<TResponse>(request, cancellationToken);
-		/// <inheritdoc cref="SendMutationHttpAsync{TResponse}(GraphQL.GraphQLRequest,System.Threading.CancellationToken)"/>
-		public Task<GraphQLHttpResponse<TResponse>> SendMutationHttpAsync<TResponse>(GraphQLRequest request,
-			Func<TResponse> defineResponseType, CancellationToken cancellationToken = default)
-			=> SendQueryHttpAsync<TResponse>(request, cancellationToken);
-		/// <inheritdoc cref="SendMutationHttpAsync{TResponse}(GraphQL.GraphQLRequest,System.Threading.CancellationToken)"/>
-		public Task<GraphQLHttpResponse<TResponse>> SendMutationHttpAsync<TResponse>(string query, object? variables = null,
-			string? operationName = null, Func<TResponse> defineResponseType = null, CancellationToken cancellationToken = default) {
-			return SendQueryHttpAsync<TResponse>(new GraphQLRequest(query, variables, operationName), cancellationToken: cancellationToken);
-		}
-
+		
 		#region Private Methods
 
 		private async Task<GraphQLHttpResponse<TResponse>> SendHttpPostRequestAsync<TResponse>(GraphQLRequest request, CancellationToken cancellationToken = default) {
@@ -166,15 +125,10 @@ private async Task<GraphQLHttpResponse<TResponse>> SendHttpPostRequestAsync<TRes
 			if (!httpResponseMessage.IsSuccessStatusCode) {
 				throw new GraphQLHttpException(httpResponseMessage);
 			}
-			
-			var response = new GraphQLHttpResponse<TResponse> {
-				ResponseHeaders = httpResponseMessage.Headers,
-				StatusCode = httpResponseMessage.StatusCode
-			};
 
 			var bodyStream = await httpResponseMessage.Content.ReadAsStreamAsync();
-			response.Response = await JsonSerializer.DeserializeFromUtf8StreamAsync<TResponse>(bodyStream, cancellationToken);
-			return response;
+			var response = await JsonSerializer.DeserializeFromUtf8StreamAsync<TResponse>(bodyStream, cancellationToken);
+			return response.ToGraphQLHttpResponse(httpResponseMessage.Headers, httpResponseMessage.StatusCode);
 		}
 
 		private HttpRequestMessage GenerateHttpRequestMessage(GraphQLRequest request) {

src/GraphQL.Client/GraphQLHttpResponse.cs

@@ -1,15 +1,36 @@
+using System;
 using System.Net;
 using System.Net.Http.Headers;
 
 namespace GraphQL.Client.Http {
 
-	public class GraphQLHttpResponse<T> {
-		public GraphQLHttpResponse()
-		{
+	public class GraphQLHttpResponse<T>: GraphQLResponse<T> {
+		public GraphQLHttpResponse(GraphQLResponse<T> response, HttpResponseHeaders responseHeaders, HttpStatusCode statusCode) {
+			Data = response.Data;
+			Errors = response.Errors;
+			Extensions = response.Extensions;
+			ResponseHeaders = responseHeaders;
+			StatusCode = statusCode;
 		}
-		
-		public GraphQLResponse<T> Response { get; set; }
+
 		public HttpResponseHeaders ResponseHeaders { get; set; }
 		public HttpStatusCode StatusCode { get; set; }
 	}
+
+	public static class GraphQLResponseExtensions {
+		public static GraphQLHttpResponse<T> ToGraphQLHttpResponse<T>(this GraphQLResponse<T> response, HttpResponseHeaders responseHeaders, HttpStatusCode statusCode) {
+			return new GraphQLHttpResponse<T>(response, responseHeaders, statusCode);
+		}
+
+		/// <summary>
+		/// Casts <paramref name="response"/> to <see cref="GraphQLHttpResponse{T}"/>. Throws ig the cast fails.
+		/// </summary>
+		/// <typeparam name="T"></typeparam>
+		/// <param name="response"></param>
+		/// <exception cref="InvalidCastException"><paramref name="response"/> is not a <see cref="GraphQLHttpResponse{T}"/></exception>
+		/// <returns></returns>
+		public static GraphQLHttpResponse<T> AsGraphQLHttpResponse<T>(this GraphQLResponse<T> response) {
+			return (GraphQLHttpResponse<T>) response;
+		}
+	}
 }

tests/GraphQL.Integration.Tests/QueryAndMutationTests/Base.cs

@@ -50,12 +50,18 @@ public async void QueryTheory(int id, string name) {
 
 		[Theory]
 		[ClassData(typeof(StarWarsHumans))]
-		public async void QueryHttpTheory(int id, string name) {
+		public async void QueryAsHttpResponseTheory(int id, string name) {
 			var graphQLRequest = new GraphQLRequest($"{{ human(id: \"{id}\") {{ name }} }}");
-			var httpResponse = await StarWarsClient.SendQueryHttpAsync(graphQLRequest, () => new { Human = new { Name = string.Empty } });
+			var responseType = new {Human = new {Name = string.Empty}};
+			var response = await StarWarsClient.SendQueryAsync(graphQLRequest, () => responseType );
 
-			httpResponse.Response.Errors.Should().BeNull();
-			httpResponse.Response.Data.Human.Name.Should().Be(name);
+			FluentActions.Invoking(() => response.AsGraphQLHttpResponse()).Should()
+				.NotThrow("because the returned object is a GraphQLHttpResponse");
+
+			var httpResponse = response.AsGraphQLHttpResponse();
+
+			httpResponse.Errors.Should().BeNull();
+			httpResponse.Data.Human.Name.Should().Be(name);
 
 			httpResponse.StatusCode.Should().BeEquivalentTo(HttpStatusCode.OK);
 			httpResponse.ResponseHeaders.Date.Should().BeCloseTo(DateTimeOffset.Now, TimeSpan.FromMinutes(1));