Skip to content

Using JsonTypeInfo to read request body in RDF #45932

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
brunolins16 merged 5 commits into from
Jan 10, 2023
Merged

Using JsonTypeInfo to read request body in RDF #45932

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8f6b7ab
Using TypeInfo to read request body in RDF
brunolins16 Jan 6, 2023
845013a
Merge remote-tracking branch 'upstream/main' into brunolins16/aot/jso…
brunolins16 Jan 9, 2023
04313eb
Changing to non-nullable options
brunolins16 Jan 10, 2023
331e0b4
Merge remote-tracking branch 'upstream/main' into brunolins16/aot/jso…
brunolins16 Jan 10, 2023
cbe986f
Changing to a non-nullable option
brunolins16 Jan 10, 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
19 changes: 15 additions & 4 deletions src/Http/Http.Extensions/src/RequestDelegateFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
using System.Security.Claims;
using System.Text;
using System.Text.Json;
using System.Text.Json.Serialization.Metadata;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Http.Features;
using Microsoft.AspNetCore.Http.Json;
Expand Down Expand Up @@ -1159,6 +1160,7 @@ private static Expression AddResponseWritingToMethodCall(Expression methodCall,
Debug.Assert(factoryContext.JsonRequestBodyParameter is not null, "factoryContext.JsonRequestBodyParameter is null for a JSON body.");

var bodyType = factoryContext.JsonRequestBodyParameter.ParameterType;
var jsonTypeInfo = factoryContext.JsonSerializerOptions?.GetReadOnlyTypeInfo(bodyType);
var parameterTypeName = TypeNameHelper.GetTypeDisplayName(factoryContext.JsonRequestBodyParameter.ParameterType, fullName: false);
var parameterName = factoryContext.JsonRequestBodyParameter.Name;

Expand Down Expand Up @@ -1191,7 +1193,8 @@ private static Expression AddResponseWritingToMethodCall(Expression methodCall,
parameterName,
factoryContext.AllowEmptyRequestBody,
factoryContext.ThrowOnBadRequest,
factoryContext.JsonSerializerOptions);
factoryContext.JsonSerializerOptions,
jsonTypeInfo);

if (!successful)
{
Expand All @@ -1216,7 +1219,8 @@ private static Expression AddResponseWritingToMethodCall(Expression methodCall,
parameterName,
factoryContext.AllowEmptyRequestBody,
factoryContext.ThrowOnBadRequest,
factoryContext.JsonSerializerOptions);
factoryContext.JsonSerializerOptions,
jsonTypeInfo);

if (!successful)
{
Expand All @@ -1234,7 +1238,8 @@ private static Expression AddResponseWritingToMethodCall(Expression methodCall,
string parameterName,
bool allowEmptyRequestBody,
bool throwOnBadRequest,
JsonSerializerOptions? jsonSerializerOptions)
JsonSerializerOptions? jsonSerializerOptions,
JsonTypeInfo? jsonTypeInfo)
{
object? defaultBodyValue = null;

Expand All @@ -1256,7 +1261,13 @@ private static Expression AddResponseWritingToMethodCall(Expression methodCall,
}
try
{
bodyValue = await httpContext.Request.ReadFromJsonAsync(bodyType, jsonSerializerOptions);
// Edge case but possible if the RequestDelegateFactoryOptions.ServiceProvider and
// RequestDelegateFactoryOptions.EndpointBuilder.ServiceProvider are null
// In this situation both options and jsonTypeInfo are null.
jsonSerializerOptions ??= httpContext.RequestServices.GetService<IOptions<JsonOptions>>()?.Value.SerializerOptions ?? JsonOptions.DefaultSerializerOptions;
jsonTypeInfo ??= jsonSerializerOptions.GetTypeInfo(bodyType);

bodyValue = await httpContext.Request.ReadFromJsonAsync(jsonTypeInfo);
}
catch (IOException ex)
{
Expand Down