Skip to content
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

Adds GraphQL-Preflight in StrawberryShake automatically #6807

Merged
merged 3 commits into from
Jan 11, 2024
Merged

Adds GraphQL-Preflight in StrawberryShake automatically #6807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8d8d56e
Add GraphQL-Preflight automatically in StrawberryShake
PascalSenn Jan 8, 2024
f5d62c9
Cleanup
PascalSenn Jan 8, 2024
3f64ce1
Merge branch 'main' into pse/add-preflight-in-strawberry-shake
michaelstaib Jan 11, 2024
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
64 changes: 43 additions & 21 deletions src/HotChocolate/AspNetCore/src/Transport.Http/DefaultGraphQLHttpClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,9 @@ private async Task<GraphQLHttpResponse> ExecuteInternalAsync(
requestMessage.Version = _http.DefaultRequestVersion;
requestMessage.VersionPolicy = _http.DefaultVersionPolicy;
#endif
var responseMessage = await _http.SendAsync(requestMessage, ResponseHeadersRead, ct).ConfigureAwait(false);
var responseMessage = await _http
.SendAsync(requestMessage, ResponseHeadersRead, ct)
.ConfigureAwait(false);
return new GraphQLHttpResponse(responseMessage);
}

Expand All @@ -134,9 +136,16 @@ private static HttpRequestMessage CreateRequestMessage(

if (method == GraphQLHttpMethod.Post)
{
message.Content = request.EnableFileUploads
? CreateMultipartContent(arrayWriter, request)
: CreatePostContent(arrayWriter, request);
if (request.EnableFileUploads)
{
message.Content = CreateMultipartContent(arrayWriter, request);
message.Headers.AddGraphQLPreflight();
}
else
{
message.Content = CreatePostContent(arrayWriter, request);
}

message.RequestUri = requestUri;
}
else if (method == GraphQLHttpMethod.Get)
Expand All @@ -153,7 +162,9 @@ private static HttpRequestMessage CreateRequestMessage(
return message;
}

private static HttpContent CreatePostContent(ArrayWriter arrayWriter, GraphQLHttpRequest request)
private static HttpContent CreatePostContent(
ArrayWriter arrayWriter,
GraphQLHttpRequest request)
{
using var jsonWriter = new Utf8JsonWriter(arrayWriter, JsonOptionDefaults.WriterOptions);
request.Operation.WriteTo(jsonWriter);
Expand All @@ -163,49 +174,54 @@ private static HttpContent CreatePostContent(ArrayWriter arrayWriter, GraphQLHtt
#if NET7_0_OR_GREATER
content.Headers.ContentType = new MediaTypeHeaderValue(ContentType.Json, "utf-8");
#else
content.Headers.ContentType = new MediaTypeHeaderValue(ContentType.Json) { CharSet = "utf-8" };
content.Headers.ContentType =
new MediaTypeHeaderValue(ContentType.Json) { CharSet = "utf-8" };
#endif
return content;
}

private static HttpContent CreateMultipartContent(ArrayWriter arrayWriter, GraphQLHttpRequest request)
private static HttpContent CreateMultipartContent(
ArrayWriter arrayWriter,
GraphQLHttpRequest request)
{
var fileInfos = WriteFileMapJson(arrayWriter, request);

if (fileInfos.Count == 0)
{
arrayWriter.Reset();
return CreatePostContent(arrayWriter, request);
return CreatePostContent(arrayWriter, request);
}

var start = arrayWriter.Length;
WriteOperationJson(arrayWriter, request);
var buffer = arrayWriter.GetInternalBuffer();

var form = new MultipartFormDataContent();

var operation = new ByteArrayContent(buffer, start, arrayWriter.Length - start);
#if NET7_0_OR_GREATER
operation.Headers.ContentType = new MediaTypeHeaderValue(ContentType.Json, "utf-8");
#else
operation.Headers.ContentType = new MediaTypeHeaderValue(ContentType.Json) { CharSet = "utf-8" };
operation.Headers.ContentType =
new MediaTypeHeaderValue(ContentType.Json) { CharSet = "utf-8" };
#endif
form.Add(operation, "operations");

var fileMap = new ByteArrayContent(buffer, 0, start);
#if NET7_0_OR_GREATER
fileMap.Headers.ContentType = new MediaTypeHeaderValue(ContentType.Json, "utf-8");
#else
fileMap.Headers.ContentType = new MediaTypeHeaderValue(ContentType.Json) { CharSet = "utf-8" };
fileMap.Headers.ContentType =
new MediaTypeHeaderValue(ContentType.Json) { CharSet = "utf-8" };
#endif
form.Add(fileMap, "map");

foreach (var fileInfo in fileInfos)
{
var file = new StreamContent(fileInfo.File.OpenRead());
form.Add(file, fileInfo.Name, fileInfo.File.FileName);
}

return form;
}

Expand All @@ -215,14 +231,18 @@ private static void WriteOperationJson(ArrayWriter arrayWriter, GraphQLHttpReque
request.Operation.WriteTo(jsonWriter);
}

private static IReadOnlyList<FileReferenceInfo> WriteFileMapJson(ArrayWriter arrayWriter, GraphQLHttpRequest request)
private static IReadOnlyList<FileReferenceInfo> WriteFileMapJson(
ArrayWriter arrayWriter,
GraphQLHttpRequest request)
{
using var jsonWriter = new Utf8JsonWriter(arrayWriter, JsonOptionDefaults.WriterOptions);
return Utf8JsonWriterHelper.WriteFilesMap(jsonWriter, request.Operation);
}


private static Uri CreateGetRequestUri(ArrayWriter arrayWriter, Uri baseAddress, OperationRequest request)
private static Uri CreateGetRequestUri(
ArrayWriter arrayWriter,
Uri baseAddress,
OperationRequest request)
{
var sb = new StringBuilder();
var appendAmpersand = false;
Expand Down Expand Up @@ -255,7 +275,8 @@ private static Uri CreateGetRequestUri(ArrayWriter arrayWriter, Uri baseAddress,
{
AppendAmpersand(sb, ref appendAmpersand);
sb.Append("variables=");
sb.Append(Uri.EscapeDataString(FormatDocumentAsJson(arrayWriter, request.VariablesNode)));
sb.Append(
Uri.EscapeDataString(FormatDocumentAsJson(arrayWriter, request.VariablesNode)));
}
else if (request.Variables is not null)
{
Expand All @@ -268,7 +289,8 @@ private static Uri CreateGetRequestUri(ArrayWriter arrayWriter, Uri baseAddress,
{
AppendAmpersand(sb, ref appendAmpersand);
sb.Append("extensions=");
sb.Append(Uri.EscapeDataString(FormatDocumentAsJson(arrayWriter, request.ExtensionsNode)));
sb.Append(
Uri.EscapeDataString(FormatDocumentAsJson(arrayWriter, request.ExtensionsNode)));
}
else if (request.Extensions is not null)
{
Expand Down Expand Up @@ -310,4 +332,4 @@ protected override void Dispose(bool disposing)
_http.Dispose();
}
}
}
}
6 changes: 2 additions & 4 deletions src/HotChocolate/AspNetCore/test/Transport.Http.Tests/GraphQLHttpClientTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -685,8 +685,7 @@ public async Task Post_GraphQL_FileUpload()
var request = new GraphQLHttpRequest(operation, requestUri)
{
Method = GraphQLHttpMethod.Post,
EnableFileUploads = true,
OnMessageCreated = (_, m) => m.Headers.AddGraphQLPreflight()
EnableFileUploads = true
};

// act
Expand Down Expand Up @@ -731,8 +730,7 @@ public async Task Post_GraphQL_FileUpload_With_ObjectValueNode()
var request = new GraphQLHttpRequest(operation, requestUri)
{
Method = GraphQLHttpMethod.Post,
EnableFileUploads = true,
OnMessageCreated = (_, m) => m.Headers.AddGraphQLPreflight()
EnableFileUploads = true
};

// act
Expand Down
Loading