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 7eb07920..a9c1233b 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 @@ -10,6 +10,21 @@ public final class RequestAuthHandler extends CachedAuthHandler { private String url; private String secretKey; + + private String typeColumn; + private String uuidColumn; + private String usernameColumn; + private String accessTokenColumn; + private String serverIDColumn; + private String secretKeyColumn; + + private String TypeGetUsername; + private String TypeGetUUID; + private String TypeGetAccessToken; + private String TypeGetServerID; + private String TypeSetUUID; + private String TypeSetAccessToken; + private String TypeSetServerID; @Override public void init() { @@ -17,13 +32,39 @@ public void init() { LogHelper.error("[Verify][AuthHandler] url cannot be null"); if (secretKey == null) LogHelper.error("[Verify][AuthHandler] secretKey cannot be null"); + if (typeColumn == null) + typeColumn = "type"; + if (uuidColumn == null) + uuidColumn = "uuid"; + if (usernameColumn == null) + usernameColumn = "username"; + if (accessTokenColumn == null) + accessTokenColumn = "accessToken"; + if (serverIDColumn == null) + serverIDColumn = "serverID"; + if (secretKeyColumn == null) + secretKeyColumn = "secretKey"; + if (TypeGetUsername == null) + TypeGetUsername = "GetUsername"; + if (TypeGetUUID == null) + TypeGetUUID = "GetUUID"; + if (TypeGetAccessToken == null) + TypeGetAccessToken = "GetAccessToken"; + if (TypeGetServerID == null) + TypeGetServerID = "GetServerID"; + if (TypeSetUUID == null) + TypeSetUUID = "SetUUID"; + if (TypeSetAccessToken == null) + TypeSetAccessToken = "SetAccessToken"; + if (TypeSetServerID == null) + TypeSetServerID = "SetServerID"; } @Override protected Entry fetchEntry(UUID uuid) throws IOException { - String username = IOHelper.request(new URL(url + "?type=GetUsername&secretKey=" + IOHelper.urlEncode(secretKey) + "&uuid=" + IOHelper.urlEncode(uuid.toString()))); - String accessToken = IOHelper.request(new URL(url + "?type=GetAccessToken&secretKey=" + IOHelper.urlEncode(secretKey) + "&uuid=" + IOHelper.urlEncode(uuid.toString()))); - String serverID = IOHelper.request(new URL(url + "?type=GetServerID&secretKey=" + IOHelper.urlEncode(secretKey) + "&uuid=" + IOHelper.urlEncode(uuid.toString()))); + String username = IOHelper.request(new URL(url + "?" + IOHelper.urlEncode(typeColumn) + "=" + TypeGetUsername + "&" + secretKeyColumn + "=" + IOHelper.urlEncode(secretKey) + "&" + IOHelper.urlEncode(uuidColumn) + "=" + IOHelper.urlEncode(uuid.toString()))); + String accessToken = IOHelper.request(new URL(url + "?" + IOHelper.urlEncode(typeColumn) + "=" + TypeGetAccessToken + "&" + secretKeyColumn + "=" + IOHelper.urlEncode(secretKey) + "&" + IOHelper.urlEncode(uuidColumn) + "=" + IOHelper.urlEncode(uuid.toString()))); + String serverID = IOHelper.request(new URL(url + "?" + IOHelper.urlEncode(typeColumn) + "=" + TypeGetServerID + "&" + secretKeyColumn + "=" + IOHelper.urlEncode(secretKey) + "&" + IOHelper.urlEncode(uuidColumn) + "=" + IOHelper.urlEncode(uuid.toString()))); LogHelper.debug("[AuthHandler] Getted username: " + username); LogHelper.debug("[AuthHandler] Getted accessToken: " + accessToken); @@ -35,10 +76,10 @@ protected Entry fetchEntry(UUID uuid) throws IOException { @Override protected Entry fetchEntry(String username) throws IOException { - String GettedUUID = IOHelper.request(new URL(url + "?type=GetUUID&secretKey=" + IOHelper.urlEncode(secretKey) + "&username=" + IOHelper.urlEncode(username))); + String GettedUUID = IOHelper.request(new URL(url + "?" + IOHelper.urlEncode(typeColumn) + "=" + TypeGetUUID + "&" + secretKeyColumn + "=" + IOHelper.urlEncode(secretKey) + "&" + IOHelper.urlEncode(usernameColumn) + "=" + IOHelper.urlEncode(username))); UUID uuid = UUID.fromString(GettedUUID); - String accessToken = IOHelper.request(new URL(url + "?type=GetAccessToken&secretKey=" + IOHelper.urlEncode(secretKey) + "&username=" + IOHelper.urlEncode(username))); - String serverID = IOHelper.request(new URL(url + "?type=GetServerID&secretKey=" + IOHelper.urlEncode(secretKey) + "&username=" + IOHelper.urlEncode(username))); + String accessToken = IOHelper.request(new URL(url + "?" + IOHelper.urlEncode(typeColumn) + "=" + TypeGetAccessToken + "&" + secretKeyColumn + "=" + IOHelper.urlEncode(secretKey) + "&" + IOHelper.urlEncode(usernameColumn) + "=" + IOHelper.urlEncode(username))); + String serverID = IOHelper.request(new URL(url + "?" + IOHelper.urlEncode(typeColumn) + "=" + TypeGetServerID + "&" + secretKeyColumn + "=" + IOHelper.urlEncode(secretKey) + "&" + IOHelper.urlEncode(usernameColumn) + "=" + IOHelper.urlEncode(username))); LogHelper.debug("[AuthHandler] Getted username: " + username); LogHelper.debug("[AuthHandler] Getted accessToken: " + accessToken); @@ -54,8 +95,8 @@ 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+ "?type=SetUUID&secretKey=" + IOHelper.urlEncode(secretKey) + "&uuid=" + IOHelper.urlEncode(uuid.toString()) + "&username=" + IOHelper.urlEncode(username))); - String response1 = IOHelper.request(new URL(url+ "?type=SetAccessToken&secretKey=" + IOHelper.urlEncode(secretKey) + "&accessToken=" + IOHelper.urlEncode(accessToken) + "&username=" + IOHelper.urlEncode(username))); + 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))); LogHelper.debug("[AuthHandler] Set accessToken: " + accessToken); LogHelper.debug("[AuthHandler] Set UUID: " + uuid); @@ -66,7 +107,7 @@ protected boolean updateAuth(UUID uuid, String username, String accessToken) thr @Override protected boolean updateServerID(UUID uuid, String serverID) throws IOException { - String response = IOHelper.request(new URL(url + "?type=SetServerID&secretKey=" + IOHelper.urlEncode(secretKey) + "&uuid=" + IOHelper.urlEncode(uuid.toString()) + "&serverID=" + IOHelper.urlEncode(serverID))); + String response = IOHelper.request(new URL(url + "?" + IOHelper.urlEncode(typeColumn) + "=" + TypeSetServerID + "&" + secretKeyColumn + "=" + IOHelper.urlEncode(secretKey) + "&" + IOHelper.urlEncode(uuidColumn) + "=" + IOHelper.urlEncode(uuid.toString()) + "&" + IOHelper.urlEncode(serverIDColumn) + "=" + IOHelper.urlEncode(serverID))); LogHelper.debug("[AuthHandler] Set serverID: " + serverID); LogHelper.debug("[AuthHandler] For this UUID: " + uuid);