sync code

Author: baiyuexiao496

.idea/.idea.SuikaiLauncher.Core/.idea/workspace.xml

@@ -1,51 +1,75 @@
+using System.ComponentModel;
 using SuikaiLauncher.Core.Account.JsonModel;
 using SuikaiLauncher.Core.Base;
 using SuikaiLauncher.Core.Override;
-using System.Runtime.CompilerServices;
 
+namespace SuikaiLauncher.Core.Account.Modules;
 
-namespace SuikaiLauncher.Core.Account
+public class Microsoft
 {
-    public class Microsoft
+    public enum LoginState
     {
-        public static Action<Dictionary<string, string>>? Callback;
-        public static string?ClientId;
-        public async static Task GetDeviceCode()
+        Success,
+        Error,
+        Pending
+    }
+    public class MSLoginResult
+    {
+        public LoginState? State;
+        public string? Description;
+        internal string? AccessToken;
+        internal string? RefreshToken;
+    }
+    public static async Task<MicrosoftOAuthCode> GetOAuthCode()
+    {
+        using (MemoryStream ReqStream = new("client_id=&scope=XboxLive.Signin offline_access".GetBytes()))
         {
-            using(MemoryStream ReqData = new($"client_id={ClientId}&scope=XboxLive.Signin%20offline_access".GetBytes()))
+            try
             {
-                HttpResponseMessage? Resp = (await HttpRequestBuilder
-                .Create("https://login.microsoftonline.com/consumers/oauth2/v2.0/devicecode", HttpMethod.Post)
-                .WithRequestData(ReqData)
-                .SetHeader("Content-Type", "application/x-www-form-urlencoded")
-                .SetHeader("Accept","application/json")
-                .SetHeader("User-Agent",HttpRequestBuilder.UserAgent)
-                .UseProxy()
-                .Invoke()).GetResponse();
-                OAuthDeviceCode DeviceCode = Json.Deserialize<OAuthDeviceCode>(await FileIO.ReadAsString(Resp));
-                if (Callback is not null) Callback(new Dictionary<string, string>()
-                {
-                    ["user_code"] = DeviceCode.UserCode,
-                    ["verification_uri"] = DeviceCode.Verification,
-                    ["verification_uri_complete"] = DeviceCode.VerificationComplete ?? string.Empty
-                });
-
+                HttpResponseMessage Response = await HttpRequestBuilder
+                    .Create("https://login.microsoftonline.com/consumers/oauth2/v2.0/device_code", HttpMethod.Post)
+                    .WithRequestData(ReqStream)
+                    .GetResponse();
+                return Json.Deserialize<MicrosoftOAuthCode>(await FileIO.ReadAsString(Response));
+            }
+            catch (HttpRequestException ex)
+            {
+                Logger.Log(ex,"[Account] Microsoft 登录失败");
             }
-
-            return;
         }
-        public async static Task ValidateUserAuthorizeResult(OAuthDeviceCode DeviceCode)
+    }
+
+    public static async Task<MSLoginResult> ValidateUserAuthorizeResult(MicrosoftOAuthCode DeviceResult)
+    {
+        await Task.Delay(DeviceResult.Interval);
+        using (MemoryStream ReqStream = new("client_id=&device_code=&scope=XboxLive.Signin offline_access".GetBytes()))
         {
-            using (MemoryStream ReqData = new("device_code=&client_id=&".GetBytes()))
+            HttpResponseMessage Response = await HttpRequestBuilder
+                .Create("https://login.microsoftonline.com/consumers/oauth2/v2.0/device_code", HttpMethod.Get)
+                .WithRequestData(ReqStream)
+                .GetResponse(false);
+            MicrosoftAuthorizeResult Result = Json.Deserialize<MicrosoftAuthorizeResult>(await FileIO.ReadAsString(Response));
+            MSLoginResult LoginResult = new();
+            if (Result.Error is not null)
             {
-                HttpResponseMessage? Resp = (await HttpRequestBuilder
-                        .Create("https://login.microsoftonline.com/consumers/oauth2/v2.0/token", HttpMethod.Post)
-                        .WithRequestData(ReqData)
-                        .SetHeader("Content-Type", "application/x-www-form-urlencoded")
-                        .SetHeader("Accept", "application/json")
-                        .SetHeader("User-Agent", HttpRequestBuilder.UserAgent)
-                        .Invoke()).GetResponse(false);
+                LoginResult.State = LoginState.Error;
+                switch (Result.Error)
+                {
+                    case "authorization_declined":
+                        LoginResult.Description = "你拒绝了授权请求";
+                        break;
+                    case "authorization_pending":
+                        LoginResult.State = LoginState.Pending;
+                        break;
+                    case "invalid_grant":
+                        if (Result.Description.ContainsF("AADSTS70000"))
+                        {
+                            LoginResult.Description =
+                                "${support,gid=10}需要使用密码登录\n\n请在登录时选择其他登录方法，然后选择使用我的密码{vbRQ}。\n如果没有该选项，请选择设置密码，设置完毕后再登录。\n如果不知道如何操作，请查阅支持文档。";
+                            return LoginResult;
+                        }
+                }
             }
         }
     }
-}
+}

