PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2025-02-13 16:24:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Re-authorize if token has expired.

Browse source
This commit is contained in:
Matthew Messinger 2018-07-28 01:47:16 -04:00
parent c60cd9dae6
commit 74fef1a240
1 changed files with 29 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/hdskins/java/com/voxelmodpack/hdskins/skins/ValhallaSkinServer.java
View file

@ -74,24 +74,40 @@ public class ValhallaSkinServer implements SkinServer {
try (CloseableHttpClient client = HttpClients.createSystem()) { try (CloseableHttpClient client = HttpClients.createSystem()) {
authorize(client, session); authorize(client, session);
GameProfile profile = session.getProfile(); try {
return upload(client, session, image, type, metadata);
if (image == null) { } catch (IOException e) {
return resetSkin(client, profile, type); if (e.getMessage().equals("Authorization failed")) {
} accessToken = null;
switch (image.getScheme()) { authorize(client, session);
case "file": return upload(client, session, image, type, metadata);
return uploadFile(client, new File(image), profile, type, metadata); }
case "http": throw e;
case "https":
return uploadUrl(client, image, profile, type, metadata);
default:
throw new IOException("Unsupported URI scheme: " + image.getScheme());
} }
} }
}, HDSkinManager.skinUploadExecutor); }, HDSkinManager.skinUploadExecutor);
} }
private SkinUploadResponse upload(CloseableHttpClient client, Session session, @Nullable URI image,
MinecraftProfileTexture.Type type, Map<String, String> metadata)
throws IOException {
GameProfile profile = session.getProfile();
if (image == null) {
return resetSkin(client, profile, type);
}
switch (image.getScheme()) {
case "file":
return uploadFile(client, new File(image), profile, type, metadata);
case "http":
case "https":
return uploadUrl(client, image, profile, type, metadata);
default:
throw new IOException("Unsupported URI scheme: " + image.getScheme());
}
}
private SkinUploadResponse resetSkin(CloseableHttpClient client, GameProfile profile, MinecraftProfileTexture.Type type) throws IOException { private SkinUploadResponse resetSkin(CloseableHttpClient client, GameProfile profile, MinecraftProfileTexture.Type type) throws IOException {
return upload(client, RequestBuilder.delete() return upload(client, RequestBuilder.delete()
.setUri(buildUserTextureUri(profile, type)) .setUri(buildUserTextureUri(profile, type))