Skip to content

Respect JsonSerializerOptions casing for property names in validation errors #62036

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.

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

Draft
wants to merge 18 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
d3d01af
Initial plan for issue
Copilot May 20, 2025
03af06c
Add support for JsonSerializerOptions property naming policy in valid…
Copilot May 20, 2025
216406a
Make SerializerOptions property internal and retrieve options from DI
Copilot May 21, 2025
f92b43e
Refactor SerializerOptions property to dynamically access JsonOptions…
Copilot May 21, 2025
0900ced
Made SerializerOptions property public and added tests for formatting…
Copilot May 21, 2025
2694d90
Update ValidationEndpointFilterFactory to use type-safe DI for JsonOp…
Copilot May 21, 2025
193c6a7
Revert changes to package.json and package-lock.json files
Copilot May 21, 2025
c1cfc9e
Address review feedback: Add null check in FormatComplexKey and test …
Copilot May 21, 2025
28b6aa1
Format validation error messages to respect JSON naming policy
Copilot May 21, 2025
e94aff2
Update remaining tests to expect formatted error messages
Copilot May 21, 2025
9db960a
Fix member name formatting in validation errors
Copilot May 21, 2025
e9f9a2e
Fix validation error formatting
Copilot May 21, 2025
59069f7
Update tests and fix implementation for more cases
captainsafia May 28, 2025
10a3187
Merge branch 'main' into copilot/fix-61764-2
captainsafia May 28, 2025
2f5b553
Add PublicConstructors to DynamicallyAccessedMembers attribute in Val…
Copilot May 28, 2025
0ba6127
Merge branch 'main' into copilot/fix-61764-2
captainsafia May 29, 2025
f45c25a
Fix test after rebase
captainsafia May 29, 2025
d0e29c8
Merge branch 'main' into copilot/fix-61764-2
captainsafia May 29, 2025
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
2 changes: 2 additions & 0 deletions src/Http/Http.Abstractions/src/PublicAPI.Unshipped.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ Microsoft.AspNetCore.Http.Validation.ValidateContext.ValidationContext.get -> Sy
Microsoft.AspNetCore.Http.Validation.ValidateContext.ValidationContext.set -> void
Microsoft.AspNetCore.Http.Validation.ValidateContext.ValidationErrors.get -> System.Collections.Generic.Dictionary<string!, string![]!>?
Microsoft.AspNetCore.Http.Validation.ValidateContext.ValidationErrors.set -> void
Microsoft.AspNetCore.Http.Validation.ValidateContext.SerializerOptions.get -> System.Text.Json.JsonSerializerOptions?
Microsoft.AspNetCore.Http.Validation.ValidateContext.SerializerOptions.set -> void
Microsoft.AspNetCore.Http.Validation.ValidateContext.ValidationOptions.get -> Microsoft.AspNetCore.Http.Validation.ValidationOptions!
Microsoft.AspNetCore.Http.Validation.ValidateContext.ValidationOptions.set -> void
Microsoft.AspNetCore.Http.Validation.ValidationOptions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,14 @@ public virtual async Task ValidateAsync(object? value, ValidateContext context,
}

context.ValidationContext.DisplayName = DisplayName;
context.ValidationContext.MemberName = Name;

// Format member name according to naming policy if available
var memberName = Name;
if (context.SerializerOptions?.PropertyNamingPolicy is not null)
{
memberName = context.SerializerOptions.PropertyNamingPolicy.ConvertName(Name);
}
context.ValidationContext.MemberName = memberName;

var validationAttributes = GetValidationAttributes();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@

using System.ComponentModel.DataAnnotations;
using System.Diagnostics.CodeAnalysis;
using System.Reflection;
using System.Text.Json;
using System.Text.Json.Serialization;

namespace Microsoft.AspNetCore.Http.Validation;

