From a322a32b389ba0ff6f38ab9151aa6da58dc7f976 Mon Sep 17 00:00:00 2001 From: FeTetra Date: Sun, 26 Jan 2025 20:40:42 -0500 Subject: [PATCH] Commit of shame --- .../Controllers/UserController.cs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/ProjectLighthouse.Servers.GameServer/Controllers/UserController.cs b/ProjectLighthouse.Servers.GameServer/Controllers/UserController.cs index c2675d13..ee537228 100644 --- a/ProjectLighthouse.Servers.GameServer/Controllers/UserController.cs +++ b/ProjectLighthouse.Servers.GameServer/Controllers/UserController.cs @@ -39,14 +39,16 @@ public class UserController : ControllerBase [HttpGet("user/{username}")] public async Task GetUser(string username) { - // Return bad request on unverified email if enforcement is enabled GameTokenEntity token = this.GetToken(); - if (emailEnforcementEnabled && !token.User.EmailAddressVerified) return this.BadRequest(); + UserEntity? user = await this.database.UserFromGameToken(token); - UserEntity? user = await this.database.Users.FirstOrDefaultAsync(u => u.Username == username); - if (user == null) return this.NotFound(); + // Return bad request on unverified email if enforcement is enabled + if (emailEnforcementEnabled && !token.User.EmailAddressVerified || user == null) return this.BadRequest(); - return this.Ok(GameUser.CreateFromEntity(user, this.GetToken().GameVersion)); + UserEntity? targetUser = await this.database.Users.FirstOrDefaultAsync(u => u.Username == username); + if (targetUser == null) return this.NotFound(); + + return this.Ok(GameUser.CreateFromEntity(targetUser, this.GetToken().GameVersion)); } [HttpGet("users")]