From 71cf43ca12f205d17b43be88ec08aaf7de8db520 Mon Sep 17 00:00:00 2001 From: sasha0552 Date: Sun, 7 Apr 2019 22:47:27 +0600 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D1=8A=D0=B5=D0=B4=D0=B5=D0=BD?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B2=20=D0=BE=D0=B4=D0=B8=D0=BD=20?= =?UTF-8?q?.php=20=D1=84=D0=B0=D0=B9=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/handler/RequestAuthHandler.java | 20 ++++++------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/handler/RequestAuthHandler.java b/LaunchServer/src/main/java/ru/gravit/launchserver/auth/handler/RequestAuthHandler.java index 86ba90f3..cb940d76 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/handler/RequestAuthHandler.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/auth/handler/RequestAuthHandler.java @@ -10,19 +10,11 @@ import java.util.UUID; public final class RequestAuthHandler extends AuthHandler { - // Из конфига строки - private String urlGetAll; - private String urlGetUUID; - private String urlGetUsername; - private String urlUpdateAccessToken; - private String urlUpdateServerID; - // TODO Обьеденить все + private String url; @Override public void init() { - if (urlGetAll == null) LogHelper.error("[Verify][AuthHandler] urlGetAll cannot be null"); - if (urlGetUUID == null) LogHelper.error("[Verify][AuthHandler] urlGetUUID cannot be null"); - if (urlGetUsername == null) LogHelper.error("[Verify][AuthHandler] urlGetUsername cannot be null"); + if (url == null) LogHelper.error("[Verify][AuthHandler] urlGetAll cannot be null"); } @Override @@ -33,14 +25,14 @@ public UUID auth(AuthProviderResult authResult) throws IOException { @Override public UUID checkServer(String username, String serverID) throws IOException { - String currentResponse = IOHelper.request(new URL(CommonHelper.replace(urlGetUUID, "type", "GetUUID", "username", IOHelper.urlEncode(username)))); + String currentResponse = IOHelper.request(new URL(CommonHelper.replace(url, "type", "GetUUID", "username", IOHelper.urlEncode(username)))); UUID stringTOuuid = UUID.fromString(currentResponse); return stringTOuuid; } @Override public boolean joinServer(String username, String accessToken, String serverID) throws IOException { - String currentResponse = IOHelper.request(new URL(CommonHelper.replace(urlGetAll, "type", "GetAll", "username", IOHelper.urlEncode(username), "accessToken", IOHelper.urlEncode(accessToken), "serverID", IOHelper.urlEncode(serverID)))); + String currentResponse = IOHelper.request(new URL(CommonHelper.replace(url, "type", "GetAll", "username", IOHelper.urlEncode(username), "accessToken", IOHelper.urlEncode(accessToken), "serverID", IOHelper.urlEncode(serverID)))); String[] joinServerParams = currentResponse.split(":"); if (joinServerParams[0] == username && joinServerParams[1] == accessToken) { if (joinServerParams[2] == serverID || joinServerParams == null) { @@ -52,7 +44,7 @@ public boolean joinServer(String username, String accessToken, String serverID) @Override public UUID usernameToUUID(String username) throws IOException { - String currentResponse = IOHelper.request(new URL(CommonHelper.replace(urlGetUUID, "type", "GetUUID", "username", IOHelper.urlEncode(username)))); + String currentResponse = IOHelper.request(new URL(CommonHelper.replace(url, "type", "GetUUID", "username", IOHelper.urlEncode(username)))); UUID stringTOuuid = UUID.fromString(currentResponse); return stringTOuuid; } @@ -60,7 +52,7 @@ public UUID usernameToUUID(String username) throws IOException { @Override public String uuidToUsername(UUID uuid) throws IOException { String uuidTOstring = uuid.toString(); - String currentResponse = IOHelper.request(new URL(CommonHelper.replace(urlGetUsername, "type", "GetUsername", "uuid", IOHelper.urlEncode(uuidTOstring)))); + String currentResponse = IOHelper.request(new URL(CommonHelper.replace(url, "type", "GetUsername", "uuid", IOHelper.urlEncode(uuidTOstring)))); return currentResponse; }