MicrosoftAuth: 修复 authorizationRefreshToken

purofle · Dec 31, 2023 · cbfec06 · cbfec06
1 parent e9e05ca
commit cbfec06
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/NMSLCore/src/main/kotlin/com/github/purofle/nmsl/auth/microsoft/MicrosoftAuth.kt b/NMSLCore/src/main/kotlin/com/github/purofle/nmsl/auth/microsoft/MicrosoftAuth.kt
@@ -45,7 +45,7 @@ object MicrosoftAuth {
                         append("grant_type", "refresh_token")
                         append("client_id", CLIENT_ID)
                         append("refresh_token", refreshToken)
-                        append("scope", scope ?: SCOPE.joinToString("%20"))
+                        append("scope", scope ?: SCOPE.joinToString(" "))
                     })
             )
         }.body()

diff --git a/src/main/kotlin/com/github/purofle/nmsl/utils/GameDownloadUtils.kt b/src/main/kotlin/com/github/purofle/nmsl/utils/GameDownloadUtils.kt
@@ -1,5 +1,6 @@
 package com.github.purofle.nmsl.utils
 
+import com.github.purofle.nmsl.auth.microsoft.MicrosoftAuth
 import com.github.purofle.nmsl.config.Config
 import com.github.purofle.nmsl.download.DownloadProvider
 import com.github.purofle.nmsl.download.GameDownloader
@@ -28,6 +29,17 @@ suspend fun startGame(version: String, launcherArgument: List<String>) {
         downloadClientJar()
     }
 
+    val auth = MicrosoftAuth.authorizationRefreshToken(Config.config.msa.refreshToken)
+    Config.createConfig(
+        Config.config.copy(
+            msa = Config.config.msa.copy(
+                accessToken = auth.accessToken,
+                refreshToken = auth.refreshToken,
+                expiresIn = auth.expiresIn
+            )
+        )
+    )
+
     if (OS.CURRENT_OS != OS.WINDOWS) {
         startGameUnix(launcherArgument)
     } else {