Admin Tab Updates Completed. Permission Enforcement Next

Author: Matthew Bate

BHD-ServerManager/API/Controllers/AdminController.cs

@@ -0,0 +1,49 @@
+using BHD_ServerManager.Classes.InstanceManagers;
+using HawkSyncShared;
+using HawkSyncShared.DTOs;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+
+namespace BHD_ServerManager.API.Controllers;
+
+[ApiController]
+[Route("api/[controller]")]
+[Authorize]
+public class AdminController : ControllerBase
+{
+    [HttpPost("create")]
+    public ActionResult<AdminCommandResult> CreateUser([FromBody] CreateUserRequest request)
+    {
+        var result = adminInstanceManager.CreateUser(request);
+        CommonCore.instanceAdmin!.ForceUIUpdate = true;
+        return Ok(new AdminCommandResult
+        {
+            Success = result.Success,
+            Message = result.Message
+        });
+    }
+
+    [HttpPost("update")]
+    public ActionResult<AdminCommandResult> UpdateUser([FromBody] UpdateUserRequest request)
+    {
+        var result = adminInstanceManager.UpdateUser(request);
+        CommonCore.instanceAdmin!.ForceUIUpdate = true;
+        return Ok(new AdminCommandResult
+        {
+            Success = result.Success,
+            Message = result.Message
+        });
+    }
+
+    [HttpPost("delete")]
+    public ActionResult<AdminCommandResult> DeleteUser([FromBody] DeleteUserRequest request)
+    {
+        var result = adminInstanceManager.DeleteUser(request.UserID);
+        CommonCore.instanceAdmin!.ForceUIUpdate = true;
+        return Ok(new AdminCommandResult
+        {
+            Success = result.Success,
+            Message = result.Message
+        });
+    }
+}

BHD-ServerManager/API/Controllers/PlayerController.cs

