Merge branch 'master' of https://github.com/MachDatum/ThingConnect.Pulse into history

Author: abishekve

.claude/settings.local.json

@@ -7,7 +7,10 @@
       "Bash(curl:*)",
       "Bash(taskkill:*)",
       "mcp__chakra-ui",
-      "mcp__serena"
+      "mcp__serena",
+      "Bash(sqlite3:*)",
+      "Bash(dir:*)",
+      "Bash(timeout:*)"
     ],
     "deny": [],
     "ask": []

ThingConnect.Pulse.Server/Controllers/AuthController.cs

@@ -32,7 +32,7 @@ public async Task<ActionResult<UserInfoDto>> LoginAsync([FromBody] LoginRequestD
     {
         try
         {
-            var user = await _userManager.FindByNameAsync(request.Username);
+            ApplicationUser? user = await _userManager.FindByNameAsync(request.Username);
             if (user == null)
             {
                 _logger.LogWarning("Login attempt for non-existent user: {Username}", request.Username);
@@ -45,16 +45,16 @@ public async Task<ActionResult<UserInfoDto>> LoginAsync([FromBody] LoginRequestD
                 return Unauthorized(new { message = "Account is inactive" });
             }
 
-            var result = await _signInManager.PasswordSignInAsync(user, request.Password, isPersistent: true, lockoutOnFailure: true);
-            
+            Microsoft.AspNetCore.Identity.SignInResult result = await _signInManager.PasswordSignInAsync(user, request.Password, isPersistent: true, lockoutOnFailure: true);
+
             if (!result.Succeeded)
             {
                 if (result.IsLockedOut)
                 {
                     _logger.LogWarning("Account locked out for user: {Username}", request.Username);
                     return Unauthorized(new { message = "Account is locked due to multiple failed login attempts" });
                 }
-                
+
                 _logger.LogWarning("Invalid login attempt for user: {Username}", request.Username);
                 return Unauthorized(new { message = "Invalid username or password" });
             }
@@ -92,7 +92,7 @@ public async Task<ActionResult<UserInfoDto>> RegisterAsync([FromBody] RegisterRe
         try
         {
             // Only allow registration if no users exist (initial admin setup)
-            var userCount = _userManager.Users.Count();
+            int userCount = _userManager.Users.Count();
             if (userCount > 0)
             {
                 _logger.LogWarning("Registration attempt when users already exist");
@@ -109,7 +109,7 @@ public async Task<ActionResult<UserInfoDto>> RegisterAsync([FromBody] RegisterRe
                 IsActive = true
             };
 
-            var result = await _userManager.CreateAsync(user, request.Password);
+            IdentityResult result = await _userManager.CreateAsync(user, request.Password);
 
             if (!result.Succeeded)
             {
@@ -146,7 +146,7 @@ public ActionResult<bool> IsSetupRequired()
     {
         try
         {
-            var userCount = _userManager.Users.Count();
+            int userCount = _userManager.Users.Count();
             return Ok(userCount == 0);
         }
         catch (Exception ex)
@@ -165,7 +165,7 @@ public async Task<ActionResult<UserInfoDto>> GetSessionAsync()
     {
         try
         {
-            var user = await _userManager.GetUserAsync(User);
+            ApplicationUser? user = await _userManager.GetUserAsync(User);
             if (user == null || !user.IsActive)
             {
                 return Unauthorized(new { message = "Session invalid or user inactive" });
@@ -198,13 +198,13 @@ public async Task<IActionResult> ChangePasswordAsync([FromBody] ChangePasswordDt
     {
         try
         {
-            var user = await _userManager.GetUserAsync(User);
+            ApplicationUser? user = await _userManager.GetUserAsync(User);
             if (user == null || !user.IsActive)
             {
                 return Unauthorized(new { message = "Session invalid or user inactive" });
             }
 
-            var result = await _userManager.ChangePasswordAsync(user, request.CurrentPassword, request.NewPassword);
+            IdentityResult result = await _userManager.ChangePasswordAsync(user, request.CurrentPassword, request.NewPassword);
             if (!result.Succeeded)
             {
                 var errors = result.Errors.Select(e => e.Description).ToList();
@@ -234,14 +234,14 @@ public async Task<IActionResult> LogoutAsync()
     {
         try
         {
-            var user = await _userManager.GetUserAsync(User);
+            ApplicationUser? user = await _userManager.GetUserAsync(User);
             await _signInManager.SignOutAsync();
-            
+
             if (user != null)
             {
                 _logger.LogInformation("User {Username} (ID: {UserId}) logged out", user.UserName, user.Id);
             }
-            
+
             return Ok(new { message = "Logged out successfully" });
         }
         catch (Exception ex)

ThingConnect.Pulse.Server/Controllers/ConfigurationController.cs

@@ -28,7 +28,7 @@ public async Task<ActionResult<ApplyResultDto>> ApplyAsync([FromQuery] bool dryR
     {
         try
         {
-            using StreamReader reader = new StreamReader(Request.Body);
+            using var reader = new StreamReader(Request.Body);
             string yamlContent = await reader.ReadToEndAsync();
 
             if (string.IsNullOrWhiteSpace(yamlContent))

ThingConnect.Pulse.Server/Controllers/UserManagementController.cs

@@ -39,14 +39,14 @@ public async Task<ActionResult<PagedResult<UserInfoDto>>> GetUsersAsync(
             if (page < 1) page = 1;
             if (pageSize < 1 || pageSize > 100) pageSize = 20;
 
-            var query = _userManager.Users.AsQueryable();
+            IQueryable<ApplicationUser> query = _userManager.Users.AsQueryable();
 
             // Apply filters
             if (!string.IsNullOrWhiteSpace(search))
             {
-                var searchLower = search.ToLower();
-                query = query.Where(u => 
-                    u.UserName!.ToLower().Contains(searchLower) || 
+                string searchLower = search.ToLower();
+                query = query.Where(u =>
+                    u.UserName!.ToLower().Contains(searchLower) ||
                     u.Email!.ToLower().Contains(searchLower));
             }
 
@@ -60,9 +60,9 @@ public async Task<ActionResult<PagedResult<UserInfoDto>>> GetUsersAsync(
                 query = query.Where(u => u.IsActive == isActive.Value);
             }
 
-            var totalCount = await query.CountAsync();
-            
-            var users = await query
+            int totalCount = await query.CountAsync();
+
+            List<UserInfoDto> users = await query
                 .OrderBy(u => u.UserName)
                 .Skip((page - 1) * pageSize)
                 .Take(pageSize)
@@ -104,7 +104,7 @@ public async Task<ActionResult<UserInfoDto>> GetUserByIdAsync(string id)
     {
         try
         {
-            var user = await _userManager.FindByIdAsync(id);
+            ApplicationUser? user = await _userManager.FindByIdAsync(id);
             if (user == null)
             {
                 return NotFound(new { message = "User not found" });
@@ -143,7 +143,7 @@ public async Task<ActionResult<UserInfoDto>> CreateUserAsync([FromBody] CreateUs
             }
 
             // Check if username or email already exists
-            var existingUser = await _userManager.FindByNameAsync(request.Username);
+            ApplicationUser? existingUser = await _userManager.FindByNameAsync(request.Username);
             if (existingUser != null)
             {
                 return BadRequest(new { message = "Username already exists" });
@@ -165,16 +165,16 @@ public async Task<ActionResult<UserInfoDto>> CreateUserAsync([FromBody] CreateUs
                 IsActive = true
             };
 
-            var result = await _userManager.CreateAsync(user, request.Password);
+            IdentityResult result = await _userManager.CreateAsync(user, request.Password);
             if (!result.Succeeded)
             {
                 var errors = result.Errors.Select(e => e.Description).ToList();
                 _logger.LogWarning("User creation failed for {Username}: {Errors}", request.Username, string.Join(", ", errors));
                 return BadRequest(new { message = "User creation failed", errors });
             }
 
-            var currentUser = await _userManager.GetUserAsync(User);
-            _logger.LogInformation("User created: {Username} (ID: {UserId}) by admin {AdminId}", 
+            ApplicationUser? currentUser = await _userManager.GetUserAsync(User);
+            _logger.LogInformation("User created: {Username} (ID: {UserId}) by admin {AdminId}",
                 user.UserName, user.Id, currentUser?.Id);
 
             return CreatedAtAction(nameof(GetUserByIdAsync), new { id = user.Id }, new UserInfoDto
@@ -203,14 +203,14 @@ public async Task<ActionResult<UserInfoDto>> UpdateUserAsync(string id, [FromBod
     {
         try
         {
-            var user = await _userManager.FindByIdAsync(id);
+            ApplicationUser? user = await _userManager.FindByIdAsync(id);
             if (user == null)
             {
                 return NotFound(new { message = "User not found" });
             }
 
             // Prevent admin from deactivating themselves
-            var currentUser = await _userManager.GetUserAsync(User);
+            ApplicationUser? currentUser = await _userManager.GetUserAsync(User);
             if (currentUser != null && id == currentUser.Id && request.IsActive == false)
             {
                 return BadRequest(new { message = "Cannot deactivate your own account" });
@@ -221,25 +221,25 @@ public async Task<ActionResult<UserInfoDto>> UpdateUserAsync(string id, [FromBod
             if (!string.IsNullOrWhiteSpace(request.Username) && request.Username != user.UserName)
             {
                 // Check if new username already exists
-                var existingUser = await _userManager.FindByNameAsync(request.Username);
+                ApplicationUser? existingUser = await _userManager.FindByNameAsync(request.Username);
                 if (existingUser != null && existingUser.Id != id)
                 {
                     return BadRequest(new { message = "Username already exists" });
                 }
-                
+
                 changes.Add($"Username: {user.UserName} -> {request.Username}");
                 user.UserName = request.Username;
             }
 
             if (!string.IsNullOrWhiteSpace(request.Email) && request.Email != user.Email)
             {
                 // Check if new email already exists
-                var existingUser = await _userManager.FindByEmailAsync(request.Email);
+                ApplicationUser? existingUser = await _userManager.FindByEmailAsync(request.Email);
                 if (existingUser != null && existingUser.Id != id)
                 {
                     return BadRequest(new { message = "Email already exists" });
                 }
-                
+
                 changes.Add($"Email: {user.Email} -> {request.Email}");
                 user.Email = request.Email;
             }
@@ -253,16 +253,16 @@ public async Task<ActionResult<UserInfoDto>> UpdateUserAsync(string id, [FromBod
             if (changes.Any())
             {
                 user.UpdatedAt = DateTimeOffset.UtcNow;
-                var result = await _userManager.UpdateAsync(user);
-                
+                IdentityResult result = await _userManager.UpdateAsync(user);
+
                 if (!result.Succeeded)
                 {
                     var errors = result.Errors.Select(e => e.Description).ToList();
                     _logger.LogWarning("User update failed for {UserId}: {Errors}", id, string.Join(", ", errors));
                     return BadRequest(new { message = "User update failed", errors });
                 }
 
-                _logger.LogInformation("User {UserId} updated by admin {AdminId}. Changes: {Changes}", 
+                _logger.LogInformation("User {UserId} updated by admin {AdminId}. Changes: {Changes}",
                     id, currentUser?.Id, string.Join("; ", changes));
             }
 
@@ -297,36 +297,36 @@ public async Task<ActionResult<UserInfoDto>> ChangeUserRoleAsync(string id, [Fro
                 return BadRequest(new { message = $"Invalid role. Allowed roles: {string.Join(", ", UserRoles.AllRoles)}" });
             }
 
-            var user = await _userManager.FindByIdAsync(id);
+            ApplicationUser? user = await _userManager.FindByIdAsync(id);
             if (user == null)
             {
                 return NotFound(new { message = "User not found" });
             }
 
             // Prevent admin from changing their own role if they're the only admin
-            var currentUser = await _userManager.GetUserAsync(User);
+            ApplicationUser? currentUser = await _userManager.GetUserAsync(User);
             if (currentUser != null && id == currentUser.Id && user.Role == UserRoles.Administrator && request.Role != UserRoles.Administrator)
             {
-                var adminCount = await _userManager.Users.CountAsync(u => u.Role == UserRoles.Administrator && u.IsActive);
+                int adminCount = await _userManager.Users.CountAsync(u => u.Role == UserRoles.Administrator && u.IsActive);
                 if (adminCount <= 1)
                 {
                     return BadRequest(new { message = "Cannot change role - you are the only active administrator" });
                 }
             }
 
-            var oldRole = user.Role;
+            string oldRole = user.Role;
             user.Role = request.Role;
             user.UpdatedAt = DateTimeOffset.UtcNow;
 
-            var result = await _userManager.UpdateAsync(user);
+            IdentityResult result = await _userManager.UpdateAsync(user);
             if (!result.Succeeded)
             {
                 var errors = result.Errors.Select(e => e.Description).ToList();
                 _logger.LogWarning("Role change failed for user {UserId}: {Errors}", id, string.Join(", ", errors));
                 return BadRequest(new { message = "Role change failed", errors });
             }
 
-            _logger.LogInformation("User {UserId} role changed from {OldRole} to {NewRole} by admin {AdminId}", 
+            _logger.LogInformation("User {UserId} role changed from {OldRole} to {NewRole} by admin {AdminId}",
                 id, oldRole, request.Role, currentUser?.Id);
 
             return Ok(new UserInfoDto
@@ -355,16 +355,16 @@ public async Task<IActionResult> ResetPasswordAsync(string id, [FromBody] ResetP
     {
         try
         {
-            var user = await _userManager.FindByIdAsync(id);
+            ApplicationUser? user = await _userManager.FindByIdAsync(id);
             if (user == null)
             {
                 return NotFound(new { message = "User not found" });
             }
 
             // Remove current password and set new one
-            var token = await _userManager.GeneratePasswordResetTokenAsync(user);
-            var result = await _userManager.ResetPasswordAsync(user, token, request.NewPassword);
-            
+            string token = await _userManager.GeneratePasswordResetTokenAsync(user);
+            IdentityResult result = await _userManager.ResetPasswordAsync(user, token, request.NewPassword);
+
             if (!result.Succeeded)
             {
                 var errors = result.Errors.Select(e => e.Description).ToList();
@@ -375,8 +375,8 @@ public async Task<IActionResult> ResetPasswordAsync(string id, [FromBody] ResetP
             user.UpdatedAt = DateTimeOffset.UtcNow;
             await _userManager.UpdateAsync(user);
 
-            var currentUser = await _userManager.GetUserAsync(User);
-            _logger.LogInformation("Password reset for user {UserId} by admin {AdminId}", 
+            ApplicationUser? currentUser = await _userManager.GetUserAsync(User);
+            _logger.LogInformation("Password reset for user {UserId} by admin {AdminId}",
                 id, currentUser?.Id);
 
             return Ok(new { message = "Password reset successfully" });
@@ -396,14 +396,14 @@ public async Task<IActionResult> DeleteUserAsync(string id)
     {
         try
         {
-            var user = await _userManager.FindByIdAsync(id);
+            ApplicationUser? user = await _userManager.FindByIdAsync(id);
             if (user == null)
             {
                 return NotFound(new { message = "User not found" });
             }
 
             // Prevent admin from deleting themselves
-            var currentUser = await _userManager.GetUserAsync(User);
+            ApplicationUser? currentUser = await _userManager.GetUserAsync(User);
             if (currentUser != null && id == currentUser.Id)
             {
                 return BadRequest(new { message = "Cannot delete your own account" });
@@ -412,7 +412,7 @@ public async Task<IActionResult> DeleteUserAsync(string id)
             // Check if this is the only active admin
             if (user.Role == UserRoles.Administrator && user.IsActive)
             {
-                var adminCount = await _userManager.Users.CountAsync(u => u.Role == UserRoles.Administrator && u.IsActive);
+                int adminCount = await _userManager.Users.CountAsync(u => u.Role == UserRoles.Administrator && u.IsActive);
                 if (adminCount <= 1)
                 {
                     return BadRequest(new { message = "Cannot delete the only active administrator" });
@@ -423,15 +423,15 @@ public async Task<IActionResult> DeleteUserAsync(string id)
             user.IsActive = false;
             user.UpdatedAt = DateTimeOffset.UtcNow;
 
-            var result = await _userManager.UpdateAsync(user);
+            IdentityResult result = await _userManager.UpdateAsync(user);
             if (!result.Succeeded)
             {
                 var errors = result.Errors.Select(e => e.Description).ToList();
                 _logger.LogWarning("User deletion failed for {UserId}: {Errors}", id, string.Join(", ", errors));
                 return BadRequest(new { message = "User deletion failed", errors });
             }
 
-            _logger.LogInformation("User {UserId} ({Username}) deactivated by admin {AdminId}", 
+            _logger.LogInformation("User {UserId} ({Username}) deactivated by admin {AdminId}",
                 id, user.UserName, currentUser?.Id);
 
             return Ok(new { message = "User deactivated successfully" });

ThingConnect.Pulse.Server/Data/ApplicationUser.cs

@@ -15,6 +15,6 @@ public static class UserRoles
 {
     public const string Administrator = "Administrator";
     public const string User = "User";
-    
+
     public static readonly string[] AllRoles = { Administrator, User };
 }