Fix delete managed item per instance

Author: webprofusion-chrisc

src/Certify.Core/Management/CertifyManager/CertifyManager.ManagedCertificates.cs

@@ -9,6 +9,7 @@
 using Certify.Models.Providers;
 using Certify.Models.Reporting;
 using Certify.Models.Shared;
+using Certify.Models.Config;
 
 namespace Certify.Management
 {
@@ -337,16 +338,19 @@ private async Task SendQueuedStatusReports()
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        public async Task DeleteManagedCertificate(string id)
+        public async Task<ActionResult> DeleteManagedCertificate(string id)
         {
             if (!string.IsNullOrEmpty(id))
             {
                 var item = await _itemManager.GetById(id);
                 if (item != null)
                 {
                     await _itemManager.Delete(item);
+                    return new ActionResult { IsSuccess = true, Message = "Deleted" };
                 }
             }
+
+            return new ActionResult { IsSuccess = false, Message = "Delete failed." };
         }
 
         /// <summary>

src/Certify.Core/Management/CertifyManager/ICertifyManager.cs

@@ -33,7 +33,7 @@ public interface ICertifyManager
 
         Task<ManagedCertificate> UpdateManagedCertificate(ManagedCertificate site);
 
-        Task DeleteManagedCertificate(string id);
+        Task<ActionResult> DeleteManagedCertificate(string id);
 
         Task<ImportExportPackage> PerformExport(ExportRequest exportRequest);
         Task<List<ActionStep>> PerformImport(ImportRequest importRequest);

src/Certify.Server/Certify.Server.Api.Public.Client/Certify.API.Public.cs

@@ -2064,7 +2064,7 @@ public virtual async System.Threading.Tasks.Task<ManagedCertificate> PerformRene
         /// </summary>
         /// <returns>OK</returns>
         /// <exception cref="ApiException">A server side error occurred.</exception>
-        public virtual System.Threading.Tasks.Task<bool> RemoveManagedCertificateAsync(string instanceId, string managedCertId)
+        public virtual System.Threading.Tasks.Task<ActionResult> RemoveManagedCertificateAsync(string instanceId, string managedCertId)
         {
             return RemoveManagedCertificateAsync(instanceId, managedCertId, System.Threading.CancellationToken.None);
         }
@@ -2075,7 +2075,7 @@ public virtual System.Threading.Tasks.Task<bool> RemoveManagedCertificateAsync(s
         /// </summary>
         /// <returns>OK</returns>
         /// <exception cref="ApiException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<bool> RemoveManagedCertificateAsync(string instanceId, string managedCertId, System.Threading.CancellationToken cancellationToken)
+        public virtual async System.Threading.Tasks.Task<ActionResult> RemoveManagedCertificateAsync(string instanceId, string managedCertId, System.Threading.CancellationToken cancellationToken)
         {
             if (instanceId == null)
                 throw new System.ArgumentNullException("instanceId");
@@ -2125,7 +2125,7 @@ public virtual async System.Threading.Tasks.Task<bool> RemoveManagedCertificateA
                         var status_ = (int)response_.StatusCode;
                         if (status_ == 200)
                         {
-                            var objectResponse_ = await ReadObjectResponseAsync<bool>(response_, headers_, cancellationToken).ConfigureAwait(false);
+                            var objectResponse_ = await ReadObjectResponseAsync<ActionResult>(response_, headers_, cancellationToken).ConfigureAwait(false);
                             if (objectResponse_.Object == null)
                             {
                                 throw new ApiException("Response was null which was not expected.", status_, objectResponse_.Text, headers_, null);

src/Certify.Server/Certify.Server.Api.Public/Services/ManagementAPI.cs

@@ -130,7 +130,7 @@ private async Task SendCommandWithNoResult(string instanceId, InstanceCommandReq
         /// <param name="managedCertId"></param>
         /// <param name="authContext"></param>
         /// <returns></returns>
-        public async Task<bool> RemoveManagedCertificate(string instanceId, string managedCertId, AuthContext authContext)
+        public async Task<ActionResult> RemoveManagedCertificate(string instanceId, string managedCertId, AuthContext authContext)
         {
             // delete managed cert via management hub
 
@@ -139,20 +139,14 @@ public async Task<bool> RemoveManagedCertificate(string instanceId, string manag
                     new("managedCertId",managedCertId)
                 };
 
-            var deletedOK = await PerformInstanceCommandTaskWithResult<bool>(instanceId, args, ManagementHubCommands.RemoveDeleteManagedItem);
+            var result = await PerformInstanceCommandTaskWithResult<ActionResult>(instanceId, args, ManagementHubCommands.RemoveManagedItem);
 
-            if (deletedOK)
+            if (result.IsSuccess)
             {
-                try
-                {
-                    _mgmtStateProvider.DeleteCachedManagedInstanceItem(instanceId, managedCertId);
-                }
-                catch
-                {
-                }
+                _mgmtStateProvider.DeleteCachedManagedInstanceItem(instanceId, managedCertId);
             }
 
-            return deletedOK;
+            return result;
         }
 
         public async Task<StatusSummary> GetManagedCertificateSummary(AuthContext? currentAuthContext)

src/Certify.SourceGenerators/ApiMethods.cs

@@ -176,7 +176,7 @@ public static List<GeneratedAPI> GetApiDefinitions()
                         Comment = "Delete a managed challenge (DNS challenge delegation etc)",
                         PublicAPIController = "ManagedChallenge",
                         PublicAPIRoute = "remove",
-                        ServiceAPIRoute = "managedchallenge",
+                        ServiceAPIRoute = "managedchallenge/{id}",
                         ReturnType = "Models.Config.ActionResult",
                         Params = new Dictionary<string, string>{
                             { "id", "string" }
@@ -356,7 +356,7 @@ public static List<GeneratedAPI> GetApiDefinitions()
                         UseManagementAPI = true,
                         PublicAPIController = "Certificate",
                         PublicAPIRoute = "{instanceId}/settings/{managedCertId}",
-                        ReturnType = "bool",
+                        ReturnType = "Models.Config.ActionResult",
                         Params =new Dictionary<string, string>{ { "instanceId", "string" },{ "managedCertId", "string" } }
                     },
                     // TODO