Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2024-12-22 16:41:46 +03:00
Code Issues Projects Releases Packages Wiki Activity

[ANY] Обновлены модули (#174)

Browse source 
* [FIX] MojangAuthProvider и его URL.

* [FIX] Вправлены JFX классы, лишние убраны, т. к. теперь можно легко доставить JFoenix или аналоги.

* [FIX] BinaryFileAuthHandler теперь работает.

* [FIX] BinaryFileAuthHandler вынесен в LegacySupport.

* [FEATURE] Переход на ThreadPool.

* [ANY] Обновлены модули.

* [FIX] Ошибки merge.
This commit is contained in:
Zaxar163 2019-02-17 14:15:57 +03:00 committed by Gravit
parent ca0e8c0299
commit 757c7690cb
5 changed files with 1 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
CODEOFCONDUCT.md → CODE_OF_CONDUCT.md
View file

3
LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/AuthProvider.java
View file

@ -29,9 +29,6 @@ public static void registerProviders() {
registerProvider("null", NullAuthProvider.class);
registerProvider("accept", AcceptAuthProvider.class);
registerProvider("reject", RejectAuthProvider.class);
// Auth providers that doesn't do nothing :D
registerProvider("mojang", MojangAuthProvider.class);
registerProvider("mysql", MySQLAuthProvider.class);
registerProvider("request", RequestAuthProvider.class);
registerProvider("json", JsonAuthProvider.class);

69
LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/MojangAuthProvider.java
View file

@ -1,69 +0,0 @@
package ru.gravit.launchserver.auth.provider;
import com.google.gson.Gson;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import ru.gravit.utils.HTTPRequest;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.UUID;
import java.util.regex.Pattern;
public final class MojangAuthProvider extends AuthProvider {
private static final Pattern UUID_REGEX = Pattern.compile("(\\w{8})(\\w{4})(\\w{4})(\\w{4})(\\w{12})");
private static final URL URL;
private static final Gson gson = new Gson();
static {
try {
URL = new URL("https://authserver.com.mojang.com/authenticate");
} catch (MalformedURLException e) {
throw new InternalError(e);
}
}
public class mojangAuth {
public mojangAuth(String username, String password) {
this.username = username;
this.password = password;
name = "Minecraft";
version = 1;
}
String name;
int version;
String username;
String password;
}
@Override
public AuthProviderResult auth(String login, String password, String ip) throws Exception {
mojangAuth mojangAuth = new mojangAuth(login, password);
JsonElement request = gson.toJsonTree(mojangAuth);
// Verify there's no error
JsonObject response = HTTPRequest.jsonRequest(request, URL).getAsJsonObject();
if (response == null)
authError("Empty com.mojang response");
JsonElement errorMessage = response.get("errorMessage");
if (errorMessage != null)
authError(errorMessage.getAsString());
// Parse JSON data
JsonObject selectedProfile = response.get("selectedProfile").getAsJsonObject();
String username = selectedProfile.get("name").getAsString();
String accessToken = response.get("clientToken").getAsString();
UUID uuid = UUID.fromString(UUID_REGEX.matcher(selectedProfile.get("id").getAsString()).replaceFirst("$1-$2-$3-$4-$5"));
String launcherToken = response.get("accessToken").getAsString();
// We're done
return new MojangAuthProviderResult(username, accessToken, uuid, launcherToken);
}
@Override
public void close() {
// Do nothing
}
}

14
LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/MojangAuthProviderResult.java
View file

@ -1,14 +0,0 @@
package ru.gravit.launchserver.auth.provider;
import java.util.UUID;
public final class MojangAuthProviderResult extends AuthProviderResult {
public final UUID uuid;
public final String launcherToken;
public MojangAuthProviderResult(String username, String accessToken, UUID uuid, String launcherToken) {
super(username, accessToken);
this.uuid = uuid;
this.launcherToken = launcherToken;
}
}

2
modules

@ -1 +1 @@
Subproject commit 14d93a04d551ae36f68bd74d61445d8c7d7bd076
Subproject commit 90a3b3eac726659a64410ea3134f8bc22893de32