Фикс говнокода (почти всего)

This commit is contained in:
sasha0552 2019-04-07 22:35:42 +06:00
parent d31d84d37e
commit 84589cbc5e

View file

@ -5,34 +5,26 @@
import ru.gravit.utils.helper.IOHelper; import ru.gravit.utils.helper.IOHelper;
import ru.gravit.utils.helper.LogHelper; import ru.gravit.utils.helper.LogHelper;
import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader;
import java.net.HttpURLConnection;
import java.net.URL; import java.net.URL;
import java.util.UUID; import java.util.UUID;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import static java.lang.String.format;
public final class RequestAuthHandler extends AuthHandler { public final class RequestAuthHandler extends AuthHandler {
// Из конфига строки // Из конфига строки
private String urlGetUUID;
private String urlGetAll; private String urlGetAll;
private String urlGetUUID;
private String urlGetUsername; private String urlGetUsername;
private String urlUpdateAccessToken; private String urlUpdateAccessToken;
private String urlUpdateServerID; private String urlUpdateServerID;
private String response; // TODO Обьеденить все
private transient Pattern pattern;
@Override @Override
public void init() { public void init() {
//TODO добавить ошибки к строкам из конфига if (urlGetAll == null) LogHelper.error("[Verify][AuthHandler] urlGetAll cannot be null");
if (url == null) LogHelper.error("[Verify][AuthHandler] url cannot be null"); if (urlGetUUID == null) LogHelper.error("[Verify][AuthHandler] urlGetUUID cannot be null");
if (response == null) LogHelper.error("[Verify][AuthHandler] response cannot be null"); if (urlGetUsername == null) LogHelper.error("[Verify][AuthHandler] urlGetUsername cannot be null");
pattern = Pattern.compile(response); if (urlUpdateAccessToken == null) LogHelper.error("[Verify][AuthHandler] urlUpdateAccessToken cannot be null");
if (urlUpdateServerID == null) LogHelper.error("[Verify][AuthHandler] urlUpdateServerID cannot be null");
} }
@Override @Override
@ -47,25 +39,28 @@ public UUID checkServer(String username, String serverID) throws IOException {
@Override @Override
public boolean joinServer(String username, String accessToken, String serverID) throws IOException { public boolean joinServer(String username, String accessToken, String serverID) throws IOException {
// TODO String currentResponse = IOHelper.request(new URL(CommonHelper.replace(urlGetAll, "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 @Override
public UUID usernameToUUID(String username) throws IOException { public UUID usernameToUUID(String username) throws IOException {
String currentResponse = IOHelper.request(new URL(CommonHelper.replace(urlGetUUID, "username", IOHelper.urlEncode("username")))); String currentResponse = IOHelper.request(new URL(CommonHelper.replace(urlGetUUID, "username", IOHelper.urlEncode(username))));
UUID stringTOuuid = UUID.fromString(currentResponse);
Matcher matcher = pattern.matcher(currentResponse); return stringTOuuid;
// TODO
} }
@Override @Override
public String uuidToUsername(UUID uuid) throws IOException { public String uuidToUsername(UUID uuid) throws IOException {
String currentResponse = IOHelper.request(new URL(CommonHelper.replace(urlGetUsername, "uuid", IOHelper.urlEncode("uuid")))); String uuidTOstring = uuid.toString();
String currentResponse = IOHelper.request(new URL(CommonHelper.replace(urlGetUsername, "uuid", IOHelper.urlEncode(uuidTOstring))));
Matcher matcher = pattern.matcher(currentResponse); return currentResponse;
// TODO
} }
@Override @Override