Expand All @@ -18,7 +21,7 @@ public abstract class ValidatablePropertyInfo : IValidatableInfo
/// Creates a new instance of <see cref="ValidatablePropertyInfo"/>.
/// </summary>
protected ValidatablePropertyInfo(
[param: DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)]
[param: DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties | DynamicallyAccessedMemberTypes.PublicConstructors)]
Type declaringType,
Type propertyType,
string name,
Expand All @@ -33,7 +36,7 @@ protected ValidatablePropertyInfo(
/// <summary>
/// Gets the member type.
/// </summary>
[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)]
[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties | DynamicallyAccessedMemberTypes.PublicConstructors)]
internal Type DeclaringType { get; }

/// <summary>
Expand Down Expand Up @@ -65,18 +68,24 @@ public virtual async Task ValidateAsync(object? value, ValidateContext context,
var validationAttributes = GetValidationAttributes();

// Calculate and save the current path
var memberName = GetJsonPropertyName(Name, property, context.SerializerOptions?.PropertyNamingPolicy);
var originalPrefix = context.CurrentValidationPath;
if (string.IsNullOrEmpty(originalPrefix))
{
context.CurrentValidationPath = Name;
context.CurrentValidationPath = memberName;
}
else
{
context.CurrentValidationPath = $"{originalPrefix}.{Name}";
context.CurrentValidationPath = $"{originalPrefix}.{memberName}";
}

context.ValidationContext.DisplayName = DisplayName;
context.ValidationContext.MemberName = Name;
// Format the display name and member name according to JsonPropertyName attribute first, then naming policy
// If the property has a [Display] attribute (either on property or record parameter), use DisplayName directly without formatting
var hasDisplayAttribute = HasDisplayAttribute(property);
context.ValidationContext.DisplayName = hasDisplayAttribute
? DisplayName
: GetJsonPropertyName(DisplayName, property, context.SerializerOptions?.PropertyNamingPolicy);
context.ValidationContext.MemberName = memberName;

// Check required attribute first
if (_requiredAttribute is not null || validationAttributes.TryGetRequiredAttribute(out _requiredAttribute))
Expand Down Expand Up @@ -170,4 +179,61 @@ void ValidateValue(object? val, string errorPrefix, ValidationAttribute[] valida
}
}
}

/// <summary>
/// Gets the effective member name for JSON serialization, considering JsonPropertyName attribute and naming policy.
/// </summary>
/// <param name="targetValue">The target value to get the name for.</param>
/// <param name="property">The property info to get the name for.</param>
/// <param name="namingPolicy">The JSON naming policy to apply if no JsonPropertyName attribute is present.</param>
/// <returns>The effective property name for JSON serialization.</returns>
private static string GetJsonPropertyName(string targetValue, PropertyInfo property, JsonNamingPolicy? namingPolicy)
{
var jsonPropertyName = property.GetCustomAttribute<JsonPropertyNameAttribute>()?.Name;

if (jsonPropertyName is not null)
{
return jsonPropertyName;
}

if (namingPolicy is not null)
{
return namingPolicy.ConvertName(targetValue);
}

return targetValue;
}

/// <summary>
/// Determines whether the property has a DisplayAttribute, either directly on the property
/// or on the corresponding constructor parameter if the declaring type is a record.
/// </summary>
/// <param name="property">The property to check.</param>
/// <returns>True if the property has a DisplayAttribute, false otherwise.</returns>
private bool HasDisplayAttribute(PropertyInfo property)
{
// Check if the property itself has the DisplayAttribute with a valid Name
if (property.GetCustomAttribute<DisplayAttribute>() is { Name: not null })
{
return true;
}

// Look for a constructor parameter matching the property name (case-insensitive)
// to account for the record scenario
foreach (var constructor in DeclaringType.GetConstructors())
{
foreach (var parameter in constructor.GetParameters())
{
if (string.Equals(parameter.Name, property.Name, StringComparison.OrdinalIgnoreCase))
{
if (parameter.GetCustomAttribute<DisplayAttribute>() is { Name: not null })
{
return true;
}
}
}
}

return false;
}
}
124 changes: 116 additions & 8 deletions src/Http/Http.Abstractions/src/Validation/ValidateContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

using System.ComponentModel.DataAnnotations;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using System.Text.Json;

namespace Microsoft.AspNetCore.Http.Validation;

Expand Down Expand Up @@ -59,42 +61,148 @@ public sealed class ValidateContext
/// This is used to prevent stack overflows from circular references.
/// </summary>
public int CurrentDepth { get; set; }

