Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2025-04-11 18:57:30 +03:00
Code Issues Projects Releases Packages Wiki Activity

Объеденение двух set'ов данных в один

Browse source
This commit is contained in:
sasha0552 2019-04-12 03:32:08 +06:00
parent 509ebf73e4
commit 7ab55ce9d8
2 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
LaunchServer/src/main/java/ru/gravit/launchserver/auth/handler/RequestAuthHandler.java
View file

@ -22,8 +22,7 @@ public final class RequestAuthHandler extends CachedAuthHandler {
private String TypeGetUUID;
private String TypeGetAccessToken;
private String TypeGetServerID;
private String TypeSetUUID;
private String TypeSetAccessToken;
private String TypeSetAccessTokenAndUUID;
private String TypeSetServerID;
@Override
@ -52,10 +51,8 @@ public void init() {
TypeGetAccessToken = "GetAccessToken";
if (TypeGetServerID == null)
TypeGetServerID = "GetServerID";
if (TypeSetUUID == null)
TypeSetUUID = "SetUUID";
if (TypeSetAccessToken == null)
TypeSetAccessToken = "SetAccessToken";
if (TypeSetAccessTokenAndUUID == null)
TypeSetAccessTokenAndUUID = "SetAccessTokenAndUUID";
if (TypeSetServerID == null)
TypeSetServerID = "SetServerID";
}
@ -91,12 +88,11 @@ private Entry query(UUID uuid, String username, String accessToken, String serve
@Override
protected boolean updateAuth(UUID uuid, String username, String accessToken) throws IOException {
String response0 = IOHelper.request(new URL(url+ "?" + IOHelper.urlEncode(typeColumn) + "=" + TypeSetUUID + "&" + secretKeyColumn + "=" + IOHelper.urlEncode(secretKey) + "&" + IOHelper.urlEncode(uuidColumn) + "=" + IOHelper.urlEncode(uuid.toString()) + "&" + IOHelper.urlEncode(usernameColumn) + "=" + IOHelper.urlEncode(username)));
String response1 = IOHelper.request(new URL(url+ "?" + IOHelper.urlEncode(typeColumn) + "=" + TypeSetAccessToken + "&" + secretKeyColumn + "=" + IOHelper.urlEncode(secretKey) + "&" + IOHelper.urlEncode(accessTokenColumn) + "=" + IOHelper.urlEncode(accessToken) + "&" + IOHelper.urlEncode(usernameColumn) + "=" + IOHelper.urlEncode(username)));
String response = IOHelper.request(new URL(url+ "?" + IOHelper.urlEncode(typeColumn) + "=" + TypeSetAccessTokenAndUUID + "&" + secretKeyColumn + "=" + IOHelper.urlEncode(secretKey) + "&" + IOHelper.urlEncode(uuidColumn) + "=" + IOHelper.urlEncode(uuid.toString()) + "&" + IOHelper.urlEncode(accessTokenColumn) + "=" + IOHelper.urlEncode(accessToken) + "&" + IOHelper.urlEncode(usernameColumn) + "=" + IOHelper.urlEncode(username)));
LogHelper.debug("[AuthHandler] Set accessToken: " + accessToken);
LogHelper.debug("[AuthHandler] Set UUID: " + uuid);
LogHelper.debug("[AuthHandler] For this username: " + username);
return response0.equals("OK") && response1.equals("OK");
return response.equals("OK");
}
@Override

8
compat/auth/AuthHandler.php
View file

@ -99,8 +99,9 @@ if(isset($AuthHandler['type'])) {
die('Username not set!');
}
}
if($AuthHandler['type'] == "SetAccessToken") {
if($AuthHandler['type'] == "SetAccessTokenAndUUID") {
$result = mysqli_query($link, 'UPDATE '.$settings['table'].' SET '.$settings['accessTokenColumn'].'="'.$AuthHandler['accessToken'].'" WHERE '.$settings['usernameColumn'].'="'.$AuthHandler['username'].'"') or die($link->error);
$result1 = mysqli_query($link, 'UPDATE '.$settings['table'].' SET '.$settings['uuidColumn'].'="'.$AuthHandler['uuid'].'" WHERE '.$settings['usernameColumn'].'="'.$AuthHandler['username'].'"') or die($link->error);
mysqli_close($link);
die('OK');
}
@ -109,11 +110,6 @@ if(isset($AuthHandler['type'])) {
mysqli_close($link);
die('OK');
}
if($AuthHandler['type'] == "SetUUID") {
$result = mysqli_query($link, 'UPDATE '.$settings['table'].' SET '.$settings['uuidColumn'].'="'.$AuthHandler['uuid'].'" WHERE '.$settings['usernameColumn'].'="'.$AuthHandler['username'].'"') or die($link->error);
mysqli_close($link);
die('OK');
}
die('Type is not correct!');
} else {
die('Type not set!');