From e046b0298c0ba315bca75ee7eb95768008e5dd18 Mon Sep 17 00:00:00 2001 From: sasha0552 Date: Wed, 10 Apr 2019 04:03:25 +0600 Subject: [PATCH] =?UTF-8?q?=D0=95=D1=89=D0=B5=20=D1=83=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D1=8C=D1=88=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=BE=D0=BB=D0=B8?= =?UTF-8?q?=D1=87=D0=B5=D1=81=D1=82=D0=B2=D0=B0=20=D1=81=D1=82=D1=80=D0=BE?= =?UTF-8?q?=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/handler/RequestAuthHandler.java | 21 +++---------------- 1 file changed, 3 insertions(+), 18 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 3fb78540..1ae4bc05 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 @@ -47,30 +47,15 @@ protected boolean updateServerID(UUID uuid, String serverID) throws IOException } protected String updAccessToken(final String accessToken, final String username) throws IOException { - final String type = "SetAccessToken"; - final String encodedUsername = IOHelper.urlEncode(Objects.toString(username)); - final String encodedAccessToken = IOHelper.urlEncode(Objects.toString(accessToken)); - final URL formattedUrl = new URL( - CommonHelper.replace(url, "type", type, "username", encodedUsername, "uuid", encodedAccessToken)); - return IOHelper.request(formattedUrl); + return IOHelper.request(new URL(CommonHelper.replace(url, "type", "SetAccessToken", "username", IOHelper.urlEncode(Objects.toString(username)), "uuid", IOHelper.urlEncode(Objects.toString(accessToken))))); } protected String updServerID(final UUID uuid, final String serverID) throws IOException { - final String type = "SetServerID"; - final String encodedUUID = IOHelper.urlEncode(Objects.toString(uuid)); - final String encodedID = IOHelper.urlEncode(serverID); - final URL formattedUrl = new URL( - CommonHelper.replace(url, "type", type, "uuid", encodedUUID, "ServerID", encodedID)); - return IOHelper.request(formattedUrl); + 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 { - final String type = "SetUUID"; - final String encodedUsername = IOHelper.urlEncode(Objects.toString(username)); - final String encodedUUID = IOHelper.urlEncode(Objects.toString(uuid)); - final URL formattedUrl = new URL( - CommonHelper.replace(url, "type", type, "username", encodedUsername, "uuid", encodedUUID)); - return IOHelper.request(formattedUrl); + return IOHelper.request(new URL(CommonHelper.replace(url, "type", "SetUUID", "username", IOHelper.urlEncode(Objects.toString(username)), "uuid", IOHelper.urlEncode(Objects.toString(uuid))))); } @Override