Bugfix for Enum deserialization for System.Text.Json.

Author: lvukadinovic-ib

ApiClient.Tests/Api/CallRoutingApiTest.cs

@@ -627,7 +627,7 @@ public void ShouldUrlDestinationWebhook()
         var expectedSipTrunkId = "60d345fd3a799ec";
         var expectedValueType = "SIP";
         var expectedConnectTimeout = 30;
-        var expectedRecordingType = CallRoutingRecordingType.Audio;
+        var expectedRecordingType = "AUDIO";
         var expectedType = "ENDPOINT";
 
         var expectedResponse = $@"
@@ -688,7 +688,7 @@ void AssertCallRoutingEndpointDestinationResponse(
             Assert.AreEqual(expectedSipTrunkId, callRoutingSipEndpoint.SipTrunkId);
 
             Assert.AreEqual(expectedConnectTimeout, callRoutingEndpointDestinationResponse.ConnectTimeout);
-            Assert.AreEqual(expectedRecordingType, callRoutingEndpointDestinationResponse.Recording.RecordingType);
+            Assert.AreEqual(expectedRecordingType, GetEnumAttributeValue(callRoutingEndpointDestinationResponse.Recording.RecordingType));
         }
 
         void AssertCallRoutingUrlDestinationHttpRequest(

ApiClient.Tests/Api/NumberMaskingApiTest.cs

@@ -409,7 +409,7 @@ public void ShouldNumberMaskingStatusApi()
         var givenCurrency = "7e8d64c0-6c72-4922-aa96-48728753c660";
         var givenRecordingFileId = "EUR";
         var givenRecordingCalleeAnnouncement = true;
-        var givenRecordingStatus = NumberMaskingRecordingStatus.Sftp;
+        var givenRecordingStatus = "SFTP";
         var givenClientReferenceId = "7e8d64c0-6c72-4922-aa96-48728753c660";
 
         var givenRequest = $@"
@@ -460,7 +460,7 @@ void AssertNumberMaskingStatusRequest(NumberMaskingStatusRequest numberMaskingSt
             Assert.AreEqual(givenCurrency, numberMaskingStatusRequest.Currency);
             Assert.AreEqual(givenRecordingFileId, numberMaskingStatusRequest.RecordingFileId);
             Assert.AreEqual(givenRecordingCalleeAnnouncement, numberMaskingStatusRequest.RecordCalleeAnnouncement);
-            Assert.AreEqual(givenRecordingStatus, numberMaskingStatusRequest.RecordingStatus);
+            Assert.AreEqual(givenRecordingStatus, GetEnumAttributeValue(numberMaskingStatusRequest.RecordingStatus!));
             Assert.AreEqual(givenClientReferenceId, numberMaskingStatusRequest.ClientReferenceId);
         }
     }

ApiClient.Tests/Api/SmsApiTest.cs

@@ -1558,12 +1558,12 @@ public void ShouldReceiveOutBoundSmsMessageReport()
         var givenPricePerMessage = 0.01m;
         var givenCurrency = "EUR";
         var givenStatusGroupId = 3;
-        var givenStatusGroupName = MessageGeneralStatus.Delivered;
+        var givenStatusGroupName = "DELIVERED";
         var givenStatusId = 5;
         var givenStatusName = "DELIVERED_TO_HANDSET";
         var givenStatusDescription = "Message delivered to handset";
         var givenErrorGroupId = 0;
-        var givenErrorGroupName = MessageErrorGroup.Ok;
+        var givenErrorGroupName = "USER_ERRORS";
         var givenErrorId = 0;
         var givenErrorName = "NO_ERROR";
         var givenErrorDescription = "No Error";
@@ -1582,12 +1582,12 @@ public void ShouldReceiveOutBoundSmsMessageReport()
         var givenSecondPricePerMessage = 0.01m;
         var givenSecondCurrency = "EUR";
         var givenSecondStatusGroupId = 3;
-        var givenSecondStatusGroupName = MessageGeneralStatus.Delivered;
+        var givenSecondStatusGroupName = "DELIVERED";
         var givenSecondStatusId = 5;
         var givenSecondStatusName = "DELIVERED_TO_HANDSET";
         var givenSecondStatusDescription = "Message delivered to handset";
         var givenSecondErrorGroupId = 0;
-        var givenSecondErrorGroupName = MessageErrorGroup.Ok;
+        var givenSecondErrorGroupName = "HANDSET_ERRORS";
         var givenSecondErrorId = 0;
         var givenSecondErrorName = "NO_ERROR";
         var givenSecondErrorDescription = "No Error";
@@ -1691,13 +1691,13 @@ void AssertSmsDeliveryResult(SmsDeliveryResult smsDeliveryResult)
             Assert.AreEqual(givenCurrency, smsDeliveryReport.Price.Currency);
 
             Assert.AreEqual(givenStatusGroupId, smsDeliveryReport.Status.GroupId);
