From 574f40d3eef9c80de4e11a7aba5d0f4bd2b48ed8 Mon Sep 17 00:00:00 2001
From: sasha0552 <admin@sasha0552.ru>
Date: Tue, 9 Apr 2019 00:32:20 +0600
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B2=D0=BE=D0=B4=20?=
 =?UTF-8?q?=D0=BD=D0=B0=20CachedAuthHandler?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../auth/handler/RequestAuthHandler.java      | 33 ++++++-------------
 1 file changed, 10 insertions(+), 23 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 a9081ecc..1550ff48 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,15 +1,15 @@
 package ru.gravit.launchserver.auth.handler;
 
-import ru.gravit.launchserver.auth.provider.AuthProviderResult;
 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.Map;
 import java.util.UUID;
 
-public final class RequestAuthHandler extends AuthHandler {
+public final class RequestAuthHandler extends CachedAuthHandler {
     private String url;
 
     @Override
@@ -18,30 +18,17 @@ public void init() {
     }
 
     @Override
-    public UUID auth(AuthProviderResult authResult) throws IOException {
-        //TODO вот тут не понял поэтому пусть пока что возращает рандом uuid
-        return UUID.randomUUID();
+    protected Entry fetchEntry(UUID uuid) throws IOException {
+        String uuidTOstring = uuid.toString();
+        return IOHelper.request(new URL(CommonHelper.replace(url, "type", "GetUsername", "uuid", IOHelper.urlEncode(uuidTOstring))));
     }
 
-    @Override
-    public UUID checkServer(String username, String serverID) throws IOException {
-        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(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) {
-                return true;
-            }
-        }
-        return false;
-    }
 
+
+
+
+    /*
     @Override
     public UUID usernameToUUID(String username) throws IOException {
         String currentResponse = IOHelper.request(new URL(CommonHelper.replace(url, "type", "GetUUID", "username", IOHelper.urlEncode(username))));
@@ -55,7 +42,7 @@ public String uuidToUsername(UUID uuid) throws IOException {
         String currentResponse = IOHelper.request(new URL(CommonHelper.replace(url, "type", "GetUsername", "uuid", IOHelper.urlEncode(uuidTOstring))));
         return currentResponse;
     }
-
+    */
     @Override
     public void close() {
         // Ничего не делать