/// <summary>
/// Gets or sets the JSON serializer options to use for property name formatting.
/// When available, property names in validation errors will be formatted according to the
/// PropertyNamingPolicy and JsonPropertyName attributes.
/// </summary>
public JsonSerializerOptions? SerializerOptions { get; set; }

internal void AddValidationError(string key, string[] error)
internal void AddValidationError(string key, string[] errors)
{
ValidationErrors ??= [];

ValidationErrors[key] = error;
var formattedKey = FormatKey(key);
ValidationErrors[formattedKey] = errors;
}

internal void AddOrExtendValidationErrors(string key, string[] errors)
{
ValidationErrors ??= [];

if (ValidationErrors.TryGetValue(key, out var existingErrors))
var formattedKey = FormatKey(key);

if (ValidationErrors.TryGetValue(formattedKey, out var existingErrors))
{
var newErrors = new string[existingErrors.Length + errors.Length];
existingErrors.CopyTo(newErrors, 0);
errors.CopyTo(newErrors, existingErrors.Length);
ValidationErrors[key] = newErrors;
ValidationErrors[formattedKey] = newErrors;
}
else
{
ValidationErrors[key] = errors;
ValidationErrors[formattedKey] = errors;
}
}

internal void AddOrExtendValidationError(string key, string error)
{
ValidationErrors ??= [];

if (ValidationErrors.TryGetValue(key, out var existingErrors) && !existingErrors.Contains(error))
var formattedKey = FormatKey(key);

if (ValidationErrors.TryGetValue(formattedKey, out var existingErrors) && !existingErrors.Contains(error))
{
ValidationErrors[key] = [.. existingErrors, error];
ValidationErrors[formattedKey] = [.. existingErrors, error];
}
else
{
ValidationErrors[key] = [error];
ValidationErrors[formattedKey] = [error];
}
}

private string FormatKey(string key)
{
if (string.IsNullOrEmpty(key) || SerializerOptions?.PropertyNamingPolicy is null)
{
return key;
}

// If the key contains a path (e.g., "Address.Street" or "Items[0].Name"),
// apply the naming policy to each part of the path
if (key.Contains('.') || key.Contains('['))
{
return FormatComplexKey(key);
}

// Apply the naming policy directly
return SerializerOptions.PropertyNamingPolicy.ConvertName(key);
}

private string FormatComplexKey(string key)
{
// Use a more direct approach for complex keys with dots and array indices
var result = new System.Text.StringBuilder();
int lastIndex = 0;
int i = 0;
bool inBracket = false;
var propertyNamingPolicy = SerializerOptions?.PropertyNamingPolicy;

while (i < key.Length)
{
char c = key[i];

if (c == '[')
{
// Format the segment before the bracket
if (i > lastIndex)
{
string segment = key.Substring(lastIndex, i - lastIndex);
string formattedSegment = propertyNamingPolicy is not null
? propertyNamingPolicy.ConvertName(segment)
: segment;
result.Append(formattedSegment);
}

// Start collecting the bracket part
inBracket = true;
result.Append(c);
lastIndex = i + 1;
}
else if (c == ']')
{
// Add the content inside the bracket as-is
if (i > lastIndex)
{
string segment = key.Substring(lastIndex, i - lastIndex);
result.Append(segment);
}
result.Append(c);
inBracket = false;
lastIndex = i + 1;
}
else if (c == '.' && !inBracket)
{
// Format the segment before the dot
if (i > lastIndex)
{
string segment = key.Substring(lastIndex, i - lastIndex);
string formattedSegment = propertyNamingPolicy is not null
? propertyNamingPolicy.ConvertName(segment)
: segment;
result.Append(formattedSegment);
}
result.Append(c);
lastIndex = i + 1;
}

i++;
}

// Format the last segment if there is one
if (lastIndex < key.Length)
{
string segment = key.Substring(lastIndex);
if (!inBracket && propertyNamingPolicy is not null)
{
segment = propertyNamingPolicy.ConvertName(segment);
}
result.Append(segment);
}

return result.ToString();
}


}
Loading
Loading