-            Assert.AreEqual(givenStatusGroupName, smsDeliveryReport.Status.GroupName);
+            Assert.AreEqual(givenStatusGroupName, GetEnumAttributeValue(smsDeliveryReport.Status.GroupName!));
             Assert.AreEqual(givenStatusId, smsDeliveryReport.Status.Id);
             Assert.AreEqual(givenStatusName, smsDeliveryReport.Status.Name);
             Assert.AreEqual(givenStatusDescription, smsDeliveryReport.Status.Description);
 
             Assert.AreEqual(givenErrorGroupId, smsDeliveryReport.Error.GroupId);
-            Assert.AreEqual(givenErrorGroupName, smsDeliveryReport.Error.GroupName);
+            Assert.AreEqual(givenErrorGroupName, GetEnumAttributeValue(smsDeliveryReport.Error.GroupName!));
             Assert.AreEqual(givenErrorId, smsDeliveryReport.Error.Id);
             Assert.AreEqual(givenErrorName, smsDeliveryReport.Error.Name);
             Assert.AreEqual(givenErrorDescription, smsDeliveryReport.Error.Description);
@@ -1720,13 +1720,13 @@ void AssertSmsDeliveryResult(SmsDeliveryResult smsDeliveryResult)
             Assert.AreEqual(givenSecondCurrency, smsSecondDeliveryReport.Price.Currency);
 
             Assert.AreEqual(givenSecondStatusGroupId, smsSecondDeliveryReport.Status.GroupId);
-            Assert.AreEqual(givenSecondStatusGroupName, smsSecondDeliveryReport.Status.GroupName);
+            Assert.AreEqual(givenSecondStatusGroupName, GetEnumAttributeValue(smsSecondDeliveryReport.Status.GroupName!));
             Assert.AreEqual(givenSecondStatusId, smsSecondDeliveryReport.Status.Id);
             Assert.AreEqual(givenSecondStatusName, smsSecondDeliveryReport.Status.Name);
             Assert.AreEqual(givenSecondStatusDescription, smsSecondDeliveryReport.Status.Description);
 
             Assert.AreEqual(givenSecondErrorGroupId, smsSecondDeliveryReport.Error.GroupId);
-            Assert.AreEqual(givenSecondErrorGroupName, smsSecondDeliveryReport.Error.GroupName);
+            Assert.AreEqual(givenSecondErrorGroupName, GetEnumAttributeValue(smsSecondDeliveryReport.Error.GroupName!));
             Assert.AreEqual(givenSecondErrorId, smsSecondDeliveryReport.Error.Id);
             Assert.AreEqual(givenSecondErrorName, smsSecondDeliveryReport.Error.Name);
             Assert.AreEqual(givenSecondErrorDescription, smsSecondDeliveryReport.Error.Description);

CHANGELOG.md

