From 24707805916257c28cb3e2469bb5ec5e6aa76704 Mon Sep 17 00:00:00 2001
From: Gravita <12893402+gravit0@users.noreply.github.com>
Date: Thu, 12 Jun 2025 16:09:23 +0700
Subject: [PATCH] [FIX] minecraftAccessToken is null after restore

---
 .../socket/response/auth/CurrentUserResponse.java         | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/CurrentUserResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/CurrentUserResponse.java
index 5a54f39d..669cb663 100644
--- a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/CurrentUserResponse.java
+++ b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/CurrentUserResponse.java
@@ -3,6 +3,7 @@
 import io.netty.channel.ChannelHandlerContext;
 import pro.gravit.launcher.base.events.request.CurrentUserRequestEvent;
 import pro.gravit.launchserver.LaunchServer;
+import pro.gravit.launchserver.auth.core.UserSession;
 import pro.gravit.launchserver.socket.Client;
 import pro.gravit.launchserver.socket.response.SimpleResponse;
 
@@ -12,6 +13,13 @@ public static CurrentUserRequestEvent.UserInfo collectUserInfoFromClient(LaunchS
         CurrentUserRequestEvent.UserInfo result = new CurrentUserRequestEvent.UserInfo();
         if (client.auth != null && client.isAuth && client.username != null) {
             result.playerProfile = server.authManager.getPlayerProfile(client);
+            if(server.config.protectHandler.allowGetAccessToken(new AuthResponse.AuthContext(client, client.username,
+                    null, null, client.type, client.auth))) {
+                UserSession session = client.sessionObject;
+                if(session != null) {
+                    result.accessToken = session.getMinecraftAccessToken();
+                }
+            }
         }
         result.permissions = client.permissions;
         return result;