Fixed polymorphic serialization

WindowsAppCommunity · Mar 9, 2024 · 38cc58d · 38cc58d
1 parent 2cfc7c2
commit 38cc58d
Showing 1 changed file with 17 additions and 5 deletions.
diff --git a/src/Models/JsonConverters/ApplicationConnectionJsonConverter.cs b/src/Models/JsonConverters/ApplicationConnectionJsonConverter.cs
@@ -90,15 +90,27 @@ public override bool CanConvert(Type objectType)
     /// <inheritdoc/>
     public override object? ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
     {
-        if (reader.Value is null)
-            return null;
-
         if (reader.TokenType == JsonToken.Null)
             return null;
 
-        var token = JToken.Load(reader);
+        if (reader.TokenType == JsonToken.PropertyName)
+        {
+            return reader.Value;
+        }
+
+        if (reader.TokenType == JsonToken.StartObject)
+        {
+            var jobj = JObject.Load(reader);
+            return ApplicationConnectionSerializationHelpers.ReadConnection(jobj, serializer);
+        }
+
+        if (reader.TokenType == JsonToken.StartArray)
+        {
+            var jarray = JArray.Load(reader);
+            return ApplicationConnectionSerializationHelpers.ReadConnection(jarray, serializer);
+        }
 
-        return ApplicationConnectionSerializationHelpers.ReadConnection(token, serializer);
+        throw new NotSupportedException($"Token type {reader.TokenType} is not supported.");
     }
 
     /// <inheritdoc/>