Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 7 additions & 2 deletions src/modules/Elsa.Common/Services/JsonFormatter.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
using System.Text.Encodings.Web;
using System.Text.Json;
using System.Text.Json.Serialization;
using System.Text.Unicode;

namespace Elsa.Common.Services;

Expand All @@ -10,14 +12,17 @@ public class JsonFormatter : IFormatter

public JsonFormatter()
{
_options = new JsonSerializerOptions();
_options = new JsonSerializerOptions
{
Encoder = JavaScriptEncoder.Create(UnicodeRanges.All)
};
_options.Converters.Add(new JsonStringEnumConverter());
}

/// <inheritdoc />
public ValueTask<string> ToStringAsync(object value, CancellationToken cancellationToken = default)
{
var json = JsonSerializer.Serialize(value);
var json = JsonSerializer.Serialize(value, _options);
return ValueTask.FromResult(json);
}

Expand Down
20 changes: 20 additions & 0 deletions test/unit/Elsa.Common.UnitTests/JsonFormatterTests.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
using Elsa.Common.Services;

namespace Elsa.Common.UnitTests;

public class JsonFormatterTests
{
[Fact]
public async Task ToStringAsync_DoesNotEscapeUnicodeCharacters()
{
var formatter = new JsonFormatter();
var value = new { Name = "ÆØÅ" };

var json = await formatter.ToStringAsync(value);

Assert.Contains("ÆØÅ", json);
Assert.DoesNotContain(@"\u00C6", json, StringComparison.OrdinalIgnoreCase);
Assert.DoesNotContain(@"\u00D8", json, StringComparison.OrdinalIgnoreCase);
Assert.DoesNotContain(@"\u00C5", json, StringComparison.OrdinalIgnoreCase);
}
}