mirror of
https://github.com/GravitLauncher/Launcher
synced 2025-04-18 22:13:04 +03:00
Дебаг
This commit is contained in:
parent
a55a4e0346
commit
9e74e1edcf
1 changed files with 28 additions and 12 deletions
|
@ -9,6 +9,7 @@
|
||||||
|
|
||||||
public final class RequestAuthHandler extends CachedAuthHandler {
|
public final class RequestAuthHandler extends CachedAuthHandler {
|
||||||
private String url;
|
private String url;
|
||||||
|
private String SecretKey;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void init() {
|
public void init() {
|
||||||
|
@ -17,25 +18,38 @@ public void init() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected Entry fetchEntry(UUID uuid) throws IOException {
|
protected Entry fetchEntry(UUID uuid) throws IOException {
|
||||||
String username = IOHelper.request(new URL(url + "?type=GetUsername&uuid=" + IOHelper.urlEncode(uuid.toString())));
|
String username = IOHelper.request(new URL(url + "?type=GetUsername&SecretKey=" + IOHelper.urlEncode(SecretKey) + "&uuid=" + IOHelper.urlEncode(uuid.toString())));
|
||||||
String accessToken = IOHelper.request(new URL(url + "?type=GetAccessToken&uuid=" + IOHelper.urlEncode(uuid.toString())));
|
String accessToken = IOHelper.request(new URL(url + "?type=GetAccessToken&SecretKey=" + IOHelper.urlEncode(SecretKey) + "&uuid=" + IOHelper.urlEncode(uuid.toString())));
|
||||||
String serverID = IOHelper.request(new URL(url + "?type=GetServerID&uuid=" + IOHelper.urlEncode(uuid.toString())));
|
String serverID = IOHelper.request(new URL(url + "?type=GetServerID&SecretKey=" + IOHelper.urlEncode(SecretKey) + "&uuid=" + IOHelper.urlEncode(uuid.toString())));
|
||||||
return new Entry(uuid, username, accessToken, serverID);
|
LogHelper.debug("[AuthHandler] Getted username: " + username);
|
||||||
|
LogHelper.debug("[AuthHandler] Getted accessToken: " + accessToken);
|
||||||
|
LogHelper.debug("[AuthHandler] Getted serverID: " + serverID);
|
||||||
|
LogHelper.debug("[AuthHandler] Getted UUID: " + uuid);
|
||||||
|
Entry entr = new Entry(uuid, username, accessToken, serverID);
|
||||||
|
return entr;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected Entry fetchEntry(String username) throws IOException {
|
protected Entry fetchEntry(String username) throws IOException {
|
||||||
String GettedUUID = IOHelper.request(new URL(url + "?type=GetUUID&username=" + IOHelper.urlEncode(username)));
|
String GettedUUID = IOHelper.request(new URL(url + "?type=GetUUID&SecretKey=" + IOHelper.urlEncode(SecretKey) + "&username=" + IOHelper.urlEncode(username)));
|
||||||
UUID uuid = UUID.fromString(GettedUUID);
|
UUID uuid = UUID.fromString(GettedUUID);
|
||||||
String accessToken = IOHelper.request(new URL(url + "?type=GetAccessToken&username=" + IOHelper.urlEncode(username)));
|
String accessToken = IOHelper.request(new URL(url + "?type=GetAccessToken&SecretKey=" + IOHelper.urlEncode(SecretKey) + "&username=" + IOHelper.urlEncode(username)));
|
||||||
String serverID = IOHelper.request(new URL(url + "?type=GetServerID&username=" + IOHelper.urlEncode(username)));
|
String serverID = IOHelper.request(new URL(url + "?type=GetServerID&SecretKey=" + IOHelper.urlEncode(SecretKey) + "&username=" + IOHelper.urlEncode(username)));
|
||||||
return new Entry(uuid, username, accessToken, serverID);
|
LogHelper.debug("[AuthHandler] Getted username: " + username);
|
||||||
|
LogHelper.debug("[AuthHandler] Getted accessToken: " + accessToken);
|
||||||
|
LogHelper.debug("[AuthHandler] Getted serverID: " + serverID);
|
||||||
|
LogHelper.debug("[AuthHandler] Getted UUID: " + uuid);
|
||||||
|
Entry entr = new Entry(uuid, username, accessToken, serverID);
|
||||||
|
return entr;
|
||||||
}
|
}
|
||||||
|
|
||||||
@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 response0 = IOHelper.request(new URL(url+ "?type=SetUUID&uuid=" + IOHelper.urlEncode(uuid.toString()) + "&username=" + IOHelper.urlEncode(username)));
|
String response0 = IOHelper.request(new URL(url+ "?type=SetUUID&SecretKey=" + IOHelper.urlEncode(SecretKey) + "&uuid=" + IOHelper.urlEncode(uuid.toString()) + "&username=" + IOHelper.urlEncode(username)));
|
||||||
String response1 = IOHelper.request(new URL(url+ "?type=SetAccessToken&accessToken=" + IOHelper.urlEncode(accessToken) + "&username=" + IOHelper.urlEncode(username)));
|
String response1 = IOHelper.request(new URL(url+ "?type=SetAccessToken&SecretKey=" + IOHelper.urlEncode(SecretKey) + "&accessToken=" + IOHelper.urlEncode(accessToken) + "&username=" + IOHelper.urlEncode(username)));
|
||||||
|
LogHelper.debug("[AuthHandler] Set accessToken: " + accessToken);
|
||||||
|
LogHelper.debug("[AuthHandler] Set UUID: " + uuid);
|
||||||
|
LogHelper.debug("[AuthHandler] For this username: " + username);
|
||||||
if (response0 == "OK" && response1 == "OK") {
|
if (response0 == "OK" && response1 == "OK") {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -44,8 +58,10 @@ protected boolean updateAuth(UUID uuid, String username, String accessToken) thr
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
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 + "?type=SetServerID&uuid=" + IOHelper.urlEncode(uuid.toString()) + "&serverID=" + IOHelper.urlEncode(serverID)));
|
String response = IOHelper.request(new URL(url + "?type=SetServerID&SecretKey=" + IOHelper.urlEncode(SecretKey) + "&uuid=" + IOHelper.urlEncode(uuid.toString()) + "&serverID=" + IOHelper.urlEncode(serverID)));
|
||||||
if (response == "OK") {
|
LogHelper.debug("[AuthHandler] Set serverID: " + serverID);
|
||||||
|
LogHelper.debug("[AuthHandler] For this UUID: " + uuid);
|
||||||
|
if (response == "OK") {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
|
|
Loading…
Reference in a new issue