Merge branch 'release/2.0.10'

GravitLauncher · Mar 20, 2022 · 62184d6 · 62184d6
2 parents e05a412 + 2cc1ec1
commit 62184d6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -13,7 +13,7 @@ javafx {
 sourceCompatibility = '1.8'
 targetCompatibility = '1.8'
 group 'pro.gravit.launcher'
-version '2.0.9'
+version '2.0.10'
 def mainClassName = "pro.gravit.launcher.client.JavaRuntimeModule"
 
 task sourcesJar(type: Jar) {

diff --git a/src/main/java/pro/gravit/launcher/client/JavaRuntimeModule.java b/src/main/java/pro/gravit/launcher/client/JavaRuntimeModule.java
@@ -25,7 +25,7 @@ public class JavaRuntimeModule extends LauncherModule {
     private RuntimeProvider provider;
 
     public JavaRuntimeModule() {
-        super(new LauncherModuleInfo("StdJavaRuntime", new Version(2, 0, 9, 1, Version.Type.STABLE),
+        super(new LauncherModuleInfo("StdJavaRuntime", new Version(2, 0, 10, 1, Version.Type.STABLE),
                 0, new String[]{}, new String[]{"runtime"}));
     }
 

diff --git a/src/main/java/pro/gravit/launcher/client/gui/service/AuthService.java b/src/main/java/pro/gravit/launcher/client/gui/service/AuthService.java
@@ -68,7 +68,7 @@ public AuthRequest.AuthPasswordInterface getPasswordFromList(List<AuthRequest.Au
     }
 
     public AuthRequest makeAuthRequest(String login, AuthRequest.AuthPasswordInterface password, String authId) {
-        return new AuthRequest(login, password, authId, true, application.isDebugMode() ? AuthRequest.ConnectTypes.API : AuthRequest.ConnectTypes.CLIENT);
+        return new AuthRequest(login, password, authId, false, application.isDebugMode() ? AuthRequest.ConnectTypes.API : AuthRequest.ConnectTypes.CLIENT);
     }
 
     private byte[] encryptAESPassword(String password) throws Exception {

diff --git a/src/main/java/pro/gravit/launcher/client/gui/service/StateService.java b/src/main/java/pro/gravit/launcher/client/gui/service/StateService.java
@@ -27,7 +27,9 @@ public interface OnServerPingReportCallback {
 
     public void setAuthResult(String authId, AuthRequestEvent rawAuthResult) {
         this.rawAuthResult = rawAuthResult;
-        Request.setOAuth(authId, rawAuthResult.oauth);
+        if(rawAuthResult.oauth != null) {
+            Request.setOAuth(authId, rawAuthResult.oauth);
+        }
     }
 
     public Map<ClientProfile, OptionalView> getOptionalViewMap() {