Fix: 修复 Microsoft 登录序列化 JSON 时使用 CamelCase 导致 BadRequest 的严重问题，再次完善皮肤获取器

Authentication/MicrosoftAuthentication.cs

@@ -55,7 +55,7 @@
         var resultDict = new RetrieveDeviceCode
         {
             ClientId = ClientId,
             UserCode = responseDict.UserCode,
             DeviceCode = responseDict.DeviceCode,
             VerificationUri = responseDict.VerificationUri,
             Message = responseDict.Message
@@ -95,7 +95,7 @@
             if (tokenRes.IsSuccessStatusCode)
             {
                 var tokenData = tokenJson.ToJsonEntry<GetTokenResponse>();
                 if (!string.IsNullOrEmpty(tokenData.AccessToken))
                     return new GetTokenResponse
                     {
                         ExpiresIn = tokenData.ExpiresIn,
@@ -112,7 +112,7 @@
                     try
                     {
                         var errorData = tokenJson.ToJsonEntry<GetTokenErrorResponse>();
                         switch (errorData.Error)
                         {
                             case "authorization_declined":
                                 throw new Exception("用户拒绝了授权");
@@ -170,7 +170,7 @@
 
         var refreshResponseData = refreshResponse.ToJsonEntry<TokenResponse>();
 
         tokenInfo.AccessToken = refreshResponseData.AccessToken;
         tokenInfo.RefreshToken = refreshResponseData.RefreshToken;
         tokenInfo.ExpiresIn = refreshResponseData.ExpiresIn;
 
@@ -206,8 +206,12 @@
             RelyingParty = "http://auth.xboxlive.com",
             TokenType = "JWT"
         };
+        var options = new JsonSerializerOptions()
+        {
+            WriteIndented = true
+        };
 
-        var xblLoginContentString = xboxLoginContent.Serialize();
+        var xblLoginContentString = xboxLoginContent.Serialize(options);
 
         string xboxResponseString;
 
@@ -238,7 +242,7 @@
             TokenType = "JWT"
         };
 
-        var xstsPostData = getXstsJsonData.Serialize();
+        var xstsPostData = getXstsJsonData.Serialize(options);
 
         var xstsResponse = await HttpUtil.SendHttpPostRequest("https://xsts.auth.xboxlive.com/xsts/authorize",
             xstsPostData, "application/json");

Skin/Fetchers/MicrosoftSkinFetcher.cs

@@ -13,7 +13,7 @@ public class MicrosoftSkinFetcher
     /// <summary>
     /// 获取微软皮肤
     /// </summary>
-    /// <param name="account">皮肤图片字节信息</param>
+    /// <param name="account">微软账户</param>
     /// <returns>皮肤图片字节信息</returns>
     public static async Task<byte[]> GetMicrosoftSkinAsync(MicrosoftAccount account)
     {

Skin/Fetchers/UnifiedPassSkinFetcher.cs

@@ -1,4 +1,5 @@
 using System.Text;
+using StarLight_Core.Models.Authentication;
 using StarLight_Core.Models.Skin;
 using StarLight_Core.Utilities;
 
@@ -12,9 +13,19 @@ public class UnifiedPassSkinFetcher
     /// <summary>
     /// 获取统一通行证皮肤
     /// </summary>
-    /// <param name="uuid">微软账户 Uuid</param>
+    /// <param name="account">统一通行证账户</param>
     /// <returns>皮肤图片字节信息</returns>
-    public static async Task<byte[]> GetMicrosoftUnifiedPassSkinAsync(string uuid)
+    public static async Task<byte[]> GetUnifiedPassSkinAsync(UnifiedPassAccount account)
+    {
+        return await GetUnifiedPassSkinAsync(account.Uuid);
+    }
+
+    /// <summary>
+    /// 获取统一通行证皮肤
+    /// </summary>
+    /// <param name="uuid">统一通行证账户 Uuid</param>
+    /// <returns>皮肤图片字节信息</returns>
+    public static async Task<byte[]> GetUnifiedPassSkinAsync(string uuid)
     {
         const string baseUrl = "https://auth.mc-user.com:233/sessionserver/session/minecraft/profile/";
         var skinJson = await HttpUtil.GetStringAsync(baseUrl + uuid);

Skin/SkinProcessor.cs

@@ -30,7 +30,7 @@ public static void ResizeImage(string inputFilePath, string outputFilePath, int
     /// <param name="base64Image"></param>
     /// <param name="outputFilePath"></param>
     /// <param name="isDecoration"></param>
-    public static void GetLiftLeg(string base64Image, string outputFilePath, bool isDecoration = false)
+    public static void GetLeftLeg(string base64Image, string outputFilePath, bool isDecoration = false)
     {
         var imageBytes = Convert.FromBase64String(base64Image);
 
@@ -126,7 +126,7 @@ public static void GetRightLeg(string base64Image, string outputFilePath, bool i
     /// <param name="base64Image"></param>
     /// <param name="outputFilePath"></param>
     /// <param name="isDecoration"></param>
-    public static void GetLiftArm_Alex(string base64Image, string outputFilePath, bool isDecoration = false)
+    public static void GetLeftArm_Alex(string base64Image, string outputFilePath, bool isDecoration = false)
     {
         var imageBytes = Convert.FromBase64String(base64Image);
 
@@ -222,7 +222,7 @@ public static void GetRightArm_Alex(string base64Image, string outputFilePath, b
     /// <param name="base64Image"></param>
     /// <param name="outputFilePath"></param>
     /// <param name="isDecoration"></param>
-    public static void GetLiftArm_Steve(string base64Image, string outputFilePath, bool isDecoration = false)
+    public static void GetLeftArm_Steve(string base64Image, string outputFilePath, bool isDecoration = false)
     {
         var imageBytes = Convert.FromBase64String(base64Image);
 

StarLight.Core.sln

@@ -1,4 +1,5 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
+
+Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.7.34202.233
 MinimumVisualStudioVersion = 10.0.40219.1

Utilities/JsonUtil.cs

@@ -79,11 +79,12 @@ public static class JsonUtil
     /// 将对象序列化为 JSON 字符串
     /// </summary>
     /// <param name="obj">要序列化的对象</param>
+    /// <param name="options">可选的序列化选项</param>
     /// <returns>表示对象的 JSON 字符串；若 <paramref name="obj"/> 为 null，则返回字符串 "null"</returns>
     /// <exception cref="ArgumentNullException">当 <paramref name="obj"/> 为 null 时抛出</exception>
-    public static string Serialize(this object? obj)
+    public static string Serialize(this object? obj, JsonSerializerOptions? options = null)
     {
-        return obj is null ? throw new ArgumentNullException(nameof(obj)) : JsonSerializer.Serialize(obj, Options);
+        return obj is null ? throw new ArgumentNullException(nameof(obj)) : JsonSerializer.Serialize(obj, options ?? Options);
     }
 
     /// <summary>
@@ -95,7 +96,7 @@ public static string Serialize(this object? obj)
     /// </returns>
     /// <exception cref="JsonException">JSON 字符串格式无效时抛出</exception>
     public static JsonNode? ToJsonNode(this string json) => JsonNode.Parse(json);
-    
+
     /// <summary>
     /// 将 JSON 字符串解析为 <see cref="JsonDocument"/> 对象
     /// </summary>