mirror of
https://github.com/GravitLauncher/Launcher
synced 2025-04-19 14:33:04 +03:00
Вроде форматирование пофиксил
This commit is contained in:
parent
1d0e510109
commit
fd9cf30f15
1 changed files with 47 additions and 46 deletions
|
@ -9,20 +9,20 @@
|
||||||
|
|
||||||
public final class RequestAuthHandler extends CachedAuthHandler {
|
public final class RequestAuthHandler extends CachedAuthHandler {
|
||||||
private String url;
|
private String url;
|
||||||
private String secretKey;
|
private String secretKey;
|
||||||
|
|
||||||
private String typeLine;
|
private String typeLine;
|
||||||
private String uuidLine;
|
private String uuidLine;
|
||||||
private String usernameLine;
|
private String usernameLine;
|
||||||
private String accessTokenLine;
|
private String accessTokenLine;
|
||||||
private String serverIDLine;
|
private String serverIDLine;
|
||||||
private String secretKeyLine;
|
private String secretKeyLine;
|
||||||
|
|
||||||
private String TypeFetchByUUID;
|
private String TypeFetchByUUID;
|
||||||
private String TypeFetchByUsername;
|
private String TypeFetchByUsername;
|
||||||
private String TypeSetAccessTokenAndUUID;
|
private String TypeSetAccessTokenAndUUID;
|
||||||
private String TypeSetServerID;
|
private String TypeSetServerID;
|
||||||
private String splitSymbol;
|
private String splitSymbol;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void init() {
|
public void init() {
|
||||||
|
@ -30,57 +30,57 @@ public void init() {
|
||||||
LogHelper.error("[Verify][AuthHandler] url cannot be null");
|
LogHelper.error("[Verify][AuthHandler] url cannot be null");
|
||||||
if (secretKey == null)
|
if (secretKey == null)
|
||||||
LogHelper.error("[Verify][AuthHandler] secretKey cannot be null");
|
LogHelper.error("[Verify][AuthHandler] secretKey cannot be null");
|
||||||
// Default
|
// Default
|
||||||
if (typeLine == null)
|
if (typeLine == null)
|
||||||
typeLine = "type";
|
typeLine = "type";
|
||||||
if (uuidLine == null)
|
if (uuidLine == null)
|
||||||
uuidLine = "uuid";
|
uuidLine = "uuid";
|
||||||
if (usernameLine == null)
|
if (usernameLine == null)
|
||||||
usernameLine = "username";
|
usernameLine = "username";
|
||||||
if (accessTokenLine == null)
|
if (accessTokenLine == null)
|
||||||
accessTokenLine = "accessToken";
|
accessTokenLine = "accessToken";
|
||||||
if (serverIDLine == null)
|
if (serverIDLine == null)
|
||||||
serverIDLine = "serverID";
|
serverIDLine = "serverID";
|
||||||
if (secretKeyLine == null)
|
if (secretKeyLine == null)
|
||||||
secretKeyLine = "secretKey";
|
secretKeyLine = "secretKey";
|
||||||
if (TypeFetchByUUID == null)
|
if (TypeFetchByUUID == null)
|
||||||
TypeFetchByUUID = "FetchByUUID";
|
TypeFetchByUUID = "FetchByUUID";
|
||||||
if (TypeFetchByUsername == null)
|
if (TypeFetchByUsername == null)
|
||||||
TypeFetchByUsername = "FetchByUsername";
|
TypeFetchByUsername = "FetchByUsername";
|
||||||
if (TypeSetAccessTokenAndUUID == null)
|
if (TypeSetAccessTokenAndUUID == null)
|
||||||
TypeSetAccessTokenAndUUID = "SetAccessTokenAndUUID";
|
TypeSetAccessTokenAndUUID = "SetAccessTokenAndUUID";
|
||||||
if (TypeSetServerID == null)
|
if (TypeSetServerID == null)
|
||||||
TypeSetServerID = "SetServerID";
|
TypeSetServerID = "SetServerID";
|
||||||
if (splitSymbol == null)
|
if (splitSymbol == null)
|
||||||
splitSymbol = ":";
|
splitSymbol = ":";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected Entry fetchEntry(UUID uuid) throws IOException {
|
protected Entry fetchEntry(UUID uuid) throws IOException {
|
||||||
String response = IOHelper.request(new URL(url + "?" + IOHelper.urlEncode(typeLine) + "=" + TypeFetchByUUID + "&" + secretKeyLine + "=" + IOHelper.urlEncode(secretKey) + "&" + IOHelper.urlEncode(uuidLine) + "=" + IOHelper.urlEncode(uuid.toString())));
|
String response = IOHelper.request(new URL(url + "?" + IOHelper.urlEncode(typeLine) + "=" + TypeFetchByUUID + "&" + secretKeyLine + "=" + IOHelper.urlEncode(secretKey) + "&" + IOHelper.urlEncode(uuidLine) + "=" + IOHelper.urlEncode(uuid.toString())));
|
||||||
String[] parts = response.split(splitSymbol);
|
String[] parts = response.split(splitSymbol);
|
||||||
String username = parts[0];
|
String username = parts[0];
|
||||||
String accessToken = parts[1];
|
String accessToken = parts[1];
|
||||||
String serverID = parts[2];
|
String serverID = parts[2];
|
||||||
LogHelper.debug("[AuthHandler] Getted username: " + username);
|
LogHelper.debug("[AuthHandler] Getted username: " + username);
|
||||||
LogHelper.debug("[AuthHandler] Getted accessToken: " + accessToken);
|
LogHelper.debug("[AuthHandler] Getted accessToken: " + accessToken);
|
||||||
LogHelper.debug("[AuthHandler] Getted serverID: " + serverID);
|
LogHelper.debug("[AuthHandler] Getted serverID: " + serverID);
|
||||||
LogHelper.debug("[AuthHandler] Getted UUID: " + uuid);
|
LogHelper.debug("[AuthHandler] Getted UUID: " + uuid);
|
||||||
return query(uuid, username, accessToken, serverID);
|
return query(uuid, username, accessToken, serverID);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected Entry fetchEntry(String username) throws IOException {
|
protected Entry fetchEntry(String username) throws IOException {
|
||||||
String response = IOHelper.request(new URL(url + "?" + IOHelper.urlEncode(typeLine) + "=" + TypeFetchByUsername + "&" + secretKeyLine + "=" + IOHelper.urlEncode(secretKey) + "&" + IOHelper.urlEncode(usernameLine) + "=" + IOHelper.urlEncode(username)));
|
String response = IOHelper.request(new URL(url + "?" + IOHelper.urlEncode(typeLine) + "=" + TypeFetchByUsername + "&" + secretKeyLine + "=" + IOHelper.urlEncode(secretKey) + "&" + IOHelper.urlEncode(usernameLine) + "=" + IOHelper.urlEncode(username)));
|
||||||
String[] parts = response.split(splitSymbol);
|
String[] parts = response.split(splitSymbol);
|
||||||
UUID uuid = UUID.fromString(parts[0]);
|
UUID uuid = UUID.fromString(parts[0]);
|
||||||
String accessToken = parts[1];
|
String accessToken = parts[1];
|
||||||
String serverID = parts[2];
|
String serverID = parts[2];
|
||||||
LogHelper.debug("[AuthHandler] Getted username: " + username);
|
LogHelper.debug("[AuthHandler] Getted username: " + username);
|
||||||
LogHelper.debug("[AuthHandler] Getted accessToken: " + accessToken);
|
LogHelper.debug("[AuthHandler] Getted accessToken: " + accessToken);
|
||||||
LogHelper.debug("[AuthHandler] Getted serverID: " + serverID);
|
LogHelper.debug("[AuthHandler] Getted serverID: " + serverID);
|
||||||
LogHelper.debug("[AuthHandler] Getted UUID: " + uuid);
|
LogHelper.debug("[AuthHandler] Getted UUID: " + uuid);
|
||||||
return query(uuid, username, accessToken, serverID);
|
return query(uuid, username, accessToken, serverID);
|
||||||
}
|
}
|
||||||
|
|
||||||
private Entry query(UUID uuid, String username, String accessToken, String serverID) {
|
private Entry query(UUID uuid, String username, String accessToken, String serverID) {
|
||||||
|
@ -89,10 +89,10 @@ private Entry query(UUID uuid, String username, String accessToken, String serve
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected boolean updateAuth(UUID uuid, String username, String accessToken) throws IOException {
|
protected boolean updateAuth(UUID uuid, String username, String accessToken) throws IOException {
|
||||||
String response = IOHelper.request(new URL(url+ "?" + IOHelper.urlEncode(typeLine) + "=" + TypeSetAccessTokenAndUUID + "&" + secretKeyLine + "=" + IOHelper.urlEncode(secretKey) + "&" + IOHelper.urlEncode(uuidLine) + "=" + IOHelper.urlEncode(uuid.toString()) + "&" + IOHelper.urlEncode(accessTokenLine) + "=" + IOHelper.urlEncode(accessToken) + "&" + IOHelper.urlEncode(usernameLine) + "=" + IOHelper.urlEncode(username)));
|
String response = IOHelper.request(new URL(url + "?" + IOHelper.urlEncode(typeLine) + "=" + TypeSetAccessTokenAndUUID + "&" + secretKeyLine + "=" + IOHelper.urlEncode(secretKey) + "&" + IOHelper.urlEncode(uuidLine) + "=" + IOHelper.urlEncode(uuid.toString()) + "&" + IOHelper.urlEncode(accessTokenLine) + "=" + IOHelper.urlEncode(accessToken) + "&" + IOHelper.urlEncode(usernameLine) + "=" + IOHelper.urlEncode(username)));
|
||||||
LogHelper.debug("[AuthHandler] Set accessToken: " + accessToken);
|
LogHelper.debug("[AuthHandler] Set accessToken: " + accessToken);
|
||||||
LogHelper.debug("[AuthHandler] Set UUID: " + uuid);
|
LogHelper.debug("[AuthHandler] Set UUID: " + uuid);
|
||||||
LogHelper.debug("[AuthHandler] For this username: " + username);
|
LogHelper.debug("[AuthHandler] For this username: " + username);
|
||||||
return response.equals("OK");
|
return response.equals("OK");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -100,10 +100,11 @@ protected boolean updateAuth(UUID uuid, String username, String accessToken) thr
|
||||||
protected boolean updateServerID(UUID uuid, String serverID) throws IOException {
|
protected boolean updateServerID(UUID uuid, String serverID) throws IOException {
|
||||||
String response = IOHelper.request(new URL(url + "?" + IOHelper.urlEncode(typeLine) + "=" + TypeSetServerID + "&" + secretKeyLine + "=" + IOHelper.urlEncode(secretKey) + "&" + IOHelper.urlEncode(uuidLine) + "=" + IOHelper.urlEncode(uuid.toString()) + "&" + IOHelper.urlEncode(serverIDLine) + "=" + IOHelper.urlEncode(serverID)));
|
String response = IOHelper.request(new URL(url + "?" + IOHelper.urlEncode(typeLine) + "=" + TypeSetServerID + "&" + secretKeyLine + "=" + IOHelper.urlEncode(secretKey) + "&" + IOHelper.urlEncode(uuidLine) + "=" + IOHelper.urlEncode(uuid.toString()) + "&" + IOHelper.urlEncode(serverIDLine) + "=" + IOHelper.urlEncode(serverID)));
|
||||||
LogHelper.debug("[AuthHandler] Set serverID: " + serverID);
|
LogHelper.debug("[AuthHandler] Set serverID: " + serverID);
|
||||||
LogHelper.debug("[AuthHandler] For this UUID: " + uuid);
|
LogHelper.debug("[AuthHandler] For this UUID: " + uuid);
|
||||||
return response.equals("OK");
|
return response.equals("OK");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void close() {}
|
public void close() {
|
||||||
|
}
|
||||||
}
|
}
|
Loading…
Reference in a new issue