Port svc controller method for hub to net462

Author: webprofusion-chrisc

src/Certify.Service/Controllers/ManagedCertificateController.cs

@@ -95,12 +95,37 @@ public async Task<List<StatusMessage>> TestChallengeResponse(ManagedCertificate
                      .CreateLogger())
             {
                 var theLog = new Loggy(new Serilog.Extensions.Logging.SerilogLoggerFactory(log).CreateLogger<ManagedCertificatesController>());
+
                 var results = await _certifyManager.TestChallenge(theLog, managedCertificate, isPreviewMode: true, progress: progressIndicator);
 
                 return results;
             }
         }
 
+        [HttpPost, Route("challengecleanup")]
+        public async Task<List<StatusMessage>> PerformChallengeCleanup(ManagedCertificate managedCertificate)
+        {
+            DebugLog();
+
+            var progressState = new RequestProgressState(RequestState.Running, "Performing Challenge Cleanup..", managedCertificate);
+
+            var progressIndicator = new Progress<RequestProgressState>(progressState.ProgressReport);
+
+            // perform challenge response test, log to string list and return in result
+            var logList = new List<string>();
+            using (var log = new LoggerConfiguration()
+
+                     .WriteTo.Sink(new ProgressLogSink(progressIndicator, managedCertificate, _certifyManager))
+                     .CreateLogger())
+            {
+                var theLog = new Loggy(new Serilog.Extensions.Logging.SerilogLoggerFactory(log).CreateLogger<ManagedCertificatesController>());
+
+                var results = await _certifyManager.PerformChallengeCleanup(theLog, managedCertificate, progress: progressIndicator);
+
+                return results;
+            }
+        }
+
         [HttpPost, Route("preview")]
         public async Task<List<ActionStep>> PreviewActions(ManagedCertificate site)
         {

src/Certify.Service/Controllers/SystemController.cs

@@ -6,6 +6,7 @@
 using Certify.Models;
 using Certify.Models.Config;
 using Certify.Models.Config.Migration;
+using Certify.Models.Hub;
 using Certify.Shared;
 
 namespace Certify.Service.Controllers
@@ -38,15 +39,6 @@ public async Task<UpdateCheck> PerformUpdateCheck()
             return await new Management.Util().CheckForUpdates();
         }
 
-        [HttpGet, Route("maintenance")]
-        public async Task<string> PerformMaintenanceTasks()
-        {
-            DebugLog();
-
-            await _certifyManager.PerformCertificateCleanup();
-            return "OK";
-        }
-
         [HttpGet, Route("diagnostics")]
         public async Task<List<Models.Config.ActionResult>> PerformServiceDiagnostics()
         {
@@ -105,5 +97,17 @@ public async Task<List<ActionStep>> TestDataStore(DataStoreConnection dataStore)
 
         [HttpPost, Route("datastores/delete")]
         public async Task<List<ActionStep>> RemoveDataStore(string dataStoreId) => await _certifyManager.RemoveDataStoreConnection(dataStoreId);
+
+        [HttpPost, Route("hub/join")]
+        public async Task<Models.Config.ActionResult> JoinManagementHub(HubJoiningClientSecret joiningClientSecret) => await _certifyManager.JoinManagementHub(joiningClientSecret.Url, new ClientSecret { ClientId = joiningClientSecret.ClientId, Secret = joiningClientSecret.Secret });
+
+        [HttpPost, Route("hub/checkcreds")]
+        public async Task<Models.Config.ActionResult> CheckManagementHubCredentials(HubJoiningClientSecret joiningClientSecret) => await _certifyManager.CheckManagementHubCredentials(joiningClientSecret.Url, new ClientSecret { ClientId = joiningClientSecret.ClientId, Secret = joiningClientSecret.Secret });
+
+        [HttpGet, Route("hub/status")]
+        public async Task<Models.Config.ActionResult> CheckManagementHubConnectionStatus() => await _certifyManager.CheckManagementHubConnectionStatus();
+
+        [HttpGet, Route("hub/info")]
+        public async Task<HubInfo> GetHubInfo() => await _certifyManager.GetHubInfo();
     }
 }