diff --git a/ProjectLighthouse.Servers.GameServer/Controllers/CommentController.cs b/ProjectLighthouse.Servers.GameServer/Controllers/CommentController.cs index 22ce63d5..d1886d7f 100644 --- a/ProjectLighthouse.Servers.GameServer/Controllers/CommentController.cs +++ b/ProjectLighthouse.Servers.GameServer/Controllers/CommentController.cs @@ -32,8 +32,6 @@ public class CommentController : ControllerBase public async Task RateComment([FromQuery] int commentId, [FromQuery] int rating, string? username, string? slotType, int slotId) { GameTokenEntity token = this.GetToken(); - UserEntity? user = await this.database.UserFromGameToken(token); - if (user == null) return this.Unauthorized(); // Return bad request if both are true or both are false if ((slotId == 0 || SlotHelper.IsTypeInvalid(slotType)) == (username == null)) return this.BadRequest(); @@ -49,8 +47,9 @@ public class CommentController : ControllerBase public async Task GetComments(string? username, string? slotType, int slotId) { GameTokenEntity token = this.GetToken(); - UserEntity? user = await this.database.UserFromGameToken(token); - if (user == null) return this.Unauthorized(); + + UserEntity? user = await this.database.UserFromGameToken(token); + if (user == null) return this.Forbid(); if ((slotId == 0 || SlotHelper.IsTypeInvalid(slotType)) == (username == null)) return this.BadRequest(); @@ -116,8 +115,6 @@ public class CommentController : ControllerBase public async Task PostComment(string? username, string? slotType, int slotId) { GameTokenEntity token = this.GetToken(); - UserEntity? user = await this.database.UserFromGameToken(token); - if (user == null) return this.Unauthorized(); // Deny request if in read-only mode if (ServerConfiguration.Instance.UserGeneratedContentLimits.ReadOnlyMode) return this.BadRequest(); diff --git a/ProjectLighthouse.Servers.GameServer/Controllers/Matching/EnterLevelController.cs b/ProjectLighthouse.Servers.GameServer/Controllers/Matching/EnterLevelController.cs index aeebd756..428580b8 100644 --- a/ProjectLighthouse.Servers.GameServer/Controllers/Matching/EnterLevelController.cs +++ b/ProjectLighthouse.Servers.GameServer/Controllers/Matching/EnterLevelController.cs @@ -31,9 +31,6 @@ public class EnterLevelController : ControllerBase { GameTokenEntity token = this.GetToken(); - UserEntity? user = await this.database.UserFromGameToken(token); - if (user == null) return this.Unauthorized(); - if (SlotHelper.IsTypeInvalid(slotType)) return this.BadRequest(); // don't count plays for developer slots diff --git a/ProjectLighthouse.Servers.GameServer/Controllers/Matching/MatchController.cs b/ProjectLighthouse.Servers.GameServer/Controllers/Matching/MatchController.cs index fe210efd..ffba0d6a 100644 --- a/ProjectLighthouse.Servers.GameServer/Controllers/Matching/MatchController.cs +++ b/ProjectLighthouse.Servers.GameServer/Controllers/Matching/MatchController.cs @@ -39,6 +39,7 @@ public class MatchController : ControllerBase public async Task Match() { GameTokenEntity token = this.GetToken(); + UserEntity? user = await this.database.UserFromGameToken(token); if (user == null) return this.Unauthorized(); diff --git a/ProjectLighthouse.Servers.GameServer/Controllers/Resources/PhotosController.cs b/ProjectLighthouse.Servers.GameServer/Controllers/Resources/PhotosController.cs index 2acc3dcb..4b13f252 100644 --- a/ProjectLighthouse.Servers.GameServer/Controllers/Resources/PhotosController.cs +++ b/ProjectLighthouse.Servers.GameServer/Controllers/Resources/PhotosController.cs @@ -36,8 +36,6 @@ public class PhotosController : ControllerBase public async Task UploadPhoto() { GameTokenEntity token = this.GetToken(); - UserEntity? user = await this.database.UserFromGameToken(token); - if (user == null) return this.Unauthorized(); // Deny request if in read-only mode if (ServerConfiguration.Instance.UserGeneratedContentLimits.ReadOnlyMode) return this.BadRequest(); diff --git a/ProjectLighthouse.Servers.GameServer/Controllers/Slots/CategoryController.cs b/ProjectLighthouse.Servers.GameServer/Controllers/Slots/CategoryController.cs index 60ac1c58..214bc82f 100644 --- a/ProjectLighthouse.Servers.GameServer/Controllers/Slots/CategoryController.cs +++ b/ProjectLighthouse.Servers.GameServer/Controllers/Slots/CategoryController.cs @@ -38,9 +38,6 @@ public class CategoryController : ControllerBase { GameTokenEntity token = this.GetToken(); - UserEntity? user = await this.database.UserFromGameToken(token); - if (user == null) return this.Forbid(); - PaginationData pageData = this.Request.GetPaginationData(); pageData.TotalElements = CategoryHelper.Categories.Count(c => !string.IsNullOrWhiteSpace(c.Name)); @@ -72,9 +69,6 @@ public class CategoryController : ControllerBase { GameTokenEntity token = this.GetToken(); - UserEntity? user = await this.database.UserFromGameToken(token); - if (user == null) return this.Forbid(); - Category? category = CategoryHelper.Categories.FirstOrDefault(c => c.Endpoint == endpointName); if (category == null) return this.NotFound(); diff --git a/ProjectLighthouse.Servers.GameServer/Controllers/Slots/PublishController.cs b/ProjectLighthouse.Servers.GameServer/Controllers/Slots/PublishController.cs index dfb42c71..aee40fa8 100644 --- a/ProjectLighthouse.Servers.GameServer/Controllers/Slots/PublishController.cs +++ b/ProjectLighthouse.Servers.GameServer/Controllers/Slots/PublishController.cs @@ -40,7 +40,7 @@ public class PublishController : ControllerBase public async Task StartPublish() { GameTokenEntity token = this.GetToken(); - + UserEntity? user = await this.database.UserFromGameToken(token); if (user == null) return this.Forbid(); diff --git a/ProjectLighthouse.Servers.GameServer/Controllers/UserController.cs b/ProjectLighthouse.Servers.GameServer/Controllers/UserController.cs index 6c832f63..2b32dc32 100644 --- a/ProjectLighthouse.Servers.GameServer/Controllers/UserController.cs +++ b/ProjectLighthouse.Servers.GameServer/Controllers/UserController.cs @@ -39,12 +39,6 @@ public class UserController : ControllerBase [HttpGet("user/{username}")] public async Task GetUser(string username) { - GameTokenEntity token = this.GetToken(); - UserEntity? user = await this.database.UserFromGameToken(token); - - // Return bad request on unverified email if enforcement is enabled - if (emailEnforcementEnabled && !token.User.EmailAddressVerified || user == null) return this.BadRequest(); - UserEntity? targetUser = await this.database.Users.FirstOrDefaultAsync(u => u.Username == username); if (targetUser == null) return this.NotFound(); @@ -74,11 +68,9 @@ public class UserController : ControllerBase public async Task UpdateUser() { GameTokenEntity token = this.GetToken(); - UserEntity? user = await this.database.UserFromGameToken(token); - if (user == null) return this.Forbid(); - // Return bad request on unverified email if enforcement is enabled - if (emailEnforcementEnabled && !user.EmailAddressVerified) return this.BadRequest(); + UserEntity? user = await this.database.UserFromGameToken(token); + if (user == null) return this.Forbid(); UserUpdate? update = await this.DeserializeBody("updateUser", "user"); @@ -186,9 +178,6 @@ public class UserController : ControllerBase UserEntity? user = await this.database.UserFromGameToken(this.GetToken()); if (user == null) return this.Forbid(); - // Return bad request on unverified email if enforcement is enabled - if (emailEnforcementEnabled && !user.EmailAddressVerified) return this.BadRequest(); - string bodyString = await this.ReadBodyAsync(); Pins? pinJson = JsonSerializer.Deserialize(bodyString);