Merge pull request #8 from Goose-Bomb/dev

Ready for 2nd release version
Nullkooland · Aug 27, 2019 · e677352 · e677352
2 parents 5785da5 + 906a27c
commit e677352
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 55 deletions.
diff --git a/GBCLV3.Tests/AuthTest.cs b/GBCLV3.Tests/AuthTest.cs
diff --git a/GBCLV3/Models/Config.cs b/GBCLV3/Models/Config.cs
@@ -26,7 +26,9 @@ class Config
         [JsonIgnore]
         public string Password { get; set; }
 
-        public bool RefreshAuth { get; set; }
+        public bool UseToken { get; set; }
+
+        public string ClientToken { get; set; }
 
         public string AccessToken { get; set; }
 

diff --git a/GBCLV3/Models/Launcher/Authentication.cs b/GBCLV3/Models/Launcher/Authentication.cs
@@ -37,6 +37,8 @@ class AuthResult
 
         public List<AuthUserProfile> AvailableProfiles { get; set; }
 
+        public string ClientToken { get; set; }
+
         public string AccessToken { get; set; }
 
         public string UserType { get; set; }
@@ -56,7 +58,6 @@ class AuthRequest
 
         public string Username { get; set; }
 
-
         public string Password { get; set; }
 
         public string ClientToken { get; set; }

diff --git a/GBCLV3/Properties/AssemblyInfo.cs b/GBCLV3/Properties/AssemblyInfo.cs
@@ -11,8 +11,8 @@
 [assembly: AssemblyCopyright("Copyright © Goose Bomb 2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("3.0.1.33")]
-[assembly: AssemblyFileVersion("3.0.1.33")]
+[assembly: AssemblyVersion("3.0.2.36")]
+[assembly: AssemblyFileVersion("3.0.2.36")]
 
 [assembly: ComVisible(false)]
 

diff --git a/GBCLV3/Services/Launcher/AuthService.cs b/GBCLV3/Services/Launcher/AuthService.cs
@@ -50,16 +50,12 @@ public static async Task<AuthResult> LoginAsync(string email, string password)
             return await OnlineAuthenticateAsync(JsonSerializer.Serialize(request, _jsonOptions), false);
         }
 
-        public static async Task<AuthResult> RefreshAsync(string accessToken, string uuid)
+        public static async Task<AuthResult> RefreshAsync(string clientToken, string accessToken)
         {
             var request = new RefreshRequest
             {
+                ClientToken = clientToken,
                 AccessToken = accessToken,
-                ClientToken = _guid,
-                SelectedProfile = new AuthUserProfile
-                {
-                    Id = uuid,
-                }
             };
 
             return await OnlineAuthenticateAsync(JsonSerializer.Serialize(request, _jsonOptions), true);
@@ -81,6 +77,7 @@ public static AuthResult GetOfflineProfile(string username)
             {
                 Username = username,
                 UUID = CryptUtil.GetStringMD5(username),
+                ClientToken = _guid,
                 AccessToken = _guid,
                 UserType = "mojang",
                 IsSuccessful = true,
@@ -113,6 +110,7 @@ private static async Task<AuthResult> OnlineAuthenticateAsync(string requestJson
                     result.Username = response.SelectedProfile.Name;
                     result.UUID = response.SelectedProfile.Id;
                     result.AvailableProfiles = response.AvailableProfiles;
+                    result.ClientToken = response.ClientToken;
                     result.AccessToken = response.AccessToken;
                     result.UserType = response.SelectedProfile.Legacy ? "legacy" : "mojang";
                 }

diff --git a/GBCLV3/ViewModels/GameSettingsViewModel.cs b/GBCLV3/ViewModels/GameSettingsViewModel.cs
@@ -130,10 +130,10 @@ public bool IsOfflineMode
 
         public bool IsRefreshAuth
         {
-            get => _config.RefreshAuth;
+            get => _config.UseToken;
             set
             {
-                _config.RefreshAuth = value;
+                _config.UseToken = value;
             }
         }
 

diff --git a/GBCLV3/ViewModels/Pages/LaunchViewModel.cs b/GBCLV3/ViewModels/Pages/LaunchViewModel.cs
@@ -152,18 +152,28 @@ public async void Launch()
 
             var authResult =
                 _config.OfflineMode ? AuthService.GetOfflineProfile(_config.Username) :
-                _config.RefreshAuth ? await AuthService.RefreshAsync(_config.AccessToken, _config.UUID) :
-                                      await AuthService.LoginAsync(_config.Email, _config.Password);
+                _config.UseToken ? await AuthService.RefreshAsync(_config.ClientToken, _config.AccessToken) :
+                                   await AuthService.LoginAsync(_config.Email, _config.Password);
 
-            if (!authResult.IsSuccessful)
+            if (authResult.IsSuccessful)
+            {
+                _config.UseToken = true;
+                _config.ClientToken = authResult.ClientToken;
+                _config.AccessToken = authResult.AccessToken;
+
+                _config.Username = authResult.Username;
+                _config.UUID = authResult.UUID;
+                _eventAggregator.Publish(new UsernameChangedEvent());
+            }
+            else
             {
                 _statusVM.Status = LaunchStatus.Failed;
 
                 if (authResult.ErrorType == AuthErrorType.InvalidToken)
                 {
                     // Clear the invalid token, using email and password for authentication next time
                     _config.AccessToken = null;
-                    _config.RefreshAuth = false;
+                    _config.UseToken = false;
                 }
 
                 _windowManager.ShowMessageBox(authResult.ErrorMessage, "${AuthFailed}",
@@ -172,11 +182,6 @@ public async void Launch()
                 return;
             }
 
-            _config.Username = authResult.Username;
-            _config.AccessToken = authResult.AccessToken;
-            _config.UUID = authResult.UUID;
-            _eventAggregator.Publish(new UsernameChangedEvent());
-
             _statusVM.Status = LaunchStatus.ProcessingDependencies;
             var launchVersion = _versionService.GetByID(SelectedVersionID);
 

diff --git a/README-CN.md b/README-CN.md
@@ -39,7 +39,10 @@
   - [x] 版本分离
   - [x] 1.13+ 支持
   - [x] Forge版本
-  - [x] 验证登录
+
+- [x] 验证登录
+  - [x] 邮箱密码登录
+  - [x] 令牌刷新
 
 - [x] 下载
   - [x] 并发下载

diff --git a/README.md b/README.md
@@ -41,7 +41,10 @@
   - [x] Version segregation
   - [x] 1.13+ Support
   - [x] Forge version
-  - [x] Authentication
+
+- [x] Authentication
+  - [x] Email and Password Login
+  - [x] Token Refresh
 
 - [x] Download
   - [x] Parallel download