From 4513c62472d969986042f26d6bb14c978bf1cedb Mon Sep 17 00:00:00 2001
From: sasha0552 <admin@sasha0552.ru>
Date: Thu, 11 Apr 2019 03:04:42 +0600
Subject: [PATCH] =?UTF-8?q?=D0=92=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD?=
 =?UTF-8?q?=D0=BE,=20=D1=84=D0=B8=D0=BD=D0=B0=D0=BB=20=D1=80=D0=B5=D0=BB?=
 =?UTF-8?q?=D0=B8=D0=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../auth/handler/RequestAuthHandler.java      | 41 ++++++++-----------
 1 file changed, 17 insertions(+), 24 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 70c40d0c..9426fe1c 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
@@ -1,12 +1,10 @@
 package ru.gravit.launchserver.auth.handler;
 
-import ru.gravit.utils.helper.CommonHelper;
 import ru.gravit.utils.helper.IOHelper;
 import ru.gravit.utils.helper.LogHelper;
 
 import java.io.IOException;
 import java.net.URL;
-import java.util.Objects;
 import java.util.UUID;
 
 public final class RequestAuthHandler extends CachedAuthHandler {
@@ -19,43 +17,38 @@ public void init() {
 
     @Override
     protected Entry fetchEntry(UUID uuid) throws IOException {
-        String username = IOHelper.request(new URL(CommonHelper.replace(url, "type", "GetUsername", "uuid", IOHelper.urlEncode(uuid.toString()))));
-        String accessToken = IOHelper.request(new URL(CommonHelper.replace(url, "type", "GetAccessToken", "uuid", IOHelper.urlEncode(uuid.toString()))));
-        String serverID = IOHelper.request(new URL(CommonHelper.replace(url, "type", "GetServerID", "uuid", IOHelper.urlEncode(uuid.toString()))));
+        String username = IOHelper.request(new URL(url + "?type=GetUsername&uuid=" + IOHelper.urlEncode(uuid.toString())));
+        String accessToken = IOHelper.request(new URL(url + "?type=GetAccessToken&uuid=" + IOHelper.urlEncode(uuid.toString())));
+        String serverID = IOHelper.request(new URL(url + "?type=GetServerID&uuid=" + IOHelper.urlEncode(uuid.toString())));
         return new Entry(uuid, username, accessToken, serverID);
     }
 
     @Override
     protected Entry fetchEntry(String username) throws IOException {
-        String GettedUUID = IOHelper.request(new URL(CommonHelper.replace(url, "type", "GetUUID", "username", IOHelper.urlEncode(username))));
+        String GettedUUID = IOHelper.request(new URL(url + "?type=GetUUID&username=" + IOHelper.urlEncode(username)));
         UUID uuid = UUID.fromString(GettedUUID);
-        String accessToken = IOHelper.request(new URL(CommonHelper.replace(url, "type", "GetAccessToken", "username", IOHelper.urlEncode(username))));
-        String serverID = IOHelper.request(new URL(CommonHelper.replace(url, "type", "GetServerID", "username", IOHelper.urlEncode(username))));
+        String accessToken = IOHelper.request(new URL(url + "?type=GetAccessToken&username=" + IOHelper.urlEncode(username)));
+        String serverID = IOHelper.request(new URL(url + "?type=GetServerID&username=" + IOHelper.urlEncode(username)));
         return new Entry(uuid, username, accessToken, serverID);
     }
 
     @Override
     protected boolean updateAuth(UUID uuid, String username, String accessToken) throws IOException {
-        boolean isUUIDupdated = updUUID(uuid, username).equals("OK");
-        boolean isAccessTokenUpdated = updAccessToken(accessToken, username).equals("OK");
-        return isUUIDupdated && isAccessTokenUpdated;
+        String response0 = IOHelper.request(new URL(url+ "?type=SetUUID&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)));
+        if (response0 == "OK" && response1 == "OK") {
+            return true;
+        }
+        return false;
     }
 
     @Override
     protected boolean updateServerID(UUID uuid, String serverID) throws IOException {
-        return updServerID(uuid, serverID).equals("OK");
-    }
-
-    protected String updAccessToken(final String accessToken, final String username) throws IOException {
-        return IOHelper.request(new URL(CommonHelper.replace(url, "type", "SetAccessToken", "username", IOHelper.urlEncode(Objects.toString(username)), "accessToken", IOHelper.urlEncode(Objects.toString(accessToken)))));
-    }
-
-    protected String updServerID(final UUID uuid, final String serverID) throws IOException {
-        return IOHelper.request(new URL(CommonHelper.replace(url, "type", "SetServerID", "uuid", IOHelper.urlEncode(Objects.toString(uuid)), "ServerID", IOHelper.urlEncode(serverID))));
-    }
-
-    protected String updUUID(final UUID uuid, final String username) throws IOException {
-        return IOHelper.request(new URL(CommonHelper.replace(url, "type", "SetUUID", "username", IOHelper.urlEncode(Objects.toString(username)), "uuid", IOHelper.urlEncode(Objects.toString(uuid)))));
+        String response = IOHelper.request(new URL(url + "?type=SetServerID&uuid=" + IOHelper.urlEncode(uuid.toString()) + "&serverID=" + IOHelper.urlEncode(serverID)));
+        if (response == "OK") {
+            return true;
+        }
+        return false;
     }
 
     @Override