@@ -87,7 +87,7 @@ public async Task<ActionResult<CommandResult>> BanPlayer([FromBody] BanPlayerCom
         // if BanIP is false
         if (!banIP && (playerName == string.Empty || playerName == null))
         {
-            result = playerInstanceManager.BanPlayerByName(playerName, playerSlot);
+            result = playerInstanceManager.BanPlayerByName(playerName!, playerSlot);
             return Ok(new CommandResult
             {
                 Success = result.Success,
@@ -98,9 +98,9 @@ public async Task<ActionResult<CommandResult>> BanPlayer([FromBody] BanPlayerCom
         // if playerName is empty or null and BanIP is true
         if (banIP && (playerName == string.Empty || playerName == null))
         {
-            if (IPAddress.TryParse(playerIP, out IPAddress ipAddress))
+            if (IPAddress.TryParse(playerIP, out IPAddress? ipAddress))
             {
-                result = await playerInstanceManager.BanPlayerByIPAsync(ipAddress, playerName, playerSlot);
+                result = await playerInstanceManager.BanPlayerByIPAsync(ipAddress, playerName!, playerSlot);
             }
             else
             {
@@ -120,7 +120,7 @@ public async Task<ActionResult<CommandResult>> BanPlayer([FromBody] BanPlayerCom
         // BanIP is true and playerName is not empty or null
         if(banIP && !(playerName == string.Empty || playerName == null))
         {
-            if (IPAddress.TryParse(playerIP, out IPAddress ipAddress))
+            if (IPAddress.TryParse(playerIP, out IPAddress? ipAddress))
             {
                 result = await playerInstanceManager.BanPlayerByBothAsync(playerName, ipAddress, playerSlot);
             }

BHD-ServerManager/API/Controllers/SnapshotController.cs

@@ -24,7 +24,8 @@ public ActionResult<ServerSnapshot> GetSnapshot()
             CommonCore.instancePlayers ?? new(),
             CommonCore.instanceChat ?? new(),
             CommonCore.instanceBans ?? new(),
-            CommonCore.instanceMaps ?? new()
+            CommonCore.instanceMaps ?? new(),
+            CommonCore.instanceAdmin ?? new()
         );
 
         return Ok(snapshot);

BHD-ServerManager/API/Services/InstanceBroadcastService.cs

@@ -36,7 +36,8 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
                     CommonCore.instancePlayers ?? new(),
                     CommonCore.instanceChat ?? new(),
                     CommonCore.instanceBans ?? new(),
-                    CommonCore.instanceMaps ?? new()
+                    CommonCore.instanceMaps ?? new(),
+                    CommonCore.instanceAdmin ?? new()
                 );
 
                 await _hubContext.Clients.Group("ServerUpdates")

BHD-ServerManager/API/Services/InstanceMapper.cs

@@ -15,7 +15,8 @@ public static ServerSnapshot CreateSnapshot(
         playerInstance playerList,
         chatInstance chat,
         banInstance bans,
-        mapInstance maps)
+        mapInstance maps,
+        adminInstance admin)
     {
         return new ServerSnapshot
         {
@@ -24,6 +25,7 @@ public static ServerSnapshot CreateSnapshot(
             Chat = chat,
             Bans = bans,
             Maps = maps,
+            Admins = admin,
             SnapshotTime = DateTime.UtcNow
         };
     }

BHD-ServerManager/Classes/InstanceManagers/adminInstanceManager.cs

@@ -27,29 +27,6 @@ public static class adminInstanceManager
     // DATA TRANSFER OBJECTS (DTOs)
     // ================================================================================
 
-    /// <summary>
-    /// Request for creating a new user
-    /// </summary>
-    public record CreateUserRequest(
-        string Username,
-        string Password,
-        List<string> Permissions,
-        bool IsActive,
-        string Notes
-    );
-
-    /// <summary>
-    /// Request for updating an existing user
-    /// </summary>
-    public record UpdateUserRequest(
-        int UserID,
-        string Username,
-        string? NewPassword, // null = don't change password
-        List<string> Permissions,
-        bool IsActive,
-        string Notes
-    );
-
     // ================================================================================
     // CACHE MANAGEMENT
     // ================================================================================
@@ -653,13 +630,14 @@ public static OperationResult InitializeDefaultAdmin()
             }
 
             // Create default admin
-            var request = new CreateUserRequest(
-                Username: "admin",
-                Password: "admin", // User should change this immediately
-                Permissions: GetDefaultPermissionsForRole("admin"),
-                IsActive: true,
-                Notes: "Default administrator account - CHANGE PASSWORD IMMEDIATELY"
-            );
+            var request = new CreateUserRequest
+            {
+                Username = "admin",
+                Password = "admin",
+                Permissions = GetDefaultPermissionsForRole("admin"),
+                IsActive = true,
+                Notes = "Default administrator account - CHANGE PASSWORD IMMEDIATELY"
+            };
 
             var result = CreateUser(request);
 

BHD-ServerManager/Classes/Tickers/tickerServerManager.cs

@@ -83,7 +83,7 @@ public static void runTicker()
                     thisServer.PlayersTab.tickerPlayerHook();                                       // Update Players Tab
                     thisServer.ChatTab.ChatTickerHook();                                            // Update Chat Tab
                     thisServer.StatsTab.StatsTickerHook();                                          // Update Stats Tab
-                    
+                    thisServer.AdminTab.tickerAdmin_Tick();                                         // Update Admin Tab
                     thisServer.MapsTab.UpdateCurrentMapHighlighting();                              // Current Map Highlighting Update
                 });
 

BHD-ServerManager/Forms/Panels/tabAdmin.Designer.cs

@@ -4,6 +4,7 @@
 using BHD_ServerManager.Classes.SupportClasses;
 using HawkSyncShared.DTOs;
 using static BHD_ServerManager.Classes.InstanceManagers.adminInstanceManager;
+using HawkSyncShared.Instances;
 
 namespace BHD_ServerManager.Forms.Panels;
 
@@ -13,6 +14,8 @@ public partial class tabAdmin : UserControl
     // FIELDS
     // ================================================================================
 
+    private adminInstance adminInstance => CommonCore.instanceAdmin!;
+
     private int _selectedUserID = -1;
     private bool _isEditMode = false;
 
@@ -31,10 +34,31 @@ public tabAdmin()
     {
         InitializeComponent();
         InitializeEvents();
+
+        adminInstanceManager.LoadUsersCache();
         LoadUserList();
+
         SetFormMode(FormMode.View);
     }
 
+    public void tickerAdmin_Tick()
+    {
+        if(InvokeRequired)
+        {
+            Invoke(new Action(tickerAdmin_Tick));
+            return;
+        }
+
+        //Periodic tasks can be added here if needed
+        if (adminInstance.ForceUIUpdate)
+        {
+            adminInstanceManager.LoadUsersCache();
+            LoadUserList();
+            adminInstance.ForceUIUpdate = false;
+        }
+
+    }
+
     private void InitializeEvents()
     {
         // Grid events
@@ -312,13 +336,14 @@ private void CreateUser()
         }
 
         // Build request
-        var request = new CreateUserRequest(
-            Username: textBox_username.Text.Trim(),
-            Password: textBox_password.Text,
-            Permissions: GetSelectedPermissions(),
-            IsActive: checkBox_userActive.Checked,
-            Notes: textBox_userNotes.Text.Trim()
-        );
+        var request = new CreateUserRequest
+        {
+            Username = textBox_username.Text.Trim(),
+            Password = textBox_password.Text,
+            Permissions = GetSelectedPermissions(),
+            IsActive = checkBox_userActive.Checked,
+            Notes = textBox_userNotes.Text.Trim()
+        };
 
         // Call manager (cache will be auto-updated)
         var result = adminInstanceManager.CreateUser(request);
@@ -343,16 +368,17 @@ private void CreateUser()
     private void UpdateUser()
     {
         // Build request
-        var request = new UpdateUserRequest(
-            UserID: _selectedUserID,
-            Username: textBox_username.Text.Trim(),
-            NewPassword: string.IsNullOrWhiteSpace(textBox_password.Text)
+        var request = new UpdateUserRequest
+        {
+            UserID = _selectedUserID,
+            Username = textBox_username.Text.Trim(),
+            NewPassword = string.IsNullOrWhiteSpace(textBox_password.Text)
                 ? null
                 : textBox_password.Text,
-            Permissions: GetSelectedPermissions(),
-            IsActive: checkBox_userActive.Checked,
-            Notes: textBox_userNotes.Text.Trim()
-        );
+            Permissions = GetSelectedPermissions(),
+            IsActive = checkBox_userActive.Checked,
+            Notes = textBox_userNotes.Text.Trim()
+        };
 
         // Call manager (cache will be auto-updated)
         var result = adminInstanceManager.UpdateUser(request);

BHD-ServerManager/Forms/Panels/tabAdmin.cs

@@ -16,4 +16,34 @@ public record UserDTO
         public DateTime? LastLogin { get; init; }
         public string Notes { get; init; } = string.Empty;
     }
+
+    public class CreateUserRequest
+    {
+        public string Username { get; set; } = "";
+        public string Password { get; set; } = "";
+        public List<string> Permissions { get; set; } = new();
+        public bool IsActive { get; set; }
+        public string Notes { get; set; } = "";
+    }
+
+    public class UpdateUserRequest
+    {
+        public int UserID { get; set; }
+        public string Username { get; set; } = "";
+        public string? NewPassword { get; set; }
+        public List<string> Permissions { get; set; } = new();
+        public bool IsActive { get; set; }
+        public string Notes { get; set; } = "";
+    }
+
+    public class DeleteUserRequest
+    {
+        public int UserID { get; set; }
+    }
+
+    public class AdminCommandResult
+    {
+        public bool Success { get; set; }
+        public string Message { get; set; } = "";
+    }
 }