Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2025-08-15 02:57:27 +03:00
Code Issues Projects Releases Packages Wiki Activity

[FIX] Fix problems with log-in to server

Browse source
This commit is contained in:
Gravita 2025-08-13 21:05:29 +07:00
parent b0715e0922
commit 7fae159c99
2 changed files with 30 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Launcher/src/main/java/pro/gravit/launcher/runtime/client/ClientLauncherProcess.java
View file

@ -130,8 +130,12 @@ private void applyClientProfile() {
} }
if (this.params.oauth == null) { if (this.params.oauth == null) {
this.params.oauth = Request.getOAuth(); this.params.oauth = Request.getOAuth();
}
if(this.params.authId == null) {
this.params.authId = Request.getAuthId(); this.params.authId = Request.getAuthId();
this.params.oauthExpiredTime = Request.getTokenExpiredTime(); this.params.oauthExpiredTime = Request.getTokenExpiredTime();
}
if(this.params.extendedTokens == null) {
this.params.extendedTokens = Request.getExtendedTokens(); this.params.extendedTokens = Request.getExtendedTokens();
} }
LauncherEngine.modulesManager.invokeEvent(new ClientProcessBuilderCreateEvent(this)); LauncherEngine.modulesManager.invokeEvent(new ClientProcessBuilderCreateEvent(this));

26
ServerWrapper/src/main/java/pro/gravit/launcher/server/ServerWrapper.java
View file

@ -13,10 +13,15 @@
import pro.gravit.launcher.base.profiles.optional.actions.OptionalAction; import pro.gravit.launcher.base.profiles.optional.actions.OptionalAction;
import pro.gravit.launcher.base.profiles.optional.triggers.OptionalTrigger; import pro.gravit.launcher.base.profiles.optional.triggers.OptionalTrigger;
import pro.gravit.launcher.base.request.Request; import pro.gravit.launcher.base.request.Request;
import pro.gravit.launcher.base.request.RequestCoreFeatureAPIImpl;
import pro.gravit.launcher.base.request.RequestFeatureAPIImpl;
import pro.gravit.launcher.base.request.auth.AuthRequest; import pro.gravit.launcher.base.request.auth.AuthRequest;
import pro.gravit.launcher.base.request.auth.GetAvailabilityAuthRequest; import pro.gravit.launcher.base.request.auth.GetAvailabilityAuthRequest;
import pro.gravit.launcher.base.request.update.ProfilesRequest; import pro.gravit.launcher.base.request.update.ProfilesRequest;
import pro.gravit.launcher.base.request.websockets.StdWebSocketService; import pro.gravit.launcher.base.request.websockets.StdWebSocketService;
import pro.gravit.launcher.core.api.LauncherAPI;
import pro.gravit.launcher.core.api.LauncherAPIHolder;
import pro.gravit.launcher.core.api.features.*;
import pro.gravit.launcher.server.authlib.InstallAuthlib; import pro.gravit.launcher.server.authlib.InstallAuthlib;
import pro.gravit.launcher.server.setup.ServerWrapperSetup; import pro.gravit.launcher.server.setup.ServerWrapperSetup;
import pro.gravit.utils.helper.IOHelper; import pro.gravit.utils.helper.IOHelper;
@ -129,6 +134,27 @@ public void connect() throws Exception {
} }
}; };
Request.setRequestService(service); Request.setRequestService(service);
LauncherAPIHolder.setCoreAPI(new RequestCoreFeatureAPIImpl(Request.getRequestService()));
LauncherAPIHolder.setCreateApiFactory((authId) -> {
var impl = new RequestFeatureAPIImpl(Request.getRequestService(), authId);
return new LauncherAPI(Map.of(
AuthFeatureAPI.class, impl,
UserFeatureAPI.class, impl,
ProfileFeatureAPI.class, impl,
TextureUploadFeatureAPI.class, impl,
HardwareVerificationFeatureAPI.class, impl));
});
if(config.authId != null) {
LauncherAPIHolder.changeAuthId(config.authId);
} else {
var impl = new RequestFeatureAPIImpl(Request.getRequestService(), null);
LauncherAPIHolder.setApi(new LauncherAPI(Map.of(
AuthFeatureAPI.class, impl,
UserFeatureAPI.class, impl,
ProfileFeatureAPI.class, impl,
TextureUploadFeatureAPI.class, impl,
HardwareVerificationFeatureAPI.class, impl)));
}
if (config.logFile != null) LogHelper.addOutput(IOHelper.newWriter(Paths.get(config.logFile), true)); if (config.logFile != null) LogHelper.addOutput(IOHelper.newWriter(Paths.get(config.logFile), true));
{ {
restore(); restore();