From 52609413a269dd588a9b2d2a8b6f8d837c6998a9 Mon Sep 17 00:00:00 2001
From: Gravit <gravit.min@ya.ru>
Date: Mon, 28 Jan 2019 21:39:23 +0700
Subject: [PATCH] =?UTF-8?q?[FEATURE]=20=D0=9F=D0=BE=D1=80=D1=82=D0=B8?=
 =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D1=8B=20=D0=B7=D0=B0=D0=BF=D1=80?=
 =?UTF-8?q?=D0=BE=D1=81=D1=8B=20=D0=BF=D1=80=D0=BE=D1=84=D0=B8=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../websocket/json/auth/ProfilesResponse.java |  4 ++
 .../json/profile/BatchProfileByUsername.java  | 41 ++++++++++++
 .../json/profile/ProfileByUUIDResponse.java   | 62 +++++++++++++++++++
 .../json/profile/ProfileByUsername.java       | 37 +++++++++++
 4 files changed, 144 insertions(+)
 create mode 100644 LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/profile/BatchProfileByUsername.java
 create mode 100644 LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/profile/ProfileByUUIDResponse.java
 create mode 100644 LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/profile/ProfileByUsername.java

diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/auth/ProfilesResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/auth/ProfilesResponse.java
index a4586bc2..f08f71c1 100644
--- a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/auth/ProfilesResponse.java
+++ b/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/auth/ProfilesResponse.java
@@ -17,6 +17,10 @@ public String getType() {
 
     @Override
     public void execute(WebSocketService service, ChannelHandlerContext ctx, Client client) throws Exception {
+        if(!client.isAuth)
+        {
+            service.sendObject(ctx, new WebSocketService.ErrorResult("Access denied"));
+        }
         service.sendObject(ctx, new Result((List<ClientProfile>) LaunchServer.server.getProfiles()));
     }
     public class Result
diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/profile/BatchProfileByUsername.java b/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/profile/BatchProfileByUsername.java
new file mode 100644
index 00000000..d18c3d05
--- /dev/null
+++ b/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/profile/BatchProfileByUsername.java
@@ -0,0 +1,41 @@
+package ru.gravit.launchserver.socket.websocket.json.profile;
+
+import io.netty.channel.ChannelHandlerContext;
+import ru.gravit.launcher.profiles.PlayerProfile;
+import ru.gravit.launchserver.LaunchServer;
+import ru.gravit.launchserver.socket.Client;
+import ru.gravit.launchserver.socket.websocket.WebSocketService;
+import ru.gravit.launchserver.socket.websocket.json.JsonResponseInterface;
+
+import java.util.UUID;
+
+public class BatchProfileByUsername implements JsonResponseInterface {
+    class Entry
+    {
+        String username;
+        String client;
+    }
+    Entry[] list;
+    @Override
+    public String getType() {
+        return "batchProfileByUsername";
+    }
+
+    @Override
+    public void execute(WebSocketService service, ChannelHandlerContext ctx, Client client) throws Exception {
+        Result result = new Result();
+        result.playerProfiles = new PlayerProfile[list.length];
+        for(int i=0;i<list.length;++i)
+        {
+            UUID uuid = LaunchServer.server.config.authHandler.usernameToUUID(list[i].username);
+            result.playerProfiles[i] = ProfileByUUIDResponse.getProfile(LaunchServer.server,uuid,list[i].username,list[i].client);
+        }
+        service.sendObject(ctx, result);
+    }
+    public class Result
+    {
+        String requesttype = "batchProfileByUsername";
+        String error;
+        PlayerProfile[] playerProfiles;
+    }
+}
diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/profile/ProfileByUUIDResponse.java b/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/profile/ProfileByUUIDResponse.java
new file mode 100644
index 00000000..b7107040
--- /dev/null
+++ b/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/profile/ProfileByUUIDResponse.java
@@ -0,0 +1,62 @@
+package ru.gravit.launchserver.socket.websocket.json.profile;
+
+import io.netty.channel.ChannelHandlerContext;
+import ru.gravit.launcher.profiles.PlayerProfile;
+import ru.gravit.launcher.profiles.Texture;
+import ru.gravit.launchserver.LaunchServer;
+import ru.gravit.launchserver.socket.Client;
+import ru.gravit.launchserver.socket.websocket.WebSocketService;
+import ru.gravit.launchserver.socket.websocket.json.JsonResponseInterface;
+import ru.gravit.launchserver.socket.websocket.json.auth.ProfilesResponse;
+import ru.gravit.utils.helper.LogHelper;
+
+import java.io.IOException;
+import java.util.UUID;
+
+public class ProfileByUUIDResponse implements JsonResponseInterface {
+    public UUID uuid;
+    public String client;
+    public static PlayerProfile getProfile(LaunchServer server, UUID uuid, String username, String client) {
+        // Get skin texture
+        Texture skin;
+        try {
+            skin = server.config.textureProvider.getSkinTexture(uuid, username, client);
+        } catch (IOException e) {
+            LogHelper.error(new IOException(String.format("Can't get skin texture: '%s'", username), e));
+            skin = null;
+        }
+
+        // Get cloak texture
+        Texture cloak;
+        try {
+            cloak = server.config.textureProvider.getCloakTexture(uuid, username, client);
+        } catch (IOException e) {
+            LogHelper.error(new IOException(String.format("Can't get cloak texture: '%s'", username), e));
+            cloak = null;
+        }
+
+        // Return combined profile
+        return new PlayerProfile(uuid, username, skin, cloak);
+    }
+
+    @Override
+    public String getType() {
+        return "profileByUUID";
+    }
+
+    @Override
+    public void execute(WebSocketService service, ChannelHandlerContext ctx, Client client) throws Exception {
+        String username = LaunchServer.server.config.authHandler.uuidToUsername(uuid);
+        service.sendObject(ctx, new Result(getProfile(LaunchServer.server,uuid,username,this.client)));
+    }
+    public class Result
+    {
+        String requesttype = "profileByUUID";
+        String error;
+        PlayerProfile playerProfile;
+
+        public Result(PlayerProfile playerProfile) {
+            this.playerProfile = playerProfile;
+        }
+    }
+}
diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/profile/ProfileByUsername.java b/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/profile/ProfileByUsername.java
new file mode 100644
index 00000000..ce1ee160
--- /dev/null
+++ b/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/profile/ProfileByUsername.java
@@ -0,0 +1,37 @@
+package ru.gravit.launchserver.socket.websocket.json.profile;
+
+import io.netty.channel.ChannelHandlerContext;
+import ru.gravit.launcher.profiles.PlayerProfile;
+import ru.gravit.launchserver.LaunchServer;
+import ru.gravit.launchserver.socket.Client;
+import ru.gravit.launchserver.socket.websocket.WebSocketService;
+import ru.gravit.launchserver.socket.websocket.json.JsonResponseInterface;
+
+import java.util.UUID;
+
+import static ru.gravit.launchserver.socket.websocket.json.profile.ProfileByUUIDResponse.getProfile;
+
+public class ProfileByUsername implements JsonResponseInterface {
+    String username;
+    String client;
+    @Override
+    public String getType() {
+        return "profileByUsername";
+    }
+
+    @Override
+    public void execute(WebSocketService service, ChannelHandlerContext ctx, Client client) throws Exception {
+        UUID uuid = LaunchServer.server.config.authHandler.usernameToUUID(username);
+        service.sendObject(ctx, new Result(getProfile(LaunchServer.server,uuid,username,this.client)));
+    }
+    public class Result
+    {
+        String requesttype = "profileByUsername";
+        String error;
+        PlayerProfile playerProfile;
+
+        public Result(PlayerProfile playerProfile) {
+            this.playerProfile = playerProfile;
+        }
+    }
+}