minor fixes Jwk.ToJson() / Jwk.FromJson()

dvsekhvalnov · Apr 2, 2024 · d7ec618 · d7ec618
1 parent fb858ed
commit d7ec618
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/UnitTestsNet46/jwk/JwkSetTest.cs b/UnitTestsNet46/jwk/JwkSetTest.cs
@@ -136,7 +136,7 @@ public void ToJson()
             });
 
             //when
-            var test = keySet.ToJson(JWT.DefaultSettings.JsonMapper);
+            var test = keySet.ToJson();
 
             //then
             Console.Out.WriteLine(test);
@@ -162,7 +162,7 @@ public void FromJson()
             }";
 
             //when
-            JwkSet test = JwkSet.FromJson(json, JWT.DefaultSettings.JsonMapper);
+            JwkSet test = JwkSet.FromJson(json);
 
             //then
             Assert.Equal(2, test.Keys.Count);

diff --git a/UnitTestsNet46/jwk/JwkTest.cs b/UnitTestsNet46/jwk/JwkTest.cs
@@ -1251,7 +1251,7 @@ public void ToJson_EccPrivKey()
                            );
 
             //when
-            var test = key.ToJson(JWT.DefaultSettings.JsonMapper);
+            var test = key.ToJson();
 
             //then
             Console.Out.WriteLine(test);
@@ -1273,7 +1273,7 @@ public void FromJson_EccKey_Cng()
             }";
 
             //when
-            var test = Jwk.FromJson(json, JWT.DefaultSettings.JsonMapper);
+            var test = Jwk.FromJson(json);
 
             //then
             Assert.Equal("Ex-p1KJFz8hQE1S76SzkhHcaObCKoDPrtAPJdWuTcTc", test.KeyId);

diff --git a/jose-jwt/jwk/Jwk.cs b/jose-jwt/jwk/Jwk.cs
@@ -552,13 +552,13 @@ public static Jwk FromDictionary(IDictionary<string, object> data)
 
         public string ToJson(IJsonMapper mapper = null)
         {
-            return mapper.Serialize(ToDictionary());
+            return (mapper ?? JWT.DefaultSettings.JsonMapper).Serialize(ToDictionary());
         }
 
         public static Jwk FromJson(string json, IJsonMapper mapper = null)
         {
             return Jwk.FromDictionary(
-                mapper.Parse<IDictionary<string, object>>(json)
+                (mapper ?? JWT.DefaultSettings.JsonMapper).Parse<IDictionary<string, object>>(json)
             );
         }