.idea/inspectionProfiles/profiles_settings.xml

@@ -5,49 +5,38 @@
 
 namespace SuikaiLauncher.Core.Account{
     public class MinecraftYggdrasil{
-        internal async Task<Tuple<bool,string>> YggdrasilAuthorize(string XSTSToken,string UserHash){
-            MinecraftRPLogin AuthData = new() { identityToken = $"XBL3.0 x={XSTSToken};{UserHash}" };
-            string LoginData = Json.Serialize<MinecraftRPLogin>(AuthData);
-            using (MemoryStream ReqData = new(LoginData.GetBytes()))
+        internal static async Task<Tuple<bool, string>> YggdrasilAuthorize(string XSTSToken, string UserHash)
+        {
+            JsonObject ReqData = new()
             {
-                HttpResponseMessage Response = (await HttpRequestBuilder
+                ["JsonProperty"] = $"XBL3.0 x={XSTSToken};{UserHash}"
+            };
+            using (MemoryStream ReqStream = new MemoryStream(ReqData.ToJsonString().GetBytes()))
+            {
+                HttpResponseMessage Response = await HttpRequestBuilder
                     .Create("https://api.minecraftservices.com/authentication/login_with_xbox", HttpMethod.Post)
-                    .WithRequestData(ReqData)
+                    .WithRequestData(ReqStream)
                     .SetHeader("Content-Type", "application/json")
-                    .SetHeader("Accept", "application/json")
-                    .SetHeader("UserAgent", HttpRequestBuilder.UserAgent)
-                    .UseProxy()
-                    .Invoke()).GetResponse();
-
-                
-                    string UserAuthResult = await FileIO.ReadAsString(Response!);
-                    if (!UserAuthResult.IsNullOrWhiteSpaceF())
-                    {
-                        MinecraftOfficialYggdrasil JsonData = Json.Deserialize<MinecraftOfficialYggdrasil>(UserAuthResult);
-                        return Tuple.Create(true, JsonData.accessToken);
-                }
-            }
-                return Tuple.Create(false, string.Empty);
+                    .GetResponse();
+                string accessToken = Json.Deserialize<MinecraftOfficialYggdrasil>(await FileIO.ReadAsString(Response)).accessToken;
+                return Tuple.Create(true, accessToken);
             }
-        internal async static Task<bool> ValidateOwnership(string AccessToken){
-            HttpResponseMessage Response = (await HttpRequestBuilder
-                .Create("https://api.minecraftservices.com/entitlements/mcstore", HttpMethod.Get)
-                .SetHeader("Authorization", AccessToken)
-                .SetHeader("User-Agent", HttpRequestBuilder.UserAgent)
-                .UseProxy()
-                .Invoke()).GetResponse();
+        }
+
+        internal static async Task<bool> ValidateOwnership(string AccessToken){
+            HttpResponseMessage Response = await HttpRequestBuilder
+                .Create("https://api.minecraftservices.com/entitlements/mcstore",HttpMethod.Get)
+                .SetHeader("Authorization", $"Bearer {AccessToken}")
+                .GetResponse();
             Ownership UserAuthResult = Json.Deserialize<Ownership>(await FileIO.ReadAsString(Response));
             return !(UserAuthResult.items.Count <= 0);
         }
         internal async static Task<MinecraftUserProfile?> GetMinecraftProfile(string AccessToken){
             try{
-                HttpResponseMessage Response = (await HttpRequestBuilder
-                .Create("https://api.minecraftservices.com/minecraft/profile", HttpMethod.Get)
-                .SetHeader("Authorization", AccessToken)
-                .SetHeader("User-Agent", HttpRequestBuilder.UserAgent)
-                .UseProxy()
-                .Invoke()).GetResponse();
-                
+                HttpResponseMessage Response = await HttpRequestBuilder
+                    .Create("https://api.minecraftservices.com/minecraft/profile",HttpMethod.Get)
+                    .SetHeader("Authorization", $"Bearer {AccessToken}")
+                    .GetResponse();
                 MinecraftUserProfile PlayerProfile = Json.Deserialize<MinecraftUserProfile>(await FileIO.ReadAsString(Response));
                 return PlayerProfile;
             }catch (Exception ex){