From 3e973c5de3a67206329e7f6d053b95f08005851a Mon Sep 17 00:00:00 2001 From: Gravita Date: Sat, 14 Aug 2021 03:25:31 +0700 Subject: [PATCH 1/6] [FIX] NPE Issue #506 --- .../src/main/java/pro/gravit/launchserver/socket/Client.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/Client.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/Client.java index 87b51c43..36c3d8eb 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/Client.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/Client.java @@ -81,7 +81,7 @@ public String getSerializableProperty(String name) { public void setSerializableProperty(String name, String value) { if (serializableProperties == null) serializableProperties = new HashMap<>(); - properties.put(name, value); + serializableProperties.put(name, value); } public pro.gravit.launchserver.auth.core.User getUser() { From dc3d75c6507e245c0a1840116109b46ae5fd4641 Mon Sep 17 00:00:00 2001 From: Gravita Date: Tue, 17 Aug 2021 15:05:27 +0700 Subject: [PATCH 2/6] [FIX] getParamsFromUri UTF-8 --- .../launchserver/socket/handlers/NettyWebAPIHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/handlers/NettyWebAPIHandler.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/handlers/NettyWebAPIHandler.java index 33f49a64..b9603131 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/handlers/NettyWebAPIHandler.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/handlers/NettyWebAPIHandler.java @@ -12,7 +12,7 @@ import pro.gravit.utils.helper.IOHelper; import java.net.URLDecoder; -import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.util.Comparator; import java.util.HashMap; import java.util.Map; @@ -86,7 +86,7 @@ default Map getParamsFromUri(String uri) { String[] result = sub.split("&"); Map map = new HashMap<>(); for (String s : result) { - String c = URLDecoder.decode(s, Charset.defaultCharset()); + String c = URLDecoder.decode(s, StandardCharsets.UTF_8); int index = c.indexOf("="); if (index <= 0) { continue; From 93fdd7f8992803ecb84e95fcc528b1233f8b422d Mon Sep 17 00:00:00 2001 From: Gravita Date: Wed, 18 Aug 2021 17:27:18 +0700 Subject: [PATCH 3/6] =?UTF-8?q?[ANY]=20=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index 9407d4bc..929428a7 160000 --- a/modules +++ b/modules @@ -1 +1 @@ -Subproject commit 9407d4bcd90f282969433d29b7598372f56917b9 +Subproject commit 929428a7438aeb9a3f90c69a881da43030113e1a From fb7a55284358ee8a2be74efec52a18d62711d453 Mon Sep 17 00:00:00 2001 From: Gravita Date: Mon, 23 Aug 2021 15:56:08 +0700 Subject: [PATCH 4/6] [FIX] JsonAuthCoreProvider Bearer header --- .../pro/gravit/launchserver/auth/core/JsonCoreProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/JsonCoreProvider.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/JsonCoreProvider.java index 74b8ffc3..5cb8e255 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/JsonCoreProvider.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/JsonCoreProvider.java @@ -58,7 +58,7 @@ public static R jsonRequest(T request, String url, String bearerToken, Cl .header("Accept", "application/json") .timeout(Duration.ofMillis(10000)); if (bearerToken != null) { - request1.header("Authentication", "Bearer ".concat(bearerToken)); + request1.header("Authorization", "Bearer ".concat(bearerToken)); } HttpResponse response = client.send(request1.build(), HttpResponse.BodyHandlers.ofInputStream()); int statusCode = response.statusCode(); From effbb18bbc375f78f3485a68719c27e8b99500ff Mon Sep 17 00:00:00 2001 From: Gravita Date: Mon, 23 Aug 2021 15:58:22 +0700 Subject: [PATCH 5/6] =?UTF-8?q?[ANY]=20=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index 929428a7..84a55992 160000 --- a/modules +++ b/modules @@ -1 +1 @@ -Subproject commit 929428a7438aeb9a3f90c69a881da43030113e1a +Subproject commit 84a5599243bddf0f7a8081cc7f5672e9140893bd From 27f7082568c0bf0eaabbd0a5536a589cac0d8bd0 Mon Sep 17 00:00:00 2001 From: Gravita Date: Tue, 31 Aug 2021 18:23:40 +0700 Subject: [PATCH 6/6] [ANY] 5.2.1 --- LauncherCore/src/main/java/pro/gravit/utils/Version.java | 2 +- build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LauncherCore/src/main/java/pro/gravit/utils/Version.java b/LauncherCore/src/main/java/pro/gravit/utils/Version.java index 72cdaab5..42a215f8 100644 --- a/LauncherCore/src/main/java/pro/gravit/utils/Version.java +++ b/LauncherCore/src/main/java/pro/gravit/utils/Version.java @@ -6,7 +6,7 @@ public final class Version implements Comparable { public static final int MAJOR = 5; public static final int MINOR = 2; - public static final int PATCH = 0; + public static final int PATCH = 1; public static final int BUILD = 1; public static final Version.Type RELEASE = Type.STABLE; public final int major; diff --git a/build.gradle b/build.gradle index 13f094e7..ac0b4769 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ id 'org.openjfx.javafxplugin' version '0.0.8' apply false } group = 'pro.gravit.launcher' -version = '5.2.0' +version = '5.2.1' apply from: 'props.gradle'