From b7c73d555a80097fee1f12942da3d247fd41865c Mon Sep 17 00:00:00 2001
From: Sipke Schoorstra <sipkeschoorstra@outlook.com>
Date: Mon, 3 Jul 2023 15:28:02 +0200
Subject: [PATCH] Fix extension to return default value in case key exists but
 for null

---
 .../Extensions/DictionaryExtensions.cs          | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/clients/Elsa.Api.Client/Extensions/DictionaryExtensions.cs b/src/clients/Elsa.Api.Client/Extensions/DictionaryExtensions.cs
index 3a82775e1..e7a3b8f74 100644
--- a/src/clients/Elsa.Api.Client/Extensions/DictionaryExtensions.cs
+++ b/src/clients/Elsa.Api.Client/Extensions/DictionaryExtensions.cs
@@ -12,9 +12,14 @@ public static class DictionaryExtensions
     /// </summary>
     public static T? TryGetValue<T>(this IDictionary<string, object> dictionary, string key, Func<T>? defaultValue = default, JsonSerializerOptions? serializerOptions = default)
     {
-        if (dictionary.TryGetValue(key, out var value) && value is not JsonElement { ValueKind: JsonValueKind.Undefined }) 
-            return value.ConvertTo<T>(new ObjectConverterOptions(serializerOptions));
-        
+        if (dictionary.TryGetValue(key, out var value) && value is not JsonElement { ValueKind: JsonValueKind.Undefined })
+        {
+            var convertedValue = value.ConvertTo<T>(new ObjectConverterOptions(serializerOptions));
+
+            if (convertedValue != null)
+                return convertedValue;
+        }
+
         if (defaultValue == null)
             return default;
 
@@ -22,15 +27,15 @@ public static class DictionaryExtensions
         dictionary[key] = defaultVal;
         return defaultVal;
     }
-    
+
     /// <summary>
     /// Returns the value of the specified property if it exists, otherwise the default value.
     /// </summary>
     public static object? TryGetValue(this IDictionary<string, object> dictionary, string key, Func<object>? defaultValue = default)
     {
-        if (dictionary.TryGetValue(key, out var value) && value is not JsonElement { ValueKind: JsonValueKind.Undefined }) 
+        if (dictionary.TryGetValue(key, out var value) && value is not JsonElement { ValueKind: JsonValueKind.Undefined })
             return value;
-        
+
         if (defaultValue == null)
             return default;