From f42777c62af142c0973d3e5a1232237a58b6f46e Mon Sep 17 00:00:00 2001 From: akastijn Date: Thu, 31 Jul 2025 23:05:06 +0200 Subject: [PATCH] Update Login URL handling and optimize ShadowJar build process - Fix `resolveLogin` method to ensure correct login endpoint formatting. - Update default `LOGIN_CODE_ENDPOINT` in `Config` to reflect new API path. - Adjust ShadowJar build to transform SLF4J service files and exclude SLF4J dependencies during minimization. --- build.gradle.kts | 8 +++++++- src/main/java/com/alttd/webinterface/commands/Login.java | 2 +- src/main/java/com/alttd/webinterface/config/Config.java | 6 +++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 3caa3cf..f441209 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -45,7 +45,13 @@ tasks.withType { relocate("kotlin", "com.alttd.webinterface.shaded.kotlin") relocate("org.eclipse.jetty", "com.alttd.webinterface.shaded.org.eclipse.jetty") - minimize() + // Transform service files for SLF4J to use the relocated packages + transform(com.github.jengelman.gradle.plugins.shadow.transformers.ServiceFileTransformer::class.java) + + minimize { + // Exclude SLF4J to prevent minimization from removing required classes + exclude(dependency("org.slf4j:.*:.*")) + } } tasks.build { diff --git a/src/main/java/com/alttd/webinterface/commands/Login.java b/src/main/java/com/alttd/webinterface/commands/Login.java index a379660..dc91272 100644 --- a/src/main/java/com/alttd/webinterface/commands/Login.java +++ b/src/main/java/com/alttd/webinterface/commands/Login.java @@ -70,7 +70,7 @@ public class Login { private @NotNull String resolveLogin(String message, String loginCode) { return message - .replace("", Config.LOGIN_ENDPOINT) + .replace("", Config.LOGIN_ENDPOINT + "/") .replace("", loginCode); } } diff --git a/src/main/java/com/alttd/webinterface/config/Config.java b/src/main/java/com/alttd/webinterface/config/Config.java index 7f6e6ed..e8698a1 100644 --- a/src/main/java/com/alttd/webinterface/config/Config.java +++ b/src/main/java/com/alttd/webinterface/config/Config.java @@ -192,14 +192,14 @@ public final class Config { APPEAL_MESSAGE = getString("messages.appeal-message", APPEAL_MESSAGE); } - public static String YOUR_LOGIN_CODE = "Log in on /'>alttd.com" + - " with code: "; + public static String YOUR_LOGIN_CODE = "Log in on '>" + + "alttd.com with code: "; private static void login_messages() { YOUR_LOGIN_CODE = getString("messages.your-login-code", YOUR_LOGIN_CODE); } - public static String LOGIN_CODE_ENDPOINT = "https://alttd.com/login/requestNewUserLogin/"; + public static String LOGIN_CODE_ENDPOINT = "https://alttd.com/api/login/requestNewUserLogin/"; public static String LOGIN_ENDPOINT = "https://alttd.com/login"; public static String DOWNLOAD_ENDPOINT = "https://alttd.com/particles/download"; public static String SECRET = "";