mirror of
https://github.com/GravitLauncher/Launcher
synced 2025-04-01 22:14:01 +03:00
review fixes
This commit is contained in:
parent
abddfeb69e
commit
dc4d3e422b
1 changed files with 16 additions and 18 deletions
|
@ -3,6 +3,7 @@
|
|||
import io.netty.util.internal.StringUtil;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.jetbrains.annotations.Contract;
|
||||
import pro.gravit.launcher.ClientPermissions;
|
||||
import pro.gravit.launcher.events.request.AuthRequestEvent;
|
||||
import pro.gravit.launcher.events.request.GetAvailabilityAuthRequestEvent;
|
||||
|
@ -166,8 +167,9 @@ public UserHardware getHardwareInfoByData(HardwareReportRequest.HardwareInfo inf
|
|||
return null;
|
||||
}
|
||||
try {
|
||||
HttpHelper.HttpOptional<HttpUserHardware, HttpRequester.SimpleError> hardware = requester.send(requester.post(getHardwareInfoByDataUrl, new HardwareRequest(new HttpUserHardware(info)),
|
||||
bearerToken), HttpUserHardware.class);
|
||||
HttpHelper.HttpOptional<HttpUserHardware, HttpRequester.SimpleError> hardware =
|
||||
requester.send(requester.post(getHardwareInfoByDataUrl, new HardwareRequest(new HttpUserHardware(info)),
|
||||
bearerToken), HttpUserHardware.class);
|
||||
//should return null if not found
|
||||
return hardware.isSuccessful() ? hardware.getOrThrow() : null;
|
||||
} catch (IOException e) {
|
||||
|
@ -196,8 +198,8 @@ public UserHardware createHardwareInfo(HardwareReportRequest.HardwareInfo info,
|
|||
return null;
|
||||
}
|
||||
try {
|
||||
return requester.send(requester.post(createHardwareInfoUrl, new HardwareRequest(new HttpUserHardware(info, publicKey, false)),
|
||||
bearerToken), HttpUserHardware.class).getOrThrow();
|
||||
return requester.send(requester.post(createHardwareInfoUrl, new HardwareRequest(new HttpUserHardware(info,
|
||||
publicKey, false)), bearerToken), HttpUserHardware.class).getOrThrow();
|
||||
} catch (IOException e) {
|
||||
logger.error(e);
|
||||
return null;
|
||||
|
@ -210,7 +212,7 @@ public void connectUserAndHardware(UserSession userSession, UserHardware hardwar
|
|||
return;
|
||||
}
|
||||
try {
|
||||
requester.send(requester.post(connectUserAndHardwareUrl, new HardwareRequest(userSession, hardware), bearerToken), Void.class);
|
||||
requester.send(requester.post(connectUserAndHardwareUrl, new HardwareRequest(hardware, userSession), bearerToken), Void.class);
|
||||
} catch (IOException e) {
|
||||
logger.error(e);
|
||||
}
|
||||
|
@ -234,8 +236,8 @@ public Iterable<User> getUsersByHardwareInfo(UserHardware hardware) {
|
|||
return null;
|
||||
}
|
||||
try {
|
||||
return requester.send(requester.post(getUsersByHardwareInfoUrl, new HardwareRequest(hardware),
|
||||
bearerToken), List.class).getOrThrow();
|
||||
return requester.send(requester
|
||||
.post(getUsersByHardwareInfoUrl, new HardwareRequest(hardware), bearerToken), List.class).getOrThrow();
|
||||
} catch (IOException e) {
|
||||
logger.error(e);
|
||||
return null;
|
||||
|
@ -379,28 +381,24 @@ public RefreshTokenRequest(String refreshToken, AuthResponse.AuthContext context
|
|||
}
|
||||
}
|
||||
|
||||
public static class HardwareRequest {
|
||||
public UserHardware userHardware;
|
||||
public byte[] key;
|
||||
public UserSession userSession;
|
||||
public record HardwareRequest(UserHardware userHardware, byte[] key, UserSession userSession) {
|
||||
|
||||
public HardwareRequest(UserHardware userHardware) {
|
||||
this.userHardware = userHardware;
|
||||
this(userHardware, null, null);
|
||||
}
|
||||
|
||||
public HardwareRequest(UserHardware userHardware, byte[] key) {
|
||||
this.userHardware = userHardware;
|
||||
this.key = key;
|
||||
this(userHardware, key, null);
|
||||
}
|
||||
|
||||
public HardwareRequest(UserSession session, UserHardware hardware) {
|
||||
this.userSession = session;
|
||||
this.userHardware = hardware;
|
||||
public HardwareRequest(UserHardware userHardware, UserSession userSession) {
|
||||
this(userHardware, null, userSession);
|
||||
}
|
||||
|
||||
public HardwareRequest(byte[] key) {
|
||||
this.key = key;
|
||||
this(null, key, null);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public class HttpUser implements User, UserSupportTextures, UserSupportProperties, UserSupportHardware {
|
||||
|
|
Loading…
Reference in a new issue