Skip to content

fix: honor htmlEscape in System.Text.Json ToJson (#680) #702

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

Open
leno23 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: honor htmlEscape in System.Text.Json ToJson (#680) #702

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 9 additions & 2 deletions src/MiniProfiler.Shared/Internal/ExtensionMethods.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Serialization;
#elif STJSON
using System.Text.Encodings.Web;
using System.Text.Json;
using System.Text.Json.Serialization;
#endif
Expand Down Expand Up @@ -134,6 +135,13 @@ public static string ToJson(this List<Guid>? guids)
private static readonly JsonSerializerOptions defaultSettings = new()
{
DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
};

private static readonly JsonSerializerOptions htmlEscapeSettings = new()
{
DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
Encoder = JavaScriptEncoder.Default,
};

/// <summary>
Expand All @@ -142,10 +150,9 @@ public static string ToJson(this List<Guid>? guids)
/// <param name="profiler">The <see cref="MiniProfiler"/> to serialize.</param>
/// <param name="htmlEscape">Whether to HTML escape the output.</param>
[return: NotNullIfNotNull(nameof(profiler))]
[SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "Compatibility across versions")]
public static string? ToJson(this MiniProfiler? profiler, bool htmlEscape = false) =>
profiler != default
? JsonSerializer.Serialize(profiler, defaultSettings)
? JsonSerializer.Serialize(profiler, htmlEscape ? htmlEscapeSettings : defaultSettings)
: null;

/// <summary>
Expand Down