From 737568dd93b16fb01757ca6925193ea34b08e89e Mon Sep 17 00:00:00 2001 From: sasha0552 Date: Sun, 7 Apr 2019 22:44:42 +0600 Subject: [PATCH] =?UTF-8?q?=D0=92=D1=81=D0=B5=20=D0=B4=D0=BE=D0=BB=D0=B6?= =?UTF-8?q?=D0=BD=D0=BE=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D1=82=D1=8C?= =?UTF-8?q?=20(=D0=B4=D0=BE=D0=BB=D0=B6=D0=BD=D0=BE)=20=D0=BA=D1=80=D0=BE?= =?UTF-8?q?=D0=BC=D0=B5=20=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D0=B8=20aut?= =?UTF-8?q?h?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/handler/RequestAuthHandler.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 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 e9602f4b..86ba90f3 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 @@ -23,23 +23,24 @@ 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 (urlUpdateAccessToken == null) LogHelper.error("[Verify][AuthHandler] urlUpdateAccessToken cannot be null"); - if (urlUpdateServerID == null) LogHelper.error("[Verify][AuthHandler] urlUpdateServerID cannot be null"); } @Override public UUID auth(AuthProviderResult authResult) throws IOException { - //TODO + //TODO вот тут не понял поэтому пусть пока что возращает рандом uuid + return UUID.randomUUID(); } @Override public UUID checkServer(String username, String serverID) throws IOException { - //TODO + String currentResponse = IOHelper.request(new URL(CommonHelper.replace(urlGetUUID, "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, "username", IOHelper.urlEncode(username), "accessToken", IOHelper.urlEncode(accessToken), "serverID", IOHelper.urlEncode(serverID)))); + String currentResponse = IOHelper.request(new URL(CommonHelper.replace(urlGetAll, "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) { @@ -51,7 +52,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, "username", IOHelper.urlEncode(username)))); + String currentResponse = IOHelper.request(new URL(CommonHelper.replace(urlGetUUID, "type", "GetUUID", "username", IOHelper.urlEncode(username)))); UUID stringTOuuid = UUID.fromString(currentResponse); return stringTOuuid; } @@ -59,7 +60,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, "uuid", IOHelper.urlEncode(uuidTOstring)))); + String currentResponse = IOHelper.request(new URL(CommonHelper.replace(urlGetUsername, "type", "GetUsername", "uuid", IOHelper.urlEncode(uuidTOstring)))); return currentResponse; }