From 7ab55ce9d8198a6b433b854a466fcc8328f006e5 Mon Sep 17 00:00:00 2001
From: sasha0552 <admin@sasha0552.ru>
Date: Fri, 12 Apr 2019 03:32:08 +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=B4=D0=B2=D1=83=D1=85=20set'?=
 =?UTF-8?q?=D0=BE=D0=B2=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20=D0=B2=20?=
 =?UTF-8?q?=D0=BE=D0=B4=D0=B8=D0=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../auth/handler/RequestAuthHandler.java           | 14 +++++---------
 compat/auth/AuthHandler.php                        |  8 ++------
 2 files changed, 7 insertions(+), 15 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 80c677d9..a355ee76 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
@@ -22,8 +22,7 @@ public final class RequestAuthHandler extends CachedAuthHandler {
 	private String TypeGetUUID;
 	private String TypeGetAccessToken;
 	private String TypeGetServerID;
-	private String TypeSetUUID;
-	private String TypeSetAccessToken;
+	private String TypeSetAccessTokenAndUUID;
 	private String TypeSetServerID;
 
     @Override
@@ -52,10 +51,8 @@ public void init() {
             TypeGetAccessToken = "GetAccessToken";
 		if (TypeGetServerID == null)
             TypeGetServerID = "GetServerID";
-		if (TypeSetUUID == null)
-            TypeSetUUID = "SetUUID";
-		if (TypeSetAccessToken == null)
-            TypeSetAccessToken = "SetAccessToken";
+		if (TypeSetAccessTokenAndUUID == null)
+            TypeSetAccessTokenAndUUID = "SetAccessTokenAndUUID";
 		if (TypeSetServerID == null)
             TypeSetServerID = "SetServerID";
     }
@@ -91,12 +88,11 @@ private Entry query(UUID uuid, String username, String accessToken, String serve
 
     @Override
     protected boolean updateAuth(UUID uuid, String username, String accessToken) throws IOException {
-        String response0 = IOHelper.request(new URL(url+ "?" + IOHelper.urlEncode(typeColumn) + "=" + TypeSetUUID + "&" + secretKeyColumn + "=" + IOHelper.urlEncode(secretKey) + "&" + IOHelper.urlEncode(uuidColumn) + "=" + IOHelper.urlEncode(uuid.toString()) + "&" + IOHelper.urlEncode(usernameColumn) + "=" + IOHelper.urlEncode(username)));
-        String response1 = IOHelper.request(new URL(url+ "?" + IOHelper.urlEncode(typeColumn) + "=" + TypeSetAccessToken + "&" + secretKeyColumn + "=" + IOHelper.urlEncode(secretKey) + "&" + IOHelper.urlEncode(accessTokenColumn) + "=" + IOHelper.urlEncode(accessToken) + "&" + IOHelper.urlEncode(usernameColumn) + "=" + IOHelper.urlEncode(username)));
+        String response = IOHelper.request(new URL(url+ "?" + IOHelper.urlEncode(typeColumn) + "=" + TypeSetAccessTokenAndUUID + "&" + secretKeyColumn + "=" + IOHelper.urlEncode(secretKey) + "&" + IOHelper.urlEncode(uuidColumn) + "=" + IOHelper.urlEncode(uuid.toString()) + "&" + IOHelper.urlEncode(accessTokenColumn) + "=" + IOHelper.urlEncode(accessToken) + "&" + IOHelper.urlEncode(usernameColumn) + "=" + IOHelper.urlEncode(username)));
         LogHelper.debug("[AuthHandler] Set accessToken: " + accessToken);
 		LogHelper.debug("[AuthHandler] Set UUID: " + uuid);
 		LogHelper.debug("[AuthHandler] For this username: " + username);
-        return response0.equals("OK") && response1.equals("OK");
+        return response.equals("OK");
     }
 
     @Override
diff --git a/compat/auth/AuthHandler.php b/compat/auth/AuthHandler.php
index 64ece72e..0ad7924e 100644
--- a/compat/auth/AuthHandler.php
+++ b/compat/auth/AuthHandler.php
@@ -99,8 +99,9 @@ if(isset($AuthHandler['type'])) {
 		die('Username not set!');
 	}
   }
-  if($AuthHandler['type'] == "SetAccessToken") {
+  if($AuthHandler['type'] == "SetAccessTokenAndUUID") {
 	  $result = mysqli_query($link, 'UPDATE '.$settings['table'].' SET '.$settings['accessTokenColumn'].'="'.$AuthHandler['accessToken'].'" WHERE '.$settings['usernameColumn'].'="'.$AuthHandler['username'].'"') or die($link->error);
+	  $result1 = mysqli_query($link, 'UPDATE '.$settings['table'].' SET '.$settings['uuidColumn'].'="'.$AuthHandler['uuid'].'" WHERE '.$settings['usernameColumn'].'="'.$AuthHandler['username'].'"') or die($link->error);
 	  mysqli_close($link);
 	  die('OK');
   }
@@ -109,11 +110,6 @@ if(isset($AuthHandler['type'])) {
 	  mysqli_close($link);
 	  die('OK');
   }
-  if($AuthHandler['type'] == "SetUUID") {
-	  $result = mysqli_query($link, 'UPDATE '.$settings['table'].' SET '.$settings['uuidColumn'].'="'.$AuthHandler['uuid'].'" WHERE '.$settings['usernameColumn'].'="'.$AuthHandler['username'].'"') or die($link->error);
-	  mysqli_close($link);
-	  die('OK');
-  }
   die('Type is not correct!');
 } else { 
   die('Type not set!');