[FIX] Support 5.6.1 (GravitLauncher#4)

* Update launcher deps

* Updated module to 5.6.1

* init fix

Author: immails

MyHttp_module/.gitignore

@@ -3,5 +3,5 @@
 
 # Ignore Gradle build output directory
 build
-
+bin
 .idea

MyHttp_module/app/build.gradle.kts

@@ -22,9 +22,9 @@ repositories {
 
 dependencies {
     // This dependency is used by the application.
-    implementation("pro.gravit.launcher:launcher-core:5.5.3-SNAPSHOT")
-    implementation("pro.gravit.launcher:launcher-ws-api:5.5.3-SNAPSHOT")
-    implementation("pro.gravit.launcher:launchserver-api:5.5.3-SNAPSHOT")
+    implementation("pro.gravit.launcher:launcher-core:5.6.1")
+    implementation("pro.gravit.launcher:launchserver-api:5.6.1")
+    implementation("pro.gravit.launcher:launcher-ws-api:5.6.1")
     implementation("com.google.code.gson:gson:2.8.9")
     implementation("org.apache.logging.log4j:log4j-api:2.20.0")
 }
@@ -48,4 +48,4 @@ java {
 
 tasks.jar {
     manifest.attributes["Module-Main-Class"] = "pro.gravit.launchermodules.myhttp.MyHttpModule"
-}
+}

MyHttp_module/app/src/main/java/pro/gravit/launchermodules/myhttp/MyHttpAuthCoreProvider.java

@@ -12,19 +12,20 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import pro.gravit.launcher.ClientPermissions;
-import pro.gravit.launcher.events.request.GetAvailabilityAuthRequestEvent;
-import pro.gravit.launcher.profiles.Texture;
-import pro.gravit.launcher.request.auth.AuthRequest;
-import pro.gravit.launcher.request.auth.details.AuthPasswordDetails;
-import pro.gravit.launcher.request.auth.details.AuthTotpDetails;
-import pro.gravit.launcher.request.auth.password.Auth2FAPassword;
-import pro.gravit.launcher.request.auth.password.AuthPlainPassword;
-import pro.gravit.launcher.request.auth.password.AuthTOTPPassword;
-import pro.gravit.launcher.request.secure.HardwareReportRequest;
+import pro.gravit.launcher.base.ClientPermissions;
+import pro.gravit.launcher.base.events.request.GetAvailabilityAuthRequestEvent;
+import pro.gravit.launcher.base.profiles.Texture;
+import pro.gravit.launcher.base.request.auth.AuthRequest;
+import pro.gravit.launcher.base.request.auth.details.AuthPasswordDetails;
+import pro.gravit.launcher.base.request.auth.details.AuthTotpDetails;
+import pro.gravit.launcher.base.request.auth.password.Auth2FAPassword;
+import pro.gravit.launcher.base.request.auth.password.AuthPlainPassword;
+import pro.gravit.launcher.base.request.auth.password.AuthTOTPPassword;
+import pro.gravit.launcher.base.request.secure.HardwareReportRequest.HardwareInfo;
 import pro.gravit.launchserver.HttpRequester;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.auth.AuthException;
+import pro.gravit.launchserver.auth.AuthProviderPair;
 import pro.gravit.launchserver.auth.core.AuthCoreProvider;
 import pro.gravit.launchserver.auth.core.User;
 import pro.gravit.launchserver.auth.core.UserSession;
@@ -178,7 +179,8 @@ public AuthManager.AuthReport authorize(String login, AuthResponse.AuthContext c
     }
 
     @Override
-    public void init(LaunchServer server) {
+    public void init(LaunchServer server, AuthProviderPair pair) {
+        super.init(server, pair);
         requester = new HttpRequester();
     }
 
@@ -249,31 +251,6 @@ public MyHttpUserHardware getHardwareInfoByPublicKey(byte[] publicKey) {
         return null;
     }
 
-    @Override
-    public MyHttpUserHardware getHardwareInfoByData(HardwareReportRequest.HardwareInfo info) {
-        HttpHelper.HttpOptional<MyHttpUserHardware, HttpRequester.SimpleError> response = null;
-        try {
-            response = requester.send(requester.post(getHardwareInfoByDataUrl, new HardwareInfoRequest(info), bearerToken), MyHttpUserHardware.class);
-        } catch (Throwable e) {
-            logger.error("getHardwareInfoByData", e);
-        }
-
-        if (response != null && response.statusCode() == 200) {
-            MyHttpUserHardware userHardware = response.result();
-            logger.debug("Successfully got UserHardware {} by info", userHardware.id);
-            return userHardware;
-        }
-
-        // HTTP 204 meaning NO CONTENT, that usually means no data found, but request processed successfully
-        if (response != null && response.statusCode() == 204) {
-            logger.debug("UserHardware not found by publicKey");
-            return null;
-        }
-
-        logger.debug("Something went wrong while getting UserHardware by info");
-        return null;
-    }
-
     @Override
     public MyHttpUserHardware getHardwareInfoById(String id) {
         HttpHelper.HttpOptional<MyHttpUserHardware, HttpRequester.SimpleError> response = null;
@@ -299,27 +276,6 @@ public MyHttpUserHardware getHardwareInfoById(String id) {
         return null;
     }
 
-    @Override
-    public MyHttpUserHardware createHardwareInfo(HardwareReportRequest.HardwareInfo info, byte[] publicKey) {
-        HttpHelper.HttpOptional<MyHttpUserHardware, HttpRequester.SimpleError> response = null;
-        try {
-            response = requester.send(requester.post(createHardwareInfoUrl, new HardwareInfoRequest(info, publicKey), bearerToken), MyHttpUserHardware.class);
-        } catch (Throwable e) {
-            logger.error("createHardwareInfo", e);
-        }
-
-        if (response != null && response.isSuccessful()) {
-            MyHttpUserHardware userHardware = response.result();
-            logger.debug("Successfully created UserHardware");
-            return userHardware;
-        }
-
-        logger.debug("Something went wrong while creating UserHardware");
-
-        // shouldn't actually happen
-        throw new SecurityException("Please contact administrator");
-    }
-
     @Override
     public void connectUserAndHardware(UserSession userSession, UserHardware hardware) {
         HttpHelper.HttpOptional<MyHttpSimpleResponse, HttpRequester.SimpleError> response = null;
@@ -420,8 +376,8 @@ public record RefreshTokenRequest(String refreshToken) {}
 
     public record GetUserByAccessTokenRequest(String accessToken) {}
 
-    public record HardwareInfoRequest(HardwareReportRequest.HardwareInfo info, byte[] publicKey, String id) {
-        HardwareInfoRequest(HardwareReportRequest.HardwareInfo info) {
+    public record HardwareInfoRequest(HardwareInfo info, byte[] publicKey, String id) {
+        HardwareInfoRequest(HardwareInfo info) {
             this(info, null, null);
         }
 
@@ -433,7 +389,7 @@ public record HardwareInfoRequest(HardwareReportRequest.HardwareInfo info, byte[
             this(null, null, id);
         }
 
-        HardwareInfoRequest(HardwareReportRequest.HardwareInfo info, byte[] publicKey) {
+        HardwareInfoRequest(HardwareInfo info, byte[] publicKey) {
             this(info, publicKey, null);
         }
     }
@@ -537,10 +493,10 @@ public Map<String, Texture> getUserAssets() {
         }
     }
 
-    public record MyHttpUserHardware(HardwareReportRequest.HardwareInfo hardwareInfo, byte[] publicKey, String id, boolean banned) implements UserHardware {
+    public record MyHttpUserHardware(HardwareInfo hardwareInfo, byte[] publicKey, String id, boolean banned) implements UserHardware {
 
         @Override
-        public HardwareReportRequest.HardwareInfo getHardwareInfo() {
+        public HardwareInfo getHardwareInfo() {
             return hardwareInfo;
         }
 
@@ -562,4 +518,50 @@ public boolean isBanned() {
 
     public record MyHttpSimpleResponse(String message) {
     }
+
+    @Override
+    public UserHardware getHardwareInfoByData(HardwareInfo info) {
+        HttpHelper.HttpOptional<MyHttpUserHardware, HttpRequester.SimpleError> response = null;
+        try {
+            response = requester.send(requester.post(getHardwareInfoByDataUrl, new HardwareInfoRequest(info), bearerToken), MyHttpUserHardware.class);
+        } catch (Throwable e) {
+            logger.error("getHardwareInfoByData", e);
+        }
+
+        if (response != null && response.statusCode() == 200) {
+            MyHttpUserHardware userHardware = response.result();
+            logger.debug("Successfully got UserHardware {} by info", userHardware.id);
+            return userHardware;
+        }
+
+        // HTTP 204 meaning NO CONTENT, that usually means no data found, but request processed successfully
+        if (response != null && response.statusCode() == 204) {
+            logger.debug("UserHardware not found by publicKey");
+            return null;
+        }
+
+        logger.debug("Something went wrong while getting UserHardware by info");
+        return null;
+    }
+
+    @Override
+    public UserHardware createHardwareInfo(HardwareInfo info, byte[] publicKey) {
+        HttpHelper.HttpOptional<MyHttpUserHardware, HttpRequester.SimpleError> response = null;
+        try {
+            response = requester.send(requester.post(createHardwareInfoUrl, new HardwareInfoRequest(info, publicKey), bearerToken), MyHttpUserHardware.class);
+        } catch (Throwable e) {
+            logger.error("createHardwareInfo", e);
+        }
+
+        if (response != null && response.isSuccessful()) {
+            MyHttpUserHardware userHardware = response.result();
+            logger.debug("Successfully created UserHardware");
+            return userHardware;
+        }
+
+        logger.debug("Something went wrong while creating UserHardware");
+
+        // shouldn't actually happen
+        throw new SecurityException("Please contact administrator");
+    }
 }

MyHttp_module/app/src/main/java/pro/gravit/launchermodules/myhttp/MyHttpModule.java

@@ -1,9 +1,9 @@
 package pro.gravit.launchermodules.myhttp;
 
-import pro.gravit.launcher.modules.LauncherInitContext;
-import pro.gravit.launcher.modules.LauncherModule;
-import pro.gravit.launcher.modules.LauncherModuleInfo;
-import pro.gravit.launcher.modules.events.PreConfigPhase;
+import pro.gravit.launcher.base.modules.LauncherInitContext;
+import pro.gravit.launcher.base.modules.LauncherModule;
+import pro.gravit.launcher.base.modules.LauncherModuleInfo;
+import pro.gravit.launcher.base.modules.events.PreConfigPhase;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.auth.core.AuthCoreProvider;
 import pro.gravit.utils.Version;