feedc0de/FastLogin
1
0
Fork 0
forked from TuxCoding/FastLogin
Code Pull Requests Activity

Remove third party API

Browse Source
This commit is contained in:
games647
2017-02-04 14:09:38 +01:00
parent c47dd1df80
commit b8d029d6da
1 changed files with 3 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
core/src/main/java/com/github/games647/fastlogin/core/shared/MojangApiConnector.java
View File

@ -28,8 +28,6 @@ public abstract class MojangApiConnector {
private static final int TIMEOUT = 3 * 1_000; private static final int TIMEOUT = 3 * 1_000;
private static final String USER_AGENT = "Premium-Checker"; private static final String USER_AGENT = "Premium-Checker";
private static final String MCAPI_UUID_URL = "https://mcapi.ca/uuid/player/";
//only premium (paid account) users have a uuid from here //only premium (paid account) users have a uuid from here
private static final String UUID_LINK = "https://api.mojang.com/users/profiles/minecraft/"; private static final String UUID_LINK = "https://api.mojang.com/users/profiles/minecraft/";
//this includes a-zA-Z1-9_ //this includes a-zA-Z1-9_
@ -89,8 +87,7 @@ public abstract class MojangApiConnector {
// only make a API call if the name is valid existing mojang account // only make a API call if the name is valid existing mojang account
if (requests.size() >= rateLimit || System.currentTimeMillis() - lastRateLimit < 1_000 * 60 * 10) { if (requests.size() >= rateLimit || System.currentTimeMillis() - lastRateLimit < 1_000 * 60 * 10) {
// plugin.getLogger().fine("STILL WAITING FOR RATE_LIMIT - TRYING Third-party API"); return null;
return getUUIDFromAPI(playerName);
} }
requests.put(new Object(), new Object()); requests.put(new Object(), new Object());
@ -104,9 +101,9 @@ public abstract class MojangApiConnector {
return FastLoginCore.parseId(getUUIDFromJson(line)); return FastLoginCore.parseId(getUUIDFromJson(line));
} }
} else if (connection.getResponseCode() == RATE_LIMIT_CODE) { } else if (connection.getResponseCode() == RATE_LIMIT_CODE) {
logger.info("RATE_LIMIT REACHED - TRYING THIRD-PARTY API"); logger.info("RATE_LIMIT REACHED");
lastRateLimit = System.currentTimeMillis(); lastRateLimit = System.currentTimeMillis();
return getUUIDFromAPI(playerName); return null;
} }
//204 - no content for not found //204 - no content for not found
} catch (Exception ex) { } catch (Exception ex) {
@ -118,25 +115,6 @@ public abstract class MojangApiConnector {
return null; return null;
} }
public UUID getUUIDFromAPI(String playerName) {
try {
HttpURLConnection httpConnection = getConnection(MCAPI_UUID_URL + playerName);
if (httpConnection.getResponseCode() == HttpURLConnection.HTTP_NOT_FOUND) {
//cracked
return null;
}
Reader reader = new InputStreamReader(httpConnection.getInputStream());
String json = CharStreams.toString(reader);
return FastLoginCore.parseId(getUUIDFromJson(json));
} catch (IOException iOException) {
logger.log(Level.SEVERE, "Tried converting name->uuid from third-party api", iOException);
}
return null;
}
public abstract boolean hasJoinedServer(LoginSession session, String serverId); public abstract boolean hasJoinedServer(LoginSession session, String serverId);
protected abstract String getUUIDFromJson(String json); protected abstract String getUUIDFromJson(String json);