fix(ewt-582): fixed OneOfJsonConverter for json deserialisation with …

…both status and type fields (#201)
TrueLayer · Jun 18, 2024 · 433ecea · 433ecea
2 parents 30f0295 + 42638b4
commit 433ecea
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 29 deletions.
diff --git a/src/TrueLayer/Serialization/OneOfJsonConverter.cs b/src/TrueLayer/Serialization/OneOfJsonConverter.cs
@@ -27,30 +27,38 @@ public OneOfJsonConverter(OneOfTypeDescriptor descriptor, string discriminatorFi
 
             var doc = JsonDocument.ParseValue(ref reader);
 
-            if (!doc.RootElement.TryGetProperty(_discriminatorFieldName, out var discriminator) 
-                && !doc.RootElement.TryGetProperty("status", out discriminator)) // Hack until payment response uses a `type` field
+            if (doc.RootElement.TryGetProperty(_discriminatorFieldName, out var discriminator)
+                && (_descriptor.TypeFactories.TryGetValue(discriminator.GetString()!, out var typeFactory)))
             {
-                throw new JsonException();
+                return InokeDiscriminatorFactory(options, readerClone, typeFactory);
             }
 
-            if (_descriptor.TypeFactories.TryGetValue(discriminator.GetString()!, out var typeFactory))
+            // Fallback to status field
+            if (doc.RootElement.TryGetProperty("status", out discriminator)
+                && (_descriptor.TypeFactories.TryGetValue(discriminator.GetString()!, out typeFactory)))
             {
-                object? deserializedObject = JsonSerializer.Deserialize(ref readerClone, typeFactory.FieldType, options);
+                return InokeDiscriminatorFactory(options, readerClone, typeFactory);
+            }
+
+            throw new JsonException($"Unknown discriminator {discriminator}");
+        }
 
-                if (deserializedObject is null)
-                {
-                    throw new ArgumentNullException(nameof(deserializedObject));
-                }
+        private static T? InokeDiscriminatorFactory(JsonSerializerOptions options, Utf8JsonReader readerClone,
+            (Type FieldType, Delegate Factory) typeFactory)
+        {
+            object? deserializedObject = JsonSerializer.Deserialize(ref readerClone, typeFactory.FieldType, options);
 
-                if (typeFactory.Factory is Func<object, T> factory)
-                {
-                    return factory.Invoke(deserializedObject);
-                }
+            if (deserializedObject is null)
+            {
+                throw new ArgumentNullException(nameof(deserializedObject));
+            }
 
-                throw new JsonException($"Unable to execute OneOf factory for type {typeFactory.FieldType.FullName}");
+            if (typeFactory.Factory is Func<object, T> factory)
+            {
+                return factory.Invoke(deserializedObject);
             }
 
-            throw new JsonException($"Unknown discriminator {discriminator}");
+            throw new JsonException($"Unable to execute OneOf factory for type {typeFactory.FieldType.FullName}");
         }
 
         public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions options)

diff --git a/test/TrueLayer.AcceptanceTests/ApiTestFixture.cs b/test/TrueLayer.AcceptanceTests/ApiTestFixture.cs
@@ -14,8 +14,14 @@ public ApiTestFixture()
             IConfiguration configuration = LoadConfiguration();
 
             ServiceProvider = new ServiceCollection()
-                .AddTrueLayer(configuration)
-                .AddSingleton<IConfigureOptions<TrueLayerOptions>, ConfigureTrueLayerOptions>()
+                .AddTrueLayer(configuration, options =>
+                {
+                    string privateKey = File.ReadAllText("ec512-private-key.pem");
+                    if (options.Payments?.SigningKey != null)
+                    {
+                        options.Payments.SigningKey.PrivateKey = privateKey;
+                    }
+                })
                 .BuildServiceProvider();
 
             Client = ServiceProvider.GetRequiredService<ITrueLayerClient>();
@@ -32,16 +38,4 @@ private static IConfiguration LoadConfiguration()
                 .AddEnvironmentVariables()
                 .Build();
     }
-
-    public class ConfigureTrueLayerOptions : IConfigureOptions<TrueLayerOptions>
-    {
-        public void Configure(TrueLayerOptions options)
-        {
-            string privateKey = File.ReadAllText("ec512-private-key.pem");
-            if (options.Payments?.SigningKey != null)
-            {
-                options.Payments.SigningKey.PrivateKey = privateKey;
-            }
-        }
-    }
 }