Merge pull request #173 from Lyzev/172-bug-microsoft-account-web-login

fixed msa web login bug
Lyzev · Jul 7, 2024 · 7d0b32c · 7d0b32c
2 parents 143ffba + e2ac67c
commit 7d0b32c
Showing 1 changed file with 10 additions and 15 deletions.
diff --git a/src/main/kotlin/dev/lyzev/api/account/accounts/AccountMicrosoft.kt b/src/main/kotlin/dev/lyzev/api/account/accounts/AccountMicrosoft.kt
@@ -75,7 +75,6 @@ class AccountMicrosoft(var session: StepFullJavaSession.FullJavaSession) : Accou
         private val emailRegex = Regex("^[\\w-.]+@([\\w-]+\\.)+[\\w-]{2,4}$")
         private val password = ImString("", 64)
         private var isHidden = true
-        private var canUseDeviceCode = true
         private var msg: String? = null
         private val timeAnimator = TimeAnimator(4000)
 
@@ -147,20 +146,16 @@ class AccountMicrosoft(var session: StepFullJavaSession.FullJavaSession) : Accou
                 }
                 sameLine()
                 if (ImGuiScreenAccountManager.button(FontAwesomeIcons.Globe, "Add the account using a device code.")) {
-                    if (canUseDeviceCode) {
-                        thread {
-                            canUseDeviceCode = false
-                            val httpClient = MinecraftAuth.createHttpClient()
-                            val javaSession = MinecraftAuth.JAVA_DEVICE_CODE_LOGIN.getFromInput(
-                                httpClient,
-                                MsaDeviceCodeCallback { msaDeviceCode: MsaDeviceCode ->
-                                    Schizoid.logger.info("Go to " + msaDeviceCode.verificationUri)
-                                    Schizoid.logger.info("Enter code " + msaDeviceCode.userCode)
-                                    Desktop.getDesktop().browse(URI(msaDeviceCode.directVerificationUri))
-                                })
-                            ImGuiScreenAccountManager.accounts += AccountMicrosoft(session = javaSession)
-                            canUseDeviceCode = true
-                        }
+                    thread {
+                        val httpClient = MinecraftAuth.createHttpClient()
+                        val javaSession = MinecraftAuth.JAVA_DEVICE_CODE_LOGIN.getFromInput(
+                            httpClient,
+                            MsaDeviceCodeCallback { msaDeviceCode: MsaDeviceCode ->
+                                Schizoid.logger.info("Go to " + msaDeviceCode.verificationUri)
+                                Schizoid.logger.info("Enter code " + msaDeviceCode.userCode)
+                                Desktop.getDesktop().browse(URI(msaDeviceCode.directVerificationUri))
+                            })
+                        ImGuiScreenAccountManager.accounts += AccountMicrosoft(session = javaSession)
                     }
                 }
                 sameLine()