Refactor and cleanup

Author: webprofusion-chrisc

src/Certify.Models/CertificateAuthorities/CertificateAuthority.cs

@@ -110,7 +110,7 @@ public class CertificateAuthority
 
         public string? Id { get; set; }
         public string APIType { get; set; } = CertAuthorityAPIType.ACME_V2.ToString();
-        public List<string> SupportedFeatures { get; set; } = new();
+        public List<string> SupportedFeatures { get; set; } = [];
         public string Title { get; set; } = string.Empty;
         public string Description { get; set; } = string.Empty;
         public string WebsiteUrl { get; set; } = string.Empty;
@@ -132,21 +132,21 @@ public class CertificateAuthority
         public bool AllowInternalHostnames { get; set; }
         public bool SupportsCachedValidations { get; set; } = true;
         public string EabInstructions { get; set; } = string.Empty;
-        public List<string> SupportedKeyTypes { get; set; } = new();
+        public List<string> SupportedKeyTypes { get; set; } = [];
 
         /// <summary>
         /// If set, lists intermediate cert for this CA which should be disabled or removed
         /// </summary>
-        public List<string> DisabledIntermediates { get; set; } = new();
+        public List<string> DisabledIntermediates { get; set; } = [];
 
         /// <summary>
         /// Optional list of Trusted Root certificates to install for chain building and verification
         /// </summary>
-        public Dictionary<string, string> TrustedRoots { get; set; } = new();
+        public Dictionary<string, string> TrustedRoots { get; set; } = [];
 
         /// <summary>
         /// Optional list of Intermediate certificates to install for chain building and verification
         /// </summary>
-        public Dictionary<string, string> Intermediates { get; set; } = new();
+        public Dictionary<string, string> Intermediates { get; set; } = [];
     }
 }

src/Certify.Models/Hub/HubInfo.cs

@@ -6,4 +6,13 @@ public class HubInfo
 
         public VersionInfo Version { get; set; }
     }
+
+    public class HubHealth
+    {
+        public string Status { get; set; }
+        public string Detail { get; set; }
+        public string Version { get; set; }
+        public bool ServiceAvailable { get; set; }
+        public object env { get; set; }
+    }
 }

src/Certify.Server/Certify.Server.Core/Certify.Server.Core/Controllers/AccessController.cs

@@ -18,14 +18,6 @@ public AccessController(ICertifyManager certifyManager, IDataProtectionProvider
             _dataProtectionProvider = dataProtectionProvider;
         }
 
-        private string GetContextUserId()
-        {
-            // TODO: sign passed value provided by public API using public APIs access token
-            var contextUserId = Request.Headers["X-Context-User-Id"];
-
-            return contextUserId;
-        }
-
         [HttpPost, Route("securityprinciple")]
         public async Task<Models.Config.ActionResult> AddSecurityPrinciple([FromBody] SecurityPrinciple principle)
         {
@@ -79,7 +71,7 @@ private string GetContextUserId()
         }
 
         [HttpGet, Route("securityprinciples")]
-        public async Task<List<SecurityPrinciple>> GetSecurityPrinciples()
+        public async Task<ICollection<SecurityPrinciple>> GetSecurityPrinciples()
         {
             var accessControl = await _certifyManager.GetCurrentAccessControl();
 
@@ -95,7 +87,7 @@ public async Task<List<SecurityPrinciple>> GetSecurityPrinciples()
         }
 
         [HttpGet, Route("roles")]
-        public async Task<List<Role>> GetRoles()
+        public async Task<ICollection<Role>> GetRoles()
         {
             var accessControl = await _certifyManager.GetCurrentAccessControl();
             return await accessControl.GetRoles(GetContextUserId());
@@ -118,15 +110,15 @@ public async Task<bool> CheckSecurityPrincipleHasAccess(AccessCheck check)
         }
 
         [HttpGet, Route("assignedtoken/list/")]
-        public async Task<List<AssignedAccessToken>> GetAssignedAccessTokens()
+        public async Task<ICollection<AssignedAccessToken>> GetAssignedAccessTokens()
         {
             var accessControl = await _certifyManager.GetCurrentAccessControl();
 
             return await accessControl.GetAssignedAccessTokens(GetContextUserId());
         }
 
         [HttpPost, Route("assignedtoken/")]
-        public async Task<Models.Config.ActionResult> AddAAssignedccessToken([FromBody] AssignedAccessToken token)
+        public async Task<Models.Config.ActionResult> AddAssignedccessToken([FromBody] AssignedAccessToken token)
         {
             var accessControl = await _certifyManager.GetCurrentAccessControl();
             var addResultOk = await accessControl.AddAssignedAccessToken(GetContextUserId(), token);
@@ -139,7 +131,7 @@ public async Task<List<AssignedAccessToken>> GetAssignedAccessTokens()
         }
 
         [HttpGet, Route("securityprinciple/{id}/assignedroles")]
-        public async Task<List<AssignedRole>> GetSecurityPrincipleAssignedRoles(string id)
+        public async Task<ICollection<AssignedRole>> GetSecurityPrincipleAssignedRoles(string id)
         {
             var accessControl = await _certifyManager.GetCurrentAccessControl();
 

src/Certify.Server/Certify.Server.Core/Certify.Server.Core/Controllers/ControllerBase.cs

@@ -47,5 +47,32 @@ internal void DebugLog(string msg = null,
             Console.ForegroundColor = ConsoleColor.White;
 #endif
         }
+
+        Client.AuthContext _currentAuthContext = null;
+
+        /// <summary>
+        /// Set the current auth context for the current request, only used internally when invoking controller outside of an http request
+        /// </summary>
+        /// <param name="authContext"></param>
+        /// 
+        [NonAction]
+        public void SetCurrentAuthContext(Client.AuthContext authContext)
+        {
+            _currentAuthContext = authContext;
+        }
+
+        [NonAction]
+        public string GetContextUserId()
+        {
+            if (_currentAuthContext != null)
+            {
+                return _currentAuthContext.UserId;
+            }
+
+            // TODO: sign passed value provided by public API using public APIs access token
+            var contextUserId = Request?.Headers["X-Context-User-Id"];
+
+            return contextUserId;
+        }
     }
 }

src/Certify.Server/Certify.Server.Hub.Api/Controllers/internal/HubController.cs

@@ -132,6 +132,8 @@ public async Task<IActionResult> GetHubInfo()
 
             hubInfo.InstanceId = hubprefs.InstanceId;
 
+            _mgmtStateProvider.SetManagementHubInstanceId(hubInfo.InstanceId);
+
             var versionInfo = await _client.GetAppVersion();
 
             hubInfo.Version = new Models.Hub.VersionInfo { Version = versionInfo, Product = "Certify Management Hub" };