Skip to content

Commit acdbbd6

Browse files
committed
Merge branch 'master' of github.com:graphql-dotnet/server into develop
# Conflicts: # Directory.Build.props # Tests.props
2 parents 8feba8a + e9855a4 commit acdbbd6

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

src/Transports.AspNetCore/GraphQLHttpMiddleware.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ await WriteErrorResponseAsync(httpResponse, writer, cancellationToken,
117117
{
118118
Query = urlGQLRequest.Query ?? bodyGQLRequest?.Query,
119119
Inputs = urlGQLRequest.Inputs ?? bodyGQLRequest?.Inputs,
120+
Extensions = urlGQLRequest.Extensions ?? bodyGQLRequest?.Extensions,
120121
OperationName = urlGQLRequest.OperationName ?? bodyGQLRequest?.OperationName
121122
};
122123
}
@@ -213,13 +214,15 @@ private Task WriteResponseAsync<TResult>(HttpResponse httpResponse, IDocumentWri
213214
{
214215
Query = queryCollection.TryGetValue(GraphQLRequest.QUERY_KEY, out var queryValues) ? queryValues[0] : null,
215216
Inputs = queryCollection.TryGetValue(GraphQLRequest.VARIABLES_KEY, out var variablesValues) ? _deserializer.DeserializeInputsFromJson(variablesValues[0]) : null,
217+
Extensions = queryCollection.TryGetValue(GraphQLRequest.EXTENSIONS_KEY, out var extensionsValues) ? _deserializer.DeserializeInputsFromJson(extensionsValues[0]) : null,
216218
OperationName = queryCollection.TryGetValue(GraphQLRequest.OPERATION_NAME_KEY, out var operationNameValues) ? operationNameValues[0] : null
217219
};
218220

219221
private GraphQLRequest DeserializeFromFormBody(IFormCollection formCollection) => new GraphQLRequest
220222
{
221223
Query = formCollection.TryGetValue(GraphQLRequest.QUERY_KEY, out var queryValues) ? queryValues[0] : null,
222-
Inputs = formCollection.TryGetValue(GraphQLRequest.VARIABLES_KEY, out var variablesValue) ? _deserializer.DeserializeInputsFromJson(variablesValue[0]) : null,
224+
Inputs = formCollection.TryGetValue(GraphQLRequest.VARIABLES_KEY, out var variablesValues) ? _deserializer.DeserializeInputsFromJson(variablesValues[0]) : null,
225+
Extensions = formCollection.TryGetValue(GraphQLRequest.EXTENSIONS_KEY, out var extensionsValues) ? _deserializer.DeserializeInputsFromJson(extensionsValues[0]) : null,
223226
OperationName = formCollection.TryGetValue(GraphQLRequest.OPERATION_NAME_KEY, out var operationNameValues) ? operationNameValues[0] : null
224227
};
225228

@@ -233,7 +236,7 @@ private async Task<GraphQLRequest> DeserializeFromGraphBodyAsync(Stream bodyStre
233236
// work except for the disposing inner stream.
234237
string query = await new StreamReader(bodyStream).ReadToEndAsync();
235238

236-
return new GraphQLRequest { Query = query };
239+
return new GraphQLRequest { Query = query }; // application/graphql MediaType supports only query text
237240
}
238241
}
239242
}

0 commit comments

Comments
 (0)