Fix credential delete (actionresult)

Author: webprofusion-chrisc

src/Certify.Client/CertifyApiClient.cs

@@ -695,10 +695,10 @@ public async Task<StoredCredential> UpdateCredentials(StoredCredential credentia
             return JsonConvert.DeserializeObject<StoredCredential>(await result.Content.ReadAsStringAsync());
         }
 
-        public async Task<bool> DeleteCredential(string credentialKey, AuthContext authContext = null)
+        public async Task<ActionResult> DeleteCredential(string credentialKey, AuthContext authContext = null)
         {
             var result = await DeleteAsync($"credentials/{credentialKey}", authContext);
-            return JsonConvert.DeserializeObject<bool>(await result.Content.ReadAsStringAsync());
+            return JsonConvert.DeserializeObject<ActionResult>(await result.Content.ReadAsStringAsync());
         }
 
         public async Task<ActionResult> TestCredentials(string credentialKey, AuthContext authContext = null)

src/Certify.Client/ICertifyClient.cs

@@ -52,7 +52,7 @@ public partial interface ICertifyInternalApiClient
         #region Credentials
         Task<List<StoredCredential>> GetCredentials(AuthContext authContext = null);
         Task<StoredCredential> UpdateCredentials(StoredCredential credential, AuthContext authContext = null);
-        Task<bool> DeleteCredential(string credentialKey, AuthContext authContext = null);
+        Task<ActionResult> DeleteCredential(string credentialKey, AuthContext authContext = null);
         Task<ActionResult> TestCredentials(string credentialKey, AuthContext authContext = null);
         #endregion Credentials
 

src/Certify.Server/Certify.Server.HubService/Services/CertifyDirectHubService.cs

@@ -109,7 +109,7 @@ private ServiceControllers.SystemController _systemController(AuthContext authCo
 
         public Task<List<ActionStep>> CopyDataStore(string sourceId, string targetId, AuthContext? authContext = null) => throw new NotImplementedException();
         public Task<ActionResult> DeleteCertificateAuthority(string id, AuthContext? authContext = null) => throw new NotImplementedException();
-        public Task<bool> DeleteCredential(string credentialKey, AuthContext? authContext = null) => throw new NotImplementedException();
+        public Task<ActionResult> DeleteCredential(string credentialKey, AuthContext? authContext = null) => throw new NotImplementedException();
         public Task<bool> DeleteManagedCertificate(string managedItemId, AuthContext? authContext = null) => throw new NotImplementedException();
 
         public Task<List<AccountDetails>> GetAccounts(AuthContext? authContext = null) => throw new NotImplementedException();

src/Certify.UI.Shared/Controls/Settings/Credentials.xaml.cs

@@ -85,9 +85,9 @@ private async void DeleteStoredCredential_Click(object sender, RoutedEventArgs e
                 {
                     //confirm item not used then delete
                     var deleted = await EditModel.MainViewModel.DeleteCredential(EditModel.SelectedStoredCredential?.StorageKey);
-                    if (!deleted)
+                    if (!deleted.IsSuccess)
                     {
-                        MessageBox.Show("This stored credential could not be removed. It may still be in use by a managed site.");
+                        MessageBox.Show("This stored credential could not be removed. It may still be in use by a managed item.");
                     }
                 }
 

src/Certify.UI.Shared/ViewModel/AppViewModel/AppViewModel.Config.cs

@@ -200,11 +200,11 @@ public async Task<StoredCredential> UpdateCredential(StoredCredential credential
         /// </summary>
         /// <param name="credentialKey"></param>
         /// <returns></returns>
-        public async Task<bool> DeleteCredential(string credentialKey)
+        public async Task<ActionResult> DeleteCredential(string credentialKey)
         {
             if (credentialKey == null)
             {
-                return false;
+                return new ActionResult("Cannot delete. Credential key not specified", isSuccess: false);
             }
 
             var result = await _certifyClient.DeleteCredential(credentialKey);