idea cleanup launchserver

LaunchServer/src/main/java/pro/gravit/launchserver/HttpRequester.java

@@ -17,25 +17,6 @@ public class HttpRequester {
     public HttpRequester() {
     }
 
-    public static class SimpleErrorHandler<T> implements HttpHelper.HttpJsonErrorHandler<T, SimpleError> {
-        private final Type type;
-
-        private SimpleErrorHandler(Type type) {
-            this.type = type;
-        }
-
-        @Override
-        public HttpHelper.HttpOptional<T, SimpleError> applyJson(JsonElement response, int statusCode) {
-            if(statusCode < 200 || statusCode >= 300) {
-                return new HttpHelper.HttpOptional<>(null, Launcher.gsonManager.gson.fromJson(response, SimpleError.class), statusCode);
-            }
-            if(type == Void.class) {
-                return  new HttpHelper.HttpOptional<>(null, null, statusCode);
-            }
-            return new HttpHelper.HttpOptional<>(Launcher.gsonManager.gson.fromJson(response, type), null, statusCode);
-        }
-    }
-
     public <T> SimpleErrorHandler<T> makeEH(Class<T> clazz) {
         return new SimpleErrorHandler<>(clazz);
     }
@@ -78,6 +59,25 @@ public <T> HttpHelper.HttpOptional<T, SimpleError> send(HttpRequest request, Cla
         return HttpHelper.send(httpClient, request, makeEH(clazz));
     }
 
+    public static class SimpleErrorHandler<T> implements HttpHelper.HttpJsonErrorHandler<T, SimpleError> {
+        private final Type type;
+
+        private SimpleErrorHandler(Type type) {
+            this.type = type;
+        }
+
+        @Override
+        public HttpHelper.HttpOptional<T, SimpleError> applyJson(JsonElement response, int statusCode) {
+            if (statusCode < 200 || statusCode >= 300) {
+                return new HttpHelper.HttpOptional<>(null, Launcher.gsonManager.gson.fromJson(response, SimpleError.class), statusCode);
+            }
+            if (type == Void.class) {
+                return new HttpHelper.HttpOptional<>(null, null, statusCode);
+            }
+            return new HttpHelper.HttpOptional<>(Launcher.gsonManager.gson.fromJson(response, type), null, statusCode);
+        }
+    }
+
     public static class SimpleError {
         public String error;
         public int code;

LaunchServer/src/main/java/pro/gravit/launchserver/auth/AuthProviderPair.java

@@ -38,15 +38,6 @@ public static Set<String> getFeatures(Class<?> clazz) {
         return list;
     }
 
-    public void internalShowOAuthWarnMessage() {
-        if(!warnOAuthShow) {
-            if(!(core instanceof MySQLCoreProvider) && !(core instanceof PostgresSQLCoreProvider)) { // MySQL and PostgreSQL upgraded later
-                logger.warn("AuthCoreProvider {} ({}) not supported OAuth. Legacy session system may be removed in next release", name, core.getClass().getName());
-            }
-            warnOAuthShow = true;
-        }
-    }
-
     public static void getFeatures(Class<?> clazz, Set<String> list) {
         Features features = clazz.getAnnotation(Features.class);
         if (features != null) {
@@ -64,6 +55,15 @@ public static void getFeatures(Class<?> clazz, Set<String> list) {
         }
     }
 
+    public void internalShowOAuthWarnMessage() {
+        if (!warnOAuthShow) {
+            if (!(core instanceof MySQLCoreProvider) && !(core instanceof PostgresSQLCoreProvider)) { // MySQL and PostgreSQL upgraded later
+                logger.warn("AuthCoreProvider {} ({}) not supported OAuth. Legacy session system may be removed in next release", name, core.getClass().getName());
+            }
+            warnOAuthShow = true;
+        }
+    }
+
     public final <T> T isSupport(Class<T> clazz) {
         if (core == null) return null;
         T result = null;

LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/HttpAuthCoreProvider.java

@@ -27,7 +27,6 @@
 
 public class HttpAuthCoreProvider extends AuthCoreProvider implements AuthSupportHardware {
     private transient final Logger logger = LogManager.getLogger();
-    private transient HttpRequester requester;
     public String bearerToken;
     public String getUserByUsernameUrl;
     public String getUserByLoginUrl;
@@ -49,6 +48,7 @@ public class HttpAuthCoreProvider extends AuthCoreProvider implements AuthSuppor
     public String getUsersByHardwareInfoUrl;
     public String banHardwareUrl;
     public String unbanHardwareUrl;
+    private transient HttpRequester requester;
 
     @Override
     public User getUserByUsername(String username) {
@@ -267,14 +267,6 @@ public void unbanHardware(UserHardware hardware) {
         }
     }
 
-    public record HttpAuthReport(String minecraftAccessToken, String oauthAccessToken,
-                                 String oauthRefreshToken, long oauthExpire,
-                                 HttpUserSession session) {
-        public AuthManager.AuthReport toAuthReport() {
-            return new AuthManager.AuthReport(minecraftAccessToken, oauthAccessToken, oauthRefreshToken, oauthExpire, session);
-        }
-    }
-
     @Override
     protected boolean updateServerID(User user, String serverID) throws IOException {
         var result = requester.send(requester.post(updateServerIdUrl, new UpdateServerIdRequest(user.getUsername(), user.getUUID(), serverID),
@@ -293,6 +285,36 @@ public boolean joinServer(Client client, String username, String accessToken, St
         return result.isSuccessful();
     }
 
+    @Override
+    public void init(LaunchServer server) {
+        requester = new HttpRequester();
+        if (getUserByUsernameUrl == null) {
+            throw new IllegalArgumentException("'getUserByUsernameUrl' can't be null");
+        }
+        if (getUserByUUIDUrl == null) {
+            throw new IllegalArgumentException("'getUserByUUIDUrl' can't be null");
+        }
+        if (authorizeUrl == null) {
+            throw new IllegalArgumentException("'authorizeUrl' can't be null");
+        }
+        if (checkServerUrl == null && joinServerUrl == null && updateServerIdUrl == null) {
+            throw new IllegalArgumentException("Please set 'checkServerUrl' and 'joinServerUrl' or 'updateServerIdUrl'");
+        }
+    }
+
+    @Override
+    public void close() throws IOException {
+
+    }
+
+    public record HttpAuthReport(String minecraftAccessToken, String oauthAccessToken,
+                                 String oauthRefreshToken, long oauthExpire,
+                                 HttpUserSession session) {
+        public AuthManager.AuthReport toAuthReport() {
+            return new AuthManager.AuthReport(minecraftAccessToken, oauthAccessToken, oauthRefreshToken, oauthExpire, session);
+        }
+    }
+
     public static class UpdateServerIdRequest {
         public String username;
         public UUID uuid;
@@ -331,28 +353,6 @@ public JoinServerRequest(String username, String accessToken, String serverId) {
         }
     }
 
-    @Override
-    public void init(LaunchServer server) {
-        requester = new HttpRequester();
-        if(getUserByUsernameUrl == null) {
-            throw new IllegalArgumentException("'getUserByUsernameUrl' can't be null");
-        }
-        if(getUserByUUIDUrl == null) {
-            throw new IllegalArgumentException("'getUserByUUIDUrl' can't be null");
-        }
-        if(authorizeUrl == null) {
-            throw new IllegalArgumentException("'authorizeUrl' can't be null");
-        }
-        if(checkServerUrl == null && joinServerUrl == null && updateServerIdUrl == null) {
-            throw new IllegalArgumentException("Please set 'checkServerUrl' and 'joinServerUrl' or 'updateServerIdUrl'");
-        }
-    }
-
-    @Override
-    public void close() throws IOException {
-
-    }
-
     public static class AuthorizeRequest {
         public String login;
         public AuthResponse.AuthContext context;
@@ -400,6 +400,106 @@ public HardwareRequest(byte[] key) {
 
     }
 
+    public static class HttpUserSession implements UserSession {
+        private String id;
+        private HttpUser user;
+        private long expireIn;
+
+        public HttpUserSession() {
+        }
+
+        public HttpUserSession(String id, HttpUser user, long expireIn) {
+            this.id = id;
+            this.user = user;
+            this.expireIn = expireIn;
+        }
+
+        @Override
+        public String getID() {
+            return id;
+        }
+
+        @Override
+        public User getUser() {
+            return user;
+        }
+
+        @Override
+        public long getExpireIn() {
+            return expireIn;
+        }
+
+        @Override
+        public String toString() {
+            return "HttpUserSession{" +
+                    "id='" + id + '\'' +
+                    ", user=" + user +
+                    ", expireIn=" + expireIn +
+                    '}';
+        }
+    }
+
+    public static class HttpUserHardware implements UserHardware {
+        private final HardwareReportRequest.HardwareInfo hardwareInfo;
+        private final long id;
+        private byte[] publicKey;
+        private boolean banned;
+
+        public HttpUserHardware(HardwareReportRequest.HardwareInfo hardwareInfo, byte[] publicKey, long id, boolean banned) {
+            this.hardwareInfo = hardwareInfo;
+            this.publicKey = publicKey;
+            this.id = id;
+            this.banned = banned;
+        }
+
+        public HttpUserHardware(HardwareReportRequest.HardwareInfo hardwareInfo) {
+            this.hardwareInfo = hardwareInfo;
+            this.id = Long.MIN_VALUE;
+        }
+
+        public HttpUserHardware(HardwareReportRequest.HardwareInfo hardwareInfo, byte[] publicKey, boolean banned) {
+            this.hardwareInfo = hardwareInfo;
+            this.publicKey = publicKey;
+            this.banned = banned;
+            this.id = Long.MIN_VALUE;
+        }
+
+        public HttpUserHardware(long id) {
+            this.id = id;
+            this.hardwareInfo = null;
+        }
+
+        @Override
+        public HardwareReportRequest.HardwareInfo getHardwareInfo() {
+            return hardwareInfo;
+        }
+
+        @Override
+        public byte[] getPublicKey() {
+            return publicKey;
+        }
+
+        @Override
+        public String getId() {
+            return String.valueOf(id);
+        }
+
+        @Override
+        public boolean isBanned() {
+            return banned;
+        }
+
+        @Override
+        public String toString() {
+            return "HttpUserHardware{" +
+                    "hardwareInfo=" + hardwareInfo +
+                    ", publicKey=" + (publicKey == null ? null : new String(Base64.getEncoder().encode(publicKey))) +
+                    ", id=" + id +
+                    ", banned=" + banned +
+                    '}';
+        }
+    }
+
     public class HttpUser implements User, UserSupportTextures, UserSupportProperties, UserSupportHardware {
         private String username;
         private UUID uuid;
@@ -546,104 +646,4 @@ public UserHardware getHardware() {
             return result;
         }
     }
-
-    public static class HttpUserSession implements UserSession {
-        private String id;
-        private HttpUser user;
-        private long expireIn;
-
-        public HttpUserSession() {
-        }
-
-        public HttpUserSession(String id, HttpUser user, long expireIn) {
-            this.id = id;
-            this.user = user;
-            this.expireIn = expireIn;
-        }
-
-        @Override
-        public String getID() {
-            return id;
-        }
-
-        @Override
-        public User getUser() {
-            return user;
-        }
-
-        @Override
-        public long getExpireIn() {
-            return expireIn;
-        }
-
-        @Override
-        public String toString() {
-            return "HttpUserSession{" +
-                    "id='" + id + '\'' +
-                    ", user=" + user +
-                    ", expireIn=" + expireIn +
-                    '}';
-        }
-    }
-
-    public static class HttpUserHardware implements UserHardware {
-        private final HardwareReportRequest.HardwareInfo hardwareInfo;
-        private final long id;
-        private byte[] publicKey;
-        private boolean banned;
-
-        public HttpUserHardware(HardwareReportRequest.HardwareInfo hardwareInfo, byte[] publicKey, long id, boolean banned) {
-            this.hardwareInfo = hardwareInfo;
-            this.publicKey = publicKey;
-            this.id = id;
-            this.banned = banned;
-        }
-
-        public HttpUserHardware(HardwareReportRequest.HardwareInfo hardwareInfo) {
-            this.hardwareInfo = hardwareInfo;
-            this.id = Long.MIN_VALUE;
-        }
-
-        public HttpUserHardware(HardwareReportRequest.HardwareInfo hardwareInfo, byte[] publicKey, boolean banned) {
-            this.hardwareInfo = hardwareInfo;
-            this.publicKey = publicKey;
-            this.banned = banned;
-            this.id = Long.MIN_VALUE;
-        }
-
-        public HttpUserHardware(long id) {
-            this.id = id;
-            this.hardwareInfo = null;
-        }
-
-        @Override
-        public HardwareReportRequest.HardwareInfo getHardwareInfo() {
-            return hardwareInfo;
-        }
-
-        @Override
-        public byte[] getPublicKey() {
-            return publicKey;
-        }
-
-        @Override
-        public String getId() {
-            return String.valueOf(id);
-        }
-
-        @Override
-        public boolean isBanned() {
-            return banned;
-        }
-
-        @Override
-        public String toString() {
-            return "HttpUserHardware{" +
-                    "hardwareInfo=" + hardwareInfo +
-                    ", publicKey=" + (publicKey == null ? null : new String(Base64.getEncoder().encode(publicKey))) +
-                    ", id=" + id +
-                    ", banned=" + banned +
-                    '}';
-        }
-    }
 }

LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/MemoryAuthCoreProvider.java

@@ -13,10 +13,14 @@
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.UUID;
 
 public class MemoryAuthCoreProvider extends AuthCoreProvider {
     private transient final List<MemoryUser> memory = new ArrayList<>(16);
+
     @Override
     public User getUserByUsername(String username) {
         synchronized (memory) {

LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/MySQLCoreProvider.java

@@ -25,7 +25,6 @@
 import java.io.IOException;
 import java.sql.*;
 import java.time.Clock;
-import java.time.Duration;
 import java.time.LocalDateTime;
 import java.util.Base64;
 import java.util.LinkedList;
@@ -488,6 +487,31 @@ public String toString() {
         }
     }
 
+    public static class MySQLUserSession implements UserSession {
+        private final MySQLUser user;
+        private final String id;
+
+        public MySQLUserSession(MySQLUser user) {
+            this.user = user;
+            this.id = user.username;
+        }
+
+        @Override
+        public String getID() {
+            return id;
+        }
+
+        @Override
+        public User getUser() {
+            return user;
+        }
+
+        @Override
+        public long getExpireIn() {
+            return 0;
+        }
+    }
+
     public class MySQLUser implements User, UserSupportHardware {
         protected UUID uuid;
         protected String username;
@@ -551,29 +575,4 @@ public String toString() {
                     '}';
         }
     }
-
-    public static class MySQLUserSession implements UserSession {
-        private final MySQLUser user;
-        private final String id;
-
-        public MySQLUserSession(MySQLUser user) {
-            this.user = user;
-            this.id = user.username;
-        }
-
-        @Override
-        public String getID() {
-            return id;
-        }
-
-        @Override
-        public User getUser() {
-            return user;
-        }
-
-        @Override
-        public long getExpireIn() {
-            return 0;
-        }
-    }
 }

LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/PostgresSQLCoreProvider.java

@@ -18,7 +18,10 @@
 import pro.gravit.utils.helper.SecurityHelper;
 
 import java.io.IOException;
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.time.Clock;
 import java.time.LocalDateTime;
 import java.util.UUID;

LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/interfaces/session/UserSessionSupportKeys.java

@@ -5,7 +5,9 @@
 
 public interface UserSessionSupportKeys {
     ClientProfileKeys getClientProfileKeys();
-    record ClientProfileKeys(PublicKey publicKey, PrivateKey privateKey, byte[] signature /* V2 */, long expiresAt, long refreshedAfter) {
+
+    record ClientProfileKeys(PublicKey publicKey, PrivateKey privateKey, byte[] signature /* V2 */, long expiresAt,
+                             long refreshedAfter) {
 
     }
 }

LaunchServer/src/main/java/pro/gravit/launchserver/auth/password/JsonPasswordVerifier.java

@@ -19,29 +19,6 @@ public class JsonPasswordVerifier extends PasswordVerifier {
     public String url;
     public String bearerToken;
 
-    @Override
-    public boolean check(String encryptedPassword, String password) {
-        JsonPasswordResponse response = jsonRequest(new JsonPasswordRequest(encryptedPassword, password), url, bearerToken, JsonPasswordResponse.class, client);
-        if (response != null) {
-            return response.success;
-        }
-        return false;
-    }
-
-    public static class JsonPasswordRequest {
-        public String encryptedPassword;
-        public String password;
-
-        public JsonPasswordRequest(String encryptedPassword, String password) {
-            this.encryptedPassword = encryptedPassword;
-            this.password = password;
-        }
-    }
-
-    public static class JsonPasswordResponse {
-        public boolean success;
-    }
-
     public static <T, R> R jsonRequest(T request, String url, String bearerToken, Class<R> clazz, HttpClient client) {
         HttpRequest.BodyPublisher publisher;
         if (request != null) {
@@ -78,4 +55,27 @@ public static <T, R> R jsonRequest(T request, String url, String bearerToken, Cl
             return null;
         }
     }
+
+    @Override
+    public boolean check(String encryptedPassword, String password) {
+        JsonPasswordResponse response = jsonRequest(new JsonPasswordRequest(encryptedPassword, password), url, bearerToken, JsonPasswordResponse.class, client);
+        if (response != null) {
+            return response.success;
+        }
+        return false;
+    }
+
+    public static class JsonPasswordRequest {
+        public String encryptedPassword;
+        public String password;
+
+        public JsonPasswordRequest(String encryptedPassword, String password) {
+            this.encryptedPassword = encryptedPassword;
+            this.password = password;
+        }
+    }
+
+    public static class JsonPasswordResponse {
+        public boolean success;
+    }
 }

LaunchServer/src/main/java/pro/gravit/launchserver/auth/protect/AdvancedProtectHandler.java

@@ -7,7 +7,6 @@
 import pro.gravit.launcher.events.request.GetSecureLevelInfoRequestEvent;
 import pro.gravit.launcher.events.request.HardwareReportRequestEvent;
 import pro.gravit.launcher.events.request.VerifySecureLevelKeyRequestEvent;
-import pro.gravit.launcher.request.secure.HardwareReportRequest;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.auth.AuthProviderPair;
 import pro.gravit.launchserver.auth.core.interfaces.UserHardware;

LaunchServer/src/main/java/pro/gravit/launchserver/auth/texture/JsonTextureProvider.java

@@ -15,9 +15,10 @@
 import java.util.UUID;
 
 public class JsonTextureProvider extends TextureProvider {
-    public String url;
+    private transient static final Type MAP_TYPE = new TypeToken<Map<String, Texture>>() {
+    }.getType();
     private transient final Logger logger = LogManager.getLogger();
-    private transient static final Type MAP_TYPE = new TypeToken<Map<String, Texture>>() {}.getType();
+    public String url;
 
     @Override
     public void close() throws IOException {

LaunchServer/src/main/java/pro/gravit/launchserver/auth/texture/TextureProvider.java

@@ -33,17 +33,6 @@ public static void registerProviders() {
 
     public abstract Texture getSkinTexture(UUID uuid, String username, String client) throws IOException;
 
-    @Deprecated
-    public static class SkinAndCloakTextures {
-        public final Texture skin;
-        public final Texture cloak;
-
-        public SkinAndCloakTextures(Texture skin, Texture cloak) {
-            this.skin = skin;
-            this.cloak = cloak;
-        }
-    }
-
     @Deprecated
     public SkinAndCloakTextures getTextures(UUID uuid, String username, String client) {
 
@@ -92,4 +81,15 @@ public Map<String, Texture> getAssets(UUID uuid, String username, String client)
 
         return map;
     }
+
+    @Deprecated
+    public static class SkinAndCloakTextures {
+        public final Texture skin;
+        public final Texture cloak;
+
+        public SkinAndCloakTextures(Texture skin, Texture cloak) {
+            this.skin = skin;
+            this.cloak = cloak;
+        }
+    }
 }

LaunchServer/src/main/java/pro/gravit/launchserver/binary/BuildContext.java

@@ -211,7 +211,8 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IO
             try {
                 cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
                 cipher.init(Cipher.ENCRYPT_MODE, sKeySpec, iKeySpec);
-            } catch (NoSuchAlgorithmException | NoSuchPaddingException | InvalidKeyException | InvalidAlgorithmParameterException e) {
+            } catch (NoSuchAlgorithmException | NoSuchPaddingException | InvalidKeyException |
+                     InvalidAlgorithmParameterException e) {
                 throw new RuntimeException(e);
             }
             try (OutputStream stream = new CipherOutputStream(new NoCloseOutputStream(output), cipher)) {

LaunchServer/src/main/java/pro/gravit/launchserver/command/basic/DebugCommand.java

@@ -11,6 +11,7 @@
 
 public class DebugCommand extends Command {
     private transient Logger logger = LogManager.getLogger();
+
     public DebugCommand(LaunchServer server) {
         super(server);
     }

LaunchServer/src/main/java/pro/gravit/launchserver/command/hash/DownloadAssetCommand.java

@@ -10,9 +10,7 @@
 import pro.gravit.launchserver.command.Command;
 import pro.gravit.utils.Downloader;
 import pro.gravit.utils.helper.IOHelper;
-import proguard.OutputWriter;
 
-import java.io.OutputStream;
 import java.io.Writer;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -22,11 +20,9 @@
 import java.util.List;
 
 public final class DownloadAssetCommand extends Command {
-    private transient final Logger logger = LogManager.getLogger();
-
     private static final String MINECRAFT_VERSIONS_URL = "https://launchermeta.mojang.com/mc/game/version_manifest.json";
-
     private static final String RESOURCES_DOWNLOAD_URL = "https://resources.download.minecraft.net/";
+    private transient final Logger logger = LogManager.getLogger();
 
     public DownloadAssetCommand(LaunchServer server) {
         super(server);

LaunchServer/src/main/java/pro/gravit/launchserver/command/service/TokenCommand.java

@@ -11,6 +11,7 @@
 
 public class TokenCommand extends Command {
     private transient final Logger logger = LogManager.getLogger();
+
     public TokenCommand(LaunchServer server) {
         super(server);
         this.childCommands.put("info", new SubCommand("[token]", "print token info") {

LaunchServer/src/main/java/pro/gravit/launchserver/components/ProGuardComponent.java

@@ -13,7 +13,6 @@
 import pro.gravit.utils.helper.UnpackHelper;
 import proguard.Configuration;
 import proguard.ConfigurationParser;
-import proguard.ParseException;
 import proguard.ProGuard;
 
 import java.io.IOException;

LaunchServer/src/main/java/pro/gravit/launchserver/helper/HttpHelper.java

@@ -23,71 +23,11 @@
 
 public final class HttpHelper {
     private static transient final Logger logger = LogManager.getLogger();
+
     private HttpHelper() {
         throw new UnsupportedOperationException();
     }
 
-    public static class HttpOptional<T,E> {
-        protected final T result;
-        protected final E error;
-        protected final int statusCode;
-
-        public HttpOptional(T result, E error, int statusCode) {
-            this.result = result;
-            this.error = error;
-            this.statusCode = statusCode;
-        }
-
-        public T result() {
-            return result;
-        }
-        public E error() {
-            return error;
-        }
-        public int statusCode() {
-            return statusCode;
-        }
-        public boolean isSuccessful() {
-            return statusCode >= 200 && statusCode < 300;
-        }
-        public T getOrThrow() throws RequestException {
-            if(isSuccessful()) {
-                return result;
-            } else {
-                throw new RequestException(error == null ? String.format("statusCode %d", statusCode) : error.toString());
-            }
-        }
-    }
-
-    public interface HttpErrorHandler<T, E> {
-        HttpOptional<T,E> apply(HttpResponse<InputStream> response);
-    }
-
-    public interface HttpJsonErrorHandler<T, E> extends HttpErrorHandler<T,E> {
-        HttpOptional<T,E> applyJson(JsonElement response, int statusCode);
-        default HttpOptional<T,E> apply(HttpResponse<InputStream> response) {
-            try(Reader reader = new InputStreamReader(response.body())) {
-                var element = Launcher.gsonManager.gson.fromJson(reader, JsonElement.class);
-                return applyJson(element, response.statusCode());
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-        }
-    }
-
-    public static final class BasicJsonHttpErrorHandler<T> implements HttpJsonErrorHandler<T, Void> {
-        private final Class<T> type;
-
-        public BasicJsonHttpErrorHandler(Class<T> type) {
-            this.type = type;
-        }
-
-        @Override
-        public HttpOptional<T, Void> applyJson(JsonElement response, int statusCode) {
-            return new HttpOptional<>(Launcher.gsonManager.gson.fromJson(response, type), null, statusCode);
-        }
-    }
-
     public static <T, E> HttpOptional<T, E> send(HttpClient client, HttpRequest request, HttpErrorHandler<T, E> handler) throws IOException {
         try {
             var response = client.send(request, HttpResponse.BodyHandlers.ofInputStream());
@@ -97,7 +37,6 @@ public static<T,E> HttpOptional<T,E> send(HttpClient client, HttpRequest request
         }
     }
 
-
     public static <T, E> CompletableFuture<HttpOptional<T, E>> sendAsync(HttpClient client, HttpRequest request, HttpErrorHandler<T, E> handler) throws IOException {
         return client.sendAsync(request, HttpResponse.BodyHandlers.ofInputStream()).thenApply(handler::apply);
     }
@@ -120,6 +59,73 @@ public static<T> HttpRequest.BodyPublisher jsonBodyPublisher(T obj) {
         return HttpRequest.BodyPublishers.ofString(Launcher.gsonManager.gson.toJson(obj));
     }
 
+
+    public interface HttpErrorHandler<T, E> {
+        HttpOptional<T, E> apply(HttpResponse<InputStream> response);
+    }
+
+    public interface HttpJsonErrorHandler<T, E> extends HttpErrorHandler<T, E> {
+        HttpOptional<T, E> applyJson(JsonElement response, int statusCode);
+
+        default HttpOptional<T, E> apply(HttpResponse<InputStream> response) {
+            try (Reader reader = new InputStreamReader(response.body())) {
+                var element = Launcher.gsonManager.gson.fromJson(reader, JsonElement.class);
+                return applyJson(element, response.statusCode());
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
+    public static class HttpOptional<T, E> {
+        protected final T result;
+        protected final E error;
+        protected final int statusCode;
+
+        public HttpOptional(T result, E error, int statusCode) {
+            this.result = result;
+            this.error = error;
+            this.statusCode = statusCode;
+        }
+
+        public T result() {
+            return result;
+        }
+
+        public E error() {
+            return error;
+        }
+
+        public int statusCode() {
+            return statusCode;
+        }
+
+        public boolean isSuccessful() {
+            return statusCode >= 200 && statusCode < 300;
+        }
+
+        public T getOrThrow() throws RequestException {
+            if (isSuccessful()) {
+                return result;
+            } else {
+                throw new RequestException(error == null ? String.format("statusCode %d", statusCode) : error.toString());
+            }
+        }
+    }
+
+    public static final class BasicJsonHttpErrorHandler<T> implements HttpJsonErrorHandler<T, Void> {
+        private final Class<T> type;
+
+        public BasicJsonHttpErrorHandler(Class<T> type) {
+            this.type = type;
+        }
+
+        @Override
+        public HttpOptional<T, Void> applyJson(JsonElement response, int statusCode) {
+            return new HttpOptional<>(Launcher.gsonManager.gson.fromJson(response, type), null, statusCode);
+        }
+    }
+
     private static class JsonBodyHandler<T> implements HttpResponse.BodyHandler<T> {
         private final HttpResponse.BodyHandler<InputStream> delegate;
         private final Function<InputStream, T> func;

LaunchServer/src/main/java/pro/gravit/launchserver/helper/LegacySessionHelper.java

@@ -7,7 +7,6 @@
 import java.security.interfaces.ECPrivateKey;
 import java.security.interfaces.ECPublicKey;
 import java.time.Clock;
-import java.time.Duration;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.util.Date;

LaunchServer/src/main/java/pro/gravit/launchserver/manangers/AuthManager.java

@@ -27,13 +27,7 @@
 import pro.gravit.utils.helper.SecurityHelper;
 
 import javax.crypto.Cipher;
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
 import java.io.IOException;
-import java.security.KeyPair;
-import java.security.SecureRandom;
-import java.time.LocalDateTime;
-import java.time.ZoneOffset;
 import java.util.*;
 
 public class AuthManager {
@@ -60,9 +54,6 @@ public String newCheckServerToken(String serverName, String authId) {
                 .compact();
     }
 
-    public record CheckServerTokenInfo(String serverName, String authId) {
-    }
-
     public CheckServerTokenInfo parseCheckServerToken(String token) {
         try {
             var jwt = checkServerTokenParser.parseClaimsJws(token).getBody();
@@ -72,29 +63,6 @@ public CheckServerTokenInfo parseCheckServerToken(String token) {
         }
     }
 
-    public static class CheckServerVerifier implements RestoreResponse.ExtendedTokenProvider {
-        private final LaunchServer server;
-
-        public CheckServerVerifier(LaunchServer server) {
-            this.server = server;
-        }
-
-        @Override
-        public boolean accept(Client client, AuthProviderPair pair, String extendedToken) {
-            var info = server.authManager.parseCheckServerToken(extendedToken);
-            if(info == null) {
-                return false;
-            }
-            client.auth_id = info.authId;
-            client.auth = server.config.getAuthProviderPair(info.authId);
-            if(client.permissions == null) client.permissions = new ClientPermissions();
-            client.permissions.addPerm("launchserver.checkserver");
-            client.permissions.addPerm(String.format("launchserver.profile.%s.show", info.serverName));
-            client.setProperty("launchserver.serverName", info.serverName);
-            return true;
-        }
-    }
-
     /**
      * Create AuthContext
      *
@@ -325,6 +293,32 @@ private AuthRequest.AuthPasswordInterface tryDecryptPasswordPlain(AuthRequest.Au
         return password;
     }
 
+    public record CheckServerTokenInfo(String serverName, String authId) {
+    }
+
+    public static class CheckServerVerifier implements RestoreResponse.ExtendedTokenProvider {
+        private final LaunchServer server;
+
+        public CheckServerVerifier(LaunchServer server) {
+            this.server = server;
+        }
+
+        @Override
+        public boolean accept(Client client, AuthProviderPair pair, String extendedToken) {
+            var info = server.authManager.parseCheckServerToken(extendedToken);
+            if (info == null) {
+                return false;
+            }
+            client.auth_id = info.authId;
+            client.auth = server.config.getAuthProviderPair(info.authId);
+            if (client.permissions == null) client.permissions = new ClientPermissions();
+            client.permissions.addPerm("launchserver.checkserver");
+            client.permissions.addPerm(String.format("launchserver.profile.%s.show", info.serverName));
+            client.setProperty("launchserver.serverName", info.serverName);
+            return true;
+        }
+    }
+
     public static class CheckServerReport {
         public UUID uuid;
         public User user;

LaunchServer/src/main/java/pro/gravit/launchserver/manangers/hook/AuthHookManager.java

@@ -1,6 +1,5 @@
 package pro.gravit.launchserver.manangers.hook;
 
-import pro.gravit.launchserver.auth.core.User;
 import pro.gravit.launchserver.manangers.AuthManager;
 import pro.gravit.launchserver.socket.Client;
 import pro.gravit.launchserver.socket.response.auth.AuthResponse;

LaunchServer/src/main/java/pro/gravit/launchserver/socket/WebSocketService.java

@@ -93,6 +93,22 @@ public static void registerResponses() {
         providers.register("getPublicKey", GetPublicKeyResponse.class);
     }
 
+    public static String getIPFromContext(ChannelHandlerContext ctx) {
+        var handler = ctx.pipeline().get(WebSocketFrameHandler.class);
+        if (handler == null || handler.context == null || handler.context.ip == null) {
+            return IOHelper.getIP(ctx.channel().remoteAddress());
+        }
+        return handler.context.ip;
+    }
+
+    public static String getIPFromChannel(Channel channel) {
+        var handler = channel.pipeline().get(WebSocketFrameHandler.class);
+        if (handler == null || handler.context == null || handler.context.ip == null) {
+            return IOHelper.getIP(channel.remoteAddress());
+        }
+        return handler.context.ip;
+    }
+
     public void forEachActiveChannels(BiConsumer<Channel, WebSocketFrameHandler> callback) {
         for (Channel channel : channels) {
             if (channel == null || channel.pipeline() == null) continue;
@@ -176,22 +192,6 @@ public void registerClient(Channel channel) {
         channels.add(channel);
     }
 
-    public static String getIPFromContext(ChannelHandlerContext ctx) {
-        var handler = ctx.pipeline().get(WebSocketFrameHandler.class);
-        if(handler == null || handler.context == null || handler.context.ip == null) {
-            return IOHelper.getIP(ctx.channel().remoteAddress());
-        }
-        return handler.context.ip;
-    }
-
-    public static String getIPFromChannel(Channel channel) {
-        var handler = channel.pipeline().get(WebSocketFrameHandler.class);
-        if(handler == null || handler.context == null || handler.context.ip == null) {
-            return IOHelper.getIP(channel.remoteAddress());
-        }
-        return handler.context.ip;
-    }
-
     public void sendObject(ChannelHandlerContext ctx, Object obj) {
         String msg = gson.toJson(obj, WebSocketEvent.class);
         if (logger.isTraceEnabled()) {

LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/AdditionalDataResponse.java

@@ -1,7 +1,6 @@
 package pro.gravit.launchserver.socket.response.auth;
 
 import io.netty.channel.ChannelHandlerContext;
-import pro.gravit.launcher.ClientPermissions;
 import pro.gravit.launcher.events.request.AdditionalDataRequestEvent;
 import pro.gravit.launchserver.auth.AuthProviderPair;
 import pro.gravit.launchserver.auth.core.User;

LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/AuthResponse.java

@@ -12,8 +12,6 @@
 import pro.gravit.launchserver.socket.response.SimpleResponse;
 import pro.gravit.utils.HookException;
 
-import java.util.UUID;
-
 public class AuthResponse extends SimpleResponse {
     private transient final Logger logger = LogManager.getLogger();
     public String login;

LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/FetchClientProfileKeyResponse.java

@@ -2,7 +2,6 @@
 
 import io.netty.channel.ChannelHandlerContext;
 import pro.gravit.launcher.events.request.FetchClientProfileKeyRequestEvent;
-import pro.gravit.launchserver.auth.core.User;
 import pro.gravit.launchserver.auth.core.UserSession;
 import pro.gravit.launchserver.auth.core.interfaces.session.UserSessionSupportKeys;
 import pro.gravit.launchserver.socket.Client;