From c436cc1a90463c4fb43b64ba7885e216bf6a34fb Mon Sep 17 00:00:00 2001
From: zaxar163 <zahar.vcherachny@yandex.ru>
Date: Fri, 15 Feb 2019 20:24:34 +0300
Subject: [PATCH] =?UTF-8?q?[FIX]=20=D0=9E=D1=88=D0=B8=D0=B1=D0=BA=D0=B8=20?=
 =?UTF-8?q?merge.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../auth/provider/AuthProvider.java           |  3 -
 .../auth/provider/MojangAuthProvider.java     | 69 -------------------
 .../provider/MojangAuthProviderResult.java    | 14 ----
 3 files changed, 86 deletions(-)
 delete mode 100644 LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/MojangAuthProvider.java
 delete mode 100644 LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/MojangAuthProviderResult.java

diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/AuthProvider.java b/LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/AuthProvider.java
index b797b7ad..6883f636 100644
--- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/AuthProvider.java
+++ b/LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/AuthProvider.java
@@ -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);
diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/MojangAuthProvider.java b/LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/MojangAuthProvider.java
deleted file mode 100644
index 1cd70dd5..00000000
--- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/MojangAuthProvider.java
+++ /dev/null
@@ -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.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
-    }
-}
diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/MojangAuthProviderResult.java b/LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/MojangAuthProviderResult.java
deleted file mode 100644
index 123dbe05..00000000
--- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/MojangAuthProviderResult.java
+++ /dev/null
@@ -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;
-    }
-}