diff --git a/MojangSupport_module/src/main/java/pro/gravit/launchermodules/mojangsupport/MicrosoftAuthCoreProvider.java b/MojangSupport_module/src/main/java/pro/gravit/launchermodules/mojangsupport/MicrosoftAuthCoreProvider.java index 0527aa4a..b81a9b39 100644 --- a/MojangSupport_module/src/main/java/pro/gravit/launchermodules/mojangsupport/MicrosoftAuthCoreProvider.java +++ b/MojangSupport_module/src/main/java/pro/gravit/launchermodules/mojangsupport/MicrosoftAuthCoreProvider.java @@ -11,6 +11,8 @@ import pro.gravit.launcher.request.auth.password.AuthCodePassword; import pro.gravit.launchserver.LaunchServer; import pro.gravit.launchserver.auth.AuthException; +import pro.gravit.utils.helper.CommonHelper; +import pro.gravit.utils.helper.QueryHelper; import pro.gravit.launchserver.auth.core.UserSession; import pro.gravit.launchserver.helper.HttpHelper; import pro.gravit.launchserver.manangers.AuthManager; @@ -76,7 +78,9 @@ public AuthManager.AuthReport authorize(String login, AuthResponse.AuthContext c throw AuthException.wrongPassword(); } AuthCodePassword codePassword = (AuthCodePassword) password; - var code = codePassword.code; + var uri = URI.create(codePassword.uri); + var queries = QueryHelper.splitUriQuery(uri); + var code = CommonHelper.multimapFirstOrNullValue("code", queries); try { var token = sendMicrosoftOAuthTokenRequest(code); if (token == null) {