From ba4e8d9c14ab5008ecac3cba199a70cb7c9e9a4b Mon Sep 17 00:00:00 2001 From: Chomp Date: Thu, 2 Oct 2025 09:56:51 +0100 Subject: [PATCH] Removed `password` from profiles Added migration to remove password property from profiles --- .../Callbacks/LauncherCallbacks.cs | 6 ----- .../Callbacks/LauncherV2Callbacks.cs | 12 --------- .../Controllers/LauncherController.cs | 17 ------------ .../Controllers/LauncherV2Controller.cs | 27 +------------------ .../Controllers/ProfileController.cs | 2 -- .../Eft/Launcher/GetMiniProfileRequestData.cs | 3 --- .../Models/Eft/Launcher/LoginRequestData.cs | 3 --- .../Models/Eft/Launcher/MiniProfile.cs | 3 --- .../Models/Eft/Profile/SptProfile.cs | 3 --- .../LauncherV2PasswordChangeResponse.cs | 12 --------- .../Routers/Static/LauncherStaticRouter.cs | 4 --- .../Routers/Static/LauncherV2StaticRouter.cs | 4 --- 12 files changed, 1 insertion(+), 95 deletions(-) delete mode 100644 Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2PasswordChangeResponse.cs diff --git a/Libraries/SPTarkov.Server.Core/Callbacks/LauncherCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/LauncherCallbacks.cs index cdc87e32..3dbb160a 100644 --- a/Libraries/SPTarkov.Server.Core/Callbacks/LauncherCallbacks.cs +++ b/Libraries/SPTarkov.Server.Core/Callbacks/LauncherCallbacks.cs @@ -45,12 +45,6 @@ public class LauncherCallbacks( return new ValueTask(string.IsNullOrEmpty(output) ? "FAILED" : "OK"); } - public ValueTask ChangePassword(string url, ChangeRequestData info, MongoId sessionID) - { - var output = launcherController.ChangePassword(info); - return new ValueTask(string.IsNullOrEmpty(output) ? "FAILED" : "OK"); - } - public ValueTask Wipe(string url, RegisterData info, MongoId sessionID) { var output = launcherController.Wipe(info); diff --git a/Libraries/SPTarkov.Server.Core/Callbacks/LauncherV2Callbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/LauncherV2Callbacks.cs index f5b8905a..cc8e7a8c 100644 --- a/Libraries/SPTarkov.Server.Core/Callbacks/LauncherV2Callbacks.cs +++ b/Libraries/SPTarkov.Server.Core/Callbacks/LauncherV2Callbacks.cs @@ -1,6 +1,5 @@ using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Controllers; -using SPTarkov.Server.Core.Models.Common; using SPTarkov.Server.Core.Models.Eft.Launcher; using SPTarkov.Server.Core.Models.Spt.Launcher; using SPTarkov.Server.Core.Utils; @@ -40,17 +39,6 @@ public class LauncherV2Callbacks( ); } - public async ValueTask PasswordChange(ChangeRequestData info) - { - return httpResponseUtil.NoBody( - new LauncherV2PasswordChangeResponse - { - Response = await launcherV2Controller.PasswordChange(info), - Profiles = profileController.GetMiniProfiles(), - } - ); - } - public ValueTask Remove(LoginRequestData info) { return new ValueTask( diff --git a/Libraries/SPTarkov.Server.Core/Controllers/LauncherController.cs b/Libraries/SPTarkov.Server.Core/Controllers/LauncherController.cs index b6ba8ab9..5b801b21 100644 --- a/Libraries/SPTarkov.Server.Core/Controllers/LauncherController.cs +++ b/Libraries/SPTarkov.Server.Core/Controllers/LauncherController.cs @@ -122,7 +122,6 @@ public class LauncherController( ScavengerId = scavId, Aid = hashUtil.GenerateAccountId(), Username = info.Username, - Password = info.Password, IsWiped = true, Edition = info.Edition, }; @@ -150,22 +149,6 @@ public class LauncherController( return sessionID; } - /// - /// - /// - /// - public string? ChangePassword(ChangeRequestData info) - { - var sessionID = Login(info); - - if (!string.IsNullOrEmpty(sessionID)) - { - saveServer.GetProfile(sessionID).ProfileInfo!.Password = info.Change; - } - - return sessionID; - } - /// /// Handle launcher requesting profile be wiped /// diff --git a/Libraries/SPTarkov.Server.Core/Controllers/LauncherV2Controller.cs b/Libraries/SPTarkov.Server.Core/Controllers/LauncherV2Controller.cs index 234269dc..323abf49 100644 --- a/Libraries/SPTarkov.Server.Core/Controllers/LauncherV2Controller.cs +++ b/Libraries/SPTarkov.Server.Core/Controllers/LauncherV2Controller.cs @@ -83,30 +83,6 @@ public class LauncherV2Controller( return true; } - /// - /// Make a password change. - /// - /// - /// - public async Task PasswordChange(ChangeRequestData info) - { - var sessionId = GetSessionId(info); - - if (sessionId.IsEmpty) - { - return false; - } - - if (!Login(info)) - { - return false; - } - - saveServer.GetProfile(sessionId).ProfileInfo!.Password = info.Change; - await saveServer.SaveProfileAsync(sessionId); - return true; - } - /// /// Remove profile from server. /// @@ -163,7 +139,6 @@ public class LauncherV2Controller( ScavengerId = scavId, Aid = hashUtil.GenerateAccountId(), Username = info.Username, - Password = info.Password, IsWiped = true, Edition = info.Edition, }; @@ -180,7 +155,7 @@ public class LauncherV2Controller( { foreach (var (sessionId, profile) in saveServer.GetProfiles()) { - if (info.Username == profile.ProfileInfo!.Username && info.Password == profile.ProfileInfo.Password) + if (info.Username == profile.ProfileInfo!.Username) { return sessionId; } diff --git a/Libraries/SPTarkov.Server.Core/Controllers/ProfileController.cs b/Libraries/SPTarkov.Server.Core/Controllers/ProfileController.cs index c6b16e0a..45db29c5 100644 --- a/Libraries/SPTarkov.Server.Core/Controllers/ProfileController.cs +++ b/Libraries/SPTarkov.Server.Core/Controllers/ProfileController.cs @@ -59,7 +59,6 @@ public class ProfileController( { Username = profile.ProfileInfo?.Username ?? string.Empty, Nickname = "unknown", - HasPassword = profile.ProfileInfo?.Password != string.Empty, Side = "unknown", CurrentLevel = 0, CurrentExperience = 0, @@ -77,7 +76,6 @@ public class ProfileController( { Username = profile.ProfileInfo?.Username, Nickname = pmc.Info.Nickname, - HasPassword = profile.ProfileInfo?.Password != "", Side = pmc.Info.Side, CurrentLevel = pmc.Info.Level, CurrentExperience = pmc.Info.Experience ?? 0, diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/GetMiniProfileRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/GetMiniProfileRequestData.cs index 1e06c564..05a69a3c 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/GetMiniProfileRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/GetMiniProfileRequestData.cs @@ -7,7 +7,4 @@ public record GetMiniProfileRequestData : IRequestData { [JsonPropertyName("username")] public string? Username { get; set; } - - [JsonPropertyName("password")] - public string? Password { get; set; } } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/LoginRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/LoginRequestData.cs index fe80f328..7b0ab2e6 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/LoginRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/LoginRequestData.cs @@ -7,7 +7,4 @@ public record LoginRequestData : IRequestData { [JsonPropertyName("username")] public string? Username { get; set; } - - [JsonPropertyName("password")] - public string? Password { get; set; } } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/MiniProfile.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/MiniProfile.cs index ca8ed25c..710f36a8 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/MiniProfile.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/MiniProfile.cs @@ -39,7 +39,4 @@ public record MiniProfile [JsonPropertyName("sptData")] public Profile.Spt? SptData { get; set; } - - [JsonPropertyName("hasPassword")] - public bool? HasPassword { get; set; } } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SptProfile.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SptProfile.cs index fd0d3064..49385878 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SptProfile.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SptProfile.cs @@ -93,9 +93,6 @@ public record Info [JsonPropertyName("username")] public string? Username { get; set; } - [JsonPropertyName("password")] - public string? Password { get; set; } - [JsonPropertyName("wipe")] public bool? IsWiped { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2PasswordChangeResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2PasswordChangeResponse.cs deleted file mode 100644 index 9f3b9c63..00000000 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2PasswordChangeResponse.cs +++ /dev/null @@ -1,12 +0,0 @@ -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; - -public class LauncherV2PasswordChangeResponse : IRequestData -{ - public required bool Response { get; set; } - - public required List Profiles { get; set; } -} diff --git a/Libraries/SPTarkov.Server.Core/Routers/Static/LauncherStaticRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Static/LauncherStaticRouter.cs index 6af44faf..435ca39a 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/Static/LauncherStaticRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/Static/LauncherStaticRouter.cs @@ -33,10 +33,6 @@ public class LauncherStaticRouter(LauncherCallbacks launcherCallbacks, JsonUtil "/launcher/profile/change/username", async (url, info, sessionID, _) => await launcherCallbacks.ChangeUsername(url, info, sessionID) ), - new RouteAction( - "/launcher/profile/change/password", - async (url, info, sessionID, _) => await launcherCallbacks.ChangePassword(url, info, sessionID) - ), new RouteAction( "/launcher/profile/change/wipe", async (url, info, sessionID, _) => await launcherCallbacks.Wipe(url, info, sessionID) diff --git a/Libraries/SPTarkov.Server.Core/Routers/Static/LauncherV2StaticRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Static/LauncherV2StaticRouter.cs index 79387f71..3dd14da9 100644 --- a/Libraries/SPTarkov.Server.Core/Routers/Static/LauncherV2StaticRouter.cs +++ b/Libraries/SPTarkov.Server.Core/Routers/Static/LauncherV2StaticRouter.cs @@ -22,10 +22,6 @@ public class LauncherV2StaticRouter(LauncherV2Callbacks launcherV2Callbacks, Jso "/launcher/v2/register", async (url, info, sessionID, _) => await launcherV2Callbacks.Register(info) ), - new RouteAction( - "/launcher/v2/passwordChange", - async (url, info, sessionID, _) => await launcherV2Callbacks.PasswordChange(info) - ), new RouteAction( "/launcher/v2/remove", async (url, info, sessionID, _) => await launcherV2Callbacks.Remove(info)