diff --git a/Libraries/SPTarkov.Server.Core/Callbacks/LauncherV2Callbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/LauncherV2Callbacks.cs index 9a3e2505..9068f6ce 100644 --- a/Libraries/SPTarkov.Server.Core/Callbacks/LauncherV2Callbacks.cs +++ b/Libraries/SPTarkov.Server.Core/Callbacks/LauncherV2Callbacks.cs @@ -92,10 +92,10 @@ public class LauncherV2Callbacks( ); } - public ValueTask Profile(MongoId sessionId) + public ValueTask Profile(LoginRequestData sessionId) { return new ValueTask( - httpResponseUtil.NoBody(new LauncherV2ProfileResponse { Response = launcherV2Controller.GetProfile(sessionId) }) + httpResponseUtil.NoBody(new LauncherV2ProfileResponse { Response = launcherV2Controller.GetMiniProfileFromUsername(sessionId) }) ); } } diff --git a/Libraries/SPTarkov.Server.Core/Controllers/LauncherV2Controller.cs b/Libraries/SPTarkov.Server.Core/Controllers/LauncherV2Controller.cs index 793ce970..234269dc 100644 --- a/Libraries/SPTarkov.Server.Core/Controllers/LauncherV2Controller.cs +++ b/Libraries/SPTarkov.Server.Core/Controllers/LauncherV2Controller.cs @@ -19,7 +19,8 @@ public class LauncherV2Controller( DatabaseService databaseService, ServerLocalisationService serverLocalisationService, ConfigServer configServer, - Watermark watermark + Watermark watermark, + ProfileController profileController ) { protected readonly CoreConfig CoreConfig = configServer.GetConfig(); @@ -192,4 +193,9 @@ public class LauncherV2Controller( { return saveServer.GetProfile(sessionId); } + + public MiniProfile? GetMiniProfileFromUsername(LoginRequestData info) + { + return profileController.GetMiniProfile(GetSessionId(info)); + } } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2LoginResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2LoginResponse.cs index f1d5f401..acc94c72 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2LoginResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2LoginResponse.cs @@ -1,4 +1,5 @@ using System.Text.Json.Serialization; +using SPTarkov.Server.Core.Models.Eft.Launcher; using SPTarkov.Server.Core.Models.Utils; namespace SPTarkov.Server.Core.Models.Spt.Launcher; diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ProfileResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ProfileResponse.cs index 56a827ca..3fe8d86a 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ProfileResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ProfileResponse.cs @@ -1,4 +1,5 @@ using System.Text.Json.Serialization; +using SPTarkov.Server.Core.Models.Eft.Launcher; using SPTarkov.Server.Core.Models.Eft.Profile; using SPTarkov.Server.Core.Models.Utils; @@ -6,5 +7,5 @@ namespace SPTarkov.Server.Core.Models.Spt.Launcher; public class LauncherV2ProfileResponse : IRequestData { - public SptProfile Response { get; set; } + public MiniProfile Response { get; set; } } diff --git a/Libraries/SPTarkov.Server.Core/Routers/Static/LauncherV2StaticRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Static/LauncherV2StaticRouter.cs index c329f79c..ff29c2a0 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/Static/LauncherV2StaticRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/Static/LauncherV2StaticRouter.cs @@ -39,9 +39,11 @@ public class LauncherV2StaticRouter(LauncherV2Callbacks launcherV2Callbacks, Jso "/launcher/v2/profiles", async (url, _, sessionID, _) => await launcherV2Callbacks.Profiles() ), - new RouteAction( + new RouteAction( "/launcher/v2/profile", - async (url, _, sessionID, _) => await launcherV2Callbacks.Profile(sessionID) + async (url, info, sessionID, _) => await launcherV2Callbacks.Profile(info) ), ] - ) { } + ) +{ +}