From 84589cbc5eeeb6ca373c0ebcf9efea5297c5e623 Mon Sep 17 00:00:00 2001
From: sasha0552 <admin@sasha0552.ru>
Date: Sun, 7 Apr 2019 22:35:42 +0600
Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=B3=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=BD=D0=BE=D0=BA=D0=BE=D0=B4=D0=B0=20(=D0=BF=D0=BE=D1=87?=
 =?UTF-8?q?=D1=82=D0=B8=20=D0=B2=D1=81=D0=B5=D0=B3=D0=BE)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../auth/handler/RequestAuthHandler.java      | 47 +++++++++----------
 1 file changed, 21 insertions(+), 26 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 2737908f..e9602f4b 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
@@ -5,34 +5,26 @@
 import ru.gravit.utils.helper.IOHelper;
 import ru.gravit.utils.helper.LogHelper;
 
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.UUID;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import static java.lang.String.format;
 
 public final class RequestAuthHandler extends AuthHandler {
     // Из конфига строки
-    private String urlGetUUID;
     private String urlGetAll;
+    private String urlGetUUID;
     private String urlGetUsername;
     private String urlUpdateAccessToken;
     private String urlUpdateServerID;
-    private String response;
-
-    private transient Pattern pattern;
+    // TODO Обьеденить все
 
     @Override
     public void init() {
-        //TODO добавить ошибки к строкам из конфига
-        if (url == null) LogHelper.error("[Verify][AuthHandler] url cannot be null");
-        if (response == null) LogHelper.error("[Verify][AuthHandler] response cannot be null");
-        pattern = Pattern.compile(response);
+        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
@@ -47,25 +39,28 @@ public UUID checkServer(String username, String serverID) throws IOException {
 
     @Override
     public boolean joinServer(String username, String accessToken, String serverID) throws IOException {
-        // TODO
+        String currentResponse = IOHelper.request(new URL(CommonHelper.replace(urlGetAll, "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) {
+                return true;
+            }
+        }
+        return false;
     }
 
     @Override
     public UUID usernameToUUID(String username) throws IOException {
-        String currentResponse = IOHelper.request(new URL(CommonHelper.replace(urlGetUUID, "username", IOHelper.urlEncode("username"))));
-
-        Matcher matcher = pattern.matcher(currentResponse);
-
-        // TODO
+        String currentResponse = IOHelper.request(new URL(CommonHelper.replace(urlGetUUID, "username", IOHelper.urlEncode(username))));
+        UUID stringTOuuid = UUID.fromString(currentResponse);
+        return stringTOuuid;
     }
 
     @Override
     public String uuidToUsername(UUID uuid) throws IOException {
-        String currentResponse = IOHelper.request(new URL(CommonHelper.replace(urlGetUsername, "uuid", IOHelper.urlEncode("uuid"))));
-
-        Matcher matcher = pattern.matcher(currentResponse);
-
-        // TODO
+        String uuidTOstring = uuid.toString();
+        String currentResponse = IOHelper.request(new URL(CommonHelper.replace(urlGetUsername, "uuid", IOHelper.urlEncode(uuidTOstring))));
+        return currentResponse;
     }
 
     @Override