Fix dictionary key serialization.

Squidex · Dec 7, 2023 · c87a616 · c87a616
1 parent 72b0161
commit c87a616
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 2 deletions.
diff --git a/csharp/Squidex.ClientLibrary/Directory.Build.props b/csharp/Squidex.ClientLibrary/Directory.Build.props
@@ -15,7 +15,7 @@
     <PackageTags>Squidex HeadlessCMS</PackageTags>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <Version>17.1.0</Version>
+    <Version>17.2.0</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">

diff --git a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary.Tests/SerializationTests.cs b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary.Tests/SerializationTests.cs
@@ -303,4 +303,20 @@ public void Should_deserialize_localized_jsonnull()
 
         Assert.Equal("hello", result?.Value["en"].Value);
     }
+
+    [Fact]
+    public void Should_keep_dictionary_keys()
+    {
+        var workflow = new UpdateWorkflowDto
+        {
+            Steps = new Dictionary<string, WorkflowStepDto>
+            {
+                ["Draft"] = new WorkflowStepDto()
+            }
+        };
+
+        var result = workflow.ToJson(options);
+
+        Assert.Contains("Draft", result, StringComparison.Ordinal);
+    }
 }
diff --git a/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/SquidexOptions.cs b/csharp/Squidex.ClientLibrary/Squidex.ClientLibrary/SquidexOptions.cs
@@ -7,6 +7,7 @@
 
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
+using Newtonsoft.Json.Serialization;
 using Squidex.ClientLibrary.Configuration;
 using Squidex.ClientLibrary.Utils;
 
@@ -35,7 +36,13 @@ public class SquidexOptions : OptionsBase
     /// </summary>
     public SquidexOptions()
     {
-        SerializerSettings.ContractResolver = new JsonNullContractResolver();
+        SerializerSettings.ContractResolver = new JsonNullContractResolver()
+        {
+            NamingStrategy = new CamelCaseNamingStrategy
+            {
+                OverrideSpecifiedNames = true
+            }
+        };
 
         SerializerSettings.Converters.Add(new StringEnumConverter());
         SerializerSettings.Converters.Add(new UTCIsoDateTimeConverter());