Rename CustomJsonSerializerContext types and files to better names

tinglesoftware · Sep 27, 2023 · eea0e52 · eea0e52
1 parent 05d3b41
commit eea0e52
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/...entication/CustomJsonSerializerContext.cs → ...on/AuthenticationJsonSerializerContext.cs b/...entication/CustomJsonSerializerContext.cs → ...on/AuthenticationJsonSerializerContext.cs
@@ -3,4 +3,4 @@
 namespace Tingle.AspNetCore.Authentication;
 
 [JsonSerializable(typeof(AddressClaim))]
-internal partial class CustomJsonSerializerContext : JsonSerializerContext { }
+internal partial class AuthenticationJsonSerializerContext : JsonSerializerContext { }
diff --git a/src/Tingle.AspNetCore.Authentication/Extensions/ClaimsPrincipalExtensions.cs b/src/Tingle.AspNetCore.Authentication/Extensions/ClaimsPrincipalExtensions.cs
@@ -1,4 +1,5 @@
 using Tingle.AspNetCore.Authentication;
+using SC = Tingle.AspNetCore.Authentication.AuthenticationJsonSerializerContext;
 
 namespace System.Security.Claims;
 
@@ -195,6 +196,6 @@ public static class ClaimsPrincipalExtensions
         if (principal == null) throw new ArgumentNullException(nameof(principal));
         var json = principal.GetAddress();
         if (string.IsNullOrWhiteSpace(json)) return default;
-        return Text.Json.JsonSerializer.Deserialize(json, CustomJsonSerializerContext.Default.AddressClaim);
+        return Text.Json.JsonSerializer.Deserialize(json, SC.Default.AddressClaim);
     }
 }
diff --git a/...entication/CustomJsonSerializerContext.cs → ...on/AuthenticationJsonSerializerContext.cs b/...entication/CustomJsonSerializerContext.cs → ...on/AuthenticationJsonSerializerContext.cs
@@ -3,4 +3,4 @@
 namespace Tingle.Extensions.Http.Authentication;
 
 [JsonSerializable(typeof(OAuthClientCredentialHandler.OAuthTokenResponse))]
-internal partial class CustomJsonSerializerContext : JsonSerializerContext { }
+internal partial class AuthenticationJsonSerializerContext : JsonSerializerContext { }
diff --git a/src/Tingle.Extensions.Http.Authentication/OAuthClientCredentialHandler.cs b/src/Tingle.Extensions.Http.Authentication/OAuthClientCredentialHandler.cs
@@ -1,6 +1,7 @@
 using Microsoft.Extensions.Logging;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using SC = Tingle.Extensions.Http.Authentication.AuthenticationJsonSerializerContext;
 
 namespace Tingle.Extensions.Http.Authentication;
 
@@ -146,7 +147,7 @@ public OAuthClientCredentialHandler(HttpMessageHandler innerHandler, HttpClient?
 #endif
         Logger?.LogTrace("OAuth token response:\n\n{Response}\n\n{Body}", response.ToString(), body);
         response.EnsureSuccessStatusCode(); // ensure it succeeded
-        return JsonSerializer.Deserialize(body, CustomJsonSerializerContext.Default.OAuthTokenResponse);
+        return JsonSerializer.Deserialize(body, SC.Default.OAuthTokenResponse);
     }
 
     internal DateTimeOffset CalculateCacheEntryExpiry(DateTimeOffset expiresOn)

diff --git a/tests/Tingle.Extensions.Http.Authentication.Tests/OAuthClientCredentialHandlerTests.cs b/tests/Tingle.Extensions.Http.Authentication.Tests/OAuthClientCredentialHandlerTests.cs
@@ -3,6 +3,7 @@
 using System.Text;
 using System.Text.Json;
 using System.Text.Json.Nodes;
+using SC = Tingle.Extensions.Http.Authentication.AuthenticationJsonSerializerContext;
 
 namespace Tingle.Extensions.Http.Authentication.Tests;
 
@@ -18,23 +19,23 @@ public void OAuthTokenResponse_Deserializes_MultipleTypes()
     {
         // works with int
         var json = new JsonObject { ["access_token"] = "123", ["expires_in"] = 3599, ["expires_on"] = 1691507550, };
-        var response = JsonSerializer.Deserialize(json, CustomJsonSerializerContext.Default.OAuthTokenResponse);
+        var response = JsonSerializer.Deserialize(json, SC.Default.OAuthTokenResponse);
         Assert.NotNull(response);
         Assert.Equal("123", response.AccessToken);
         Assert.Equal(3599, response.ExpiresIn);
         Assert.Equal(1691507550, response.ExpiresOn);
 
         // tests works with quoted strings
         json = new JsonObject { ["access_token"] = "123", ["expires_in"] = "3599", ["expires_on"] = "1691507550", };
-        response = JsonSerializer.Deserialize(json, CustomJsonSerializerContext.Default.OAuthTokenResponse);
+        response = JsonSerializer.Deserialize(json, SC.Default.OAuthTokenResponse);
         Assert.NotNull(response);
         Assert.Equal("123", response.AccessToken);
         Assert.Equal(3599, response.ExpiresIn);
         Assert.Equal(1691507550, response.ExpiresOn);
 
         // tests works with quoted strings
         json = new JsonObject { ["access_token"] = "123", ["expires_in"] = null, ["expires_on"] = null, };
-        response = JsonSerializer.Deserialize(json, CustomJsonSerializerContext.Default.OAuthTokenResponse);
+        response = JsonSerializer.Deserialize(json, SC.Default.OAuthTokenResponse);
         Assert.NotNull(response);
         Assert.Equal("123", response.AccessToken);
         Assert.Null(response.ExpiresIn);