Skip to content

Improve default IsValidResponseToDeserialize implementation #560

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
May 8, 2023
Merged

Improve default IsValidResponseToDeserialize implementation #560

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
492b013
change default implementation of response validation method to ensure…
mikocot Apr 26, 2023
c300c08
add tests for the default validation method
mikocot Apr 27, 2023
9b9447b
remove unnecessary comments
mikocot Apr 28, 2023
93b25cb
accepted response types private, formatting
mikocot Apr 28, 2023
bd3b61a
make DefaultIsValidResponseToDeserialize publicly accessible
mikocot Apr 28, 2023
024cf11
AcceptedResponseContentTypes as static field
mikocot Apr 28, 2023
d0dfc87
Merge branch 'bugfix/ensure-responsecontent-type' of https://github.c…
mikocot Apr 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions src/GraphQL.Client/GraphQLHttpClientOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,18 @@ 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 =>
public Func<HttpResponseMessage, bool> IsValidResponseToDeserialize { get; set; } = DefaultIsValidResponseToDeserialize;

internal static IReadOnlyCollection<string> AcceptedResponseContentTypes { get; } = new[] { "application/graphql+json", "application/json", "application/graphql-response+json" };

private static bool DefaultIsValidResponseToDeserialize(HttpResponseMessage 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";
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.
Expand Down