@@ -5,6 +5,14 @@ All notable changes to the library will be documented in this file.
 The format of the file is based on [Keep a Changelog](http://keepachangelog.com/)
 and this library adheres to [Semantic Versioning](http://semver.org/) as mentioned in [README.md][readme] file.
 
+## [ [4.0.2](https://github.com/infobip/infobip-api-csharp-client/releases/tag/v4.0.2) ] - 2025-12-08
+
+### Added
+- Custom Enum Converter for System.Text.Json (see ###fixed for more information)
+
+### Fixed
+- Enum deserialization using System.Text.Json now correctly maps Json string values to enums using values defined by [EnumMember]
+
 ## [ [4.0.1](https://github.com/infobip/infobip-api-csharp-client/releases/tag/v4.0.1) ] - 2025-12-03
 
 ### Changed

README.md

@@ -37,17 +37,17 @@ Within Visual Studio, use the Package Manager UI to browse for `Infobip.Api.Clie
 #### Package Manager Console
 Alternatively, also within Visual Studio, use the Package Manager Console command:
 
-    Install-Package Infobip.Api.Client -Version 4.0.1
+    Install-Package Infobip.Api.Client -Version 4.0.2
 
 #### .NET CLI
 If you are used to .NET CLI, the following command is going to be sufficient for you:
 
-    dotnet add package Infobip.Api.Client --version 4.0.1
+    dotnet add package Infobip.Api.Client --version 4.0.2
 
 ### Package reference
 Including the package directly into project file is also valid option.
 
-    <PackageReference Include="Infobip.Api.Client" Version="4.0.1" />
+    <PackageReference Include="Infobip.Api.Client" Version="4.0.2" />
 
 ## Quickstart
 

src/Infobip.Api.Client/Client/Configuration.cs

@@ -41,7 +41,7 @@ public class Configuration : IReadableConfiguration
         ///     Version of the package.
         /// </summary>
         /// <value>Version of the package.</value>
-        public const string Version = "4.0.1";
+        public const string Version = "4.0.2";
 
         private string _dateTimeFormat = Iso8601DateTimeFormat;
 
@@ -54,7 +54,7 @@ public class Configuration : IReadableConfiguration
         public Configuration()
         {
             Proxy = null;
-            UserAgent = "infobip-api-client-csharp/4.0.1";
+            UserAgent = "infobip-api-client-csharp/4.0.2";
             BasePath = "http://localhost";
             DefaultHeaders = new ConcurrentDictionary<string, string>();
 

src/Infobip.Api.Client/Client/JsonStringEnumMemberConverter.cs

@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Runtime.Serialization;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Infobip.Api.Client
+{
+    public class JsonStringEnumMemberConverter<T> : JsonConverter<T> where T : struct, Enum
+    {
+        private readonly Dictionary<string, T> _fromValue;
+        private readonly Dictionary<T, string> _toValue;
+
+        public JsonStringEnumMemberConverter()
+        {
+            _fromValue = new Dictionary<string, T>(StringComparer.OrdinalIgnoreCase);
+            _toValue = new Dictionary<T, string>();
+            foreach (var field in typeof(T).GetFields(BindingFlags.Public | BindingFlags.Static))
+            {
+                var enumValue = (T)field.GetValue(null);
+                var enumMemberAttr = field.GetCustomAttribute<EnumMemberAttribute>();
+                var strValue = enumMemberAttr?.Value ?? field.Name;
+                _fromValue[strValue] = enumValue;
+                _toValue[enumValue] = strValue;
+            }
+        }
+
+        public override T Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            if (reader.TokenType == JsonTokenType.String)
+            {
+                var enumString = reader.GetString();
+                if (_fromValue.TryGetValue(enumString, out var value))
+                    return value;
+                throw new JsonException($"Unknown value '{enumString}' for enum '{typeof(T).Name}'");
+            }
+            throw new JsonException($"Unexpected token parsing enum. Expected String, got {reader.TokenType}.");
+        }
+
+        public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions options)
+        {
+            if (_toValue.TryGetValue(value, out var stringValue))
+                writer.WriteStringValue(stringValue);
+            else
+                writer.WriteStringValue(value.ToString());
+        }
+    }   
+}

src/Infobip.Api.Client/Infobip.Api.Client.csproj

@@ -12,9 +12,9 @@
     <Description>C# library for consuming Infobip&#39;s API</Description>
     <Copyright>Copyright @ Infobip ltd. All rights reserved.</Copyright>
     <RootNamespace>Infobip.Api.Client</RootNamespace>
-    <Version>4.0.1</Version>
-    <FileVersion>4.0.1</FileVersion>
-    <AssemblyVersion>4.0.1</AssemblyVersion>
+    <Version>4.0.2</Version>
+    <FileVersion>4.0.2</FileVersion>
+    <AssemblyVersion>4.0.2</AssemblyVersion>
     <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\Infobip.Api.Client.xml</DocumentationFile>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <RepositoryUrl>https://github.com/infobip/infobip-api-csharp-client.git</RepositoryUrl>

src/Infobip.Api.Client/Model/CallDirection.cs

@@ -10,7 +10,6 @@
 
 
 using System.Runtime.Serialization;
-using System.Text.Json.Serialization;
 using Newtonsoft.Json.Converters;
 using JsonConverterAttribute = Newtonsoft.Json.JsonConverterAttribute;
 
@@ -21,7 +20,7 @@ namespace Infobip.Api.Client.Model
     /// </summary>
     /// <value>Call direction.</value>
     [JsonConverter(typeof(StringEnumConverter))]
-    [System.Text.Json.Serialization.JsonConverter(typeof(JsonStringEnumConverter))]
+    [System.Text.Json.Serialization.JsonConverter(typeof(JsonStringEnumMemberConverter<CallDirection>))]
     public enum CallDirection
     {
         /// <summary>

src/Infobip.Api.Client/Model/CallEndpointType.cs

@@ -10,7 +10,6 @@
 
 
 using System.Runtime.Serialization;
-using System.Text.Json.Serialization;
 using Newtonsoft.Json.Converters;
 using JsonConverterAttribute = Newtonsoft.Json.JsonConverterAttribute;
 
@@ -20,7 +19,7 @@ namespace Infobip.Api.Client.Model
     ///     Defines CallEndpointType.
     /// </summary>
     [JsonConverter(typeof(StringEnumConverter))]
-    [System.Text.Json.Serialization.JsonConverter(typeof(JsonStringEnumConverter))]
+    [System.Text.Json.Serialization.JsonConverter(typeof(JsonStringEnumMemberConverter<CallEndpointType>))]
     public enum CallEndpointType
     {
         /// <summary>