Apply suggestions from code review

LBPUnion · May 31, 2024 · f274cf7 · f274cf7
1 parent 6941d95
commit f274cf7
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/ProjectLighthouse.Servers.Website/Controllers/Admin/AdminUserController.cs b/ProjectLighthouse.Servers.Website/Controllers/Admin/AdminUserController.cs
@@ -103,14 +103,14 @@ public async Task<IActionResult> ForceVerifyEmail([FromRoute] int id)
 
         UserEntity? targetedUser = await this.database.Users.FirstOrDefaultAsync(u => u.UserId == id);
         if (targetedUser == null) return this.NotFound();
+        if (user.EmailAddressVerified) return this.NotFound();
 
         List<EmailVerificationTokenEntity> tokens = await this.database.EmailVerificationTokens
             .Where(t => t.UserId == targetedUser.UserId)
             .ToListAsync();
-        if (tokens.Count == 0) return this.NotFound();
+        this.database.EmailVerificationTokens.RemoveRange(tokens);
 
         targetedUser.EmailAddressVerified = true;
-        this.database.EmailVerificationTokens.RemoveRange(tokens);
 
         await this.database.SaveChangesAsync();