Cleanup

Cleanup

Cleanup

Author: webprofusion-chrisc

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

@@ -7,7 +7,6 @@
 using Certify.Models;
 using Certify.Models.Config;
 using Certify.Models.Hub;
-using Serilog;
 
 namespace Certify.Management
 {

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

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -17,12 +17,12 @@ private async Task<ICollection<string>> GetTargetServiceTypes()
             if (await IsServerTypeAvailable(StandardServerTypes.IIS))
             {
                 list.Add(StandardServerTypes.IIS.ToString());
-            };
+            }
 
             if (await IsServerTypeAvailable(StandardServerTypes.Nginx))
             {
                 list.Add(StandardServerTypes.Nginx.ToString());
-            };
+            }
             return list;
         }
 

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

@@ -9,8 +9,6 @@
 using Certify.Core.Management.Challenges;
 using Certify.Datastore.SQLite;
 using Certify.Models;
-using Certify.Models.Config;
-using Certify.Models.Hub;
 using Certify.Models.Providers;
 using Certify.Providers;
 using Microsoft.Extensions.Logging;

src/Certify.Models/Hub/AccessControl.cs

@@ -21,7 +21,6 @@ public enum SecurityPermissionType
     /// </summary>
     public class SecurityPrinciple : ConfigurationStoreItem
     {
-
         public string? Username { get; set; }
         public string? Password { get; set; }
         public string? Email { get; set; }
@@ -111,7 +110,7 @@ public class AccessTokenTypes
     }
     public class AccessToken : ConfigurationStoreItem
     {
-        public string TokenType { get; set; } = default!;
+        public string? TokenType { get; set; } = default!;
         public string Secret { get; set; } = default!;
         public string ClientId { get; set; } = default!;
 

src/Certify.Models/Hub/ManagedCertificateSummary.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using Certify.Models;
 
 namespace Certify.Models.Hub
 {

src/Certify.Models/Hub/ManagedChallenge.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace Certify.Models.Hub
+namespace Certify.Models.Hub
 {
     /// <summary>
     /// Configuration for a managed challenge, such as a DNS challenge for a specific domain/zone

src/Certify.Models/Hub/ManagedInstanceInfo.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using Certify.Models;
 
 namespace Certify.Models.Hub
 {

src/Certify.Providers/ACME/Anvil/AnvilACMEProvider.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Globalization;
@@ -1434,7 +1434,7 @@ public async Task<ProcessStepResult> CompleteCertificateRequest(ILog log, Manage
                 log.Warning($"Order context was not cached: {orderId}");
                 // didn't have cached info
                 orderContext = _acme.Order(new Uri(orderId));
-            };
+            }
 
             // check order status, if it's not 'ready' then try a few more times before giving up
             var order = await orderContext.Resource();

src/Certify.Providers/DNS/Cloudflare/DnsProviderCloudflare.cs

@@ -1,12 +1,11 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
 using Certify.Models.Config;
 using Certify.Models.Plugins;
 using Certify.Models.Providers;
-using Certify.Models.Shared.Validation;
 using Certify.Plugins;
 using Newtonsoft.Json;
 
@@ -214,7 +213,7 @@ private string NormalizeTXTValue(string val)
         private async Task<ActionResult> AddDnsRecord(string zoneId, string name, string value)
         {
             value = NormalizeTXTValue(value);
-            
+
             var request = CreateRequest(HttpMethod.Post, string.Format(_createRecordUri, zoneId));
 
             request.Content = new StringContent(
@@ -428,7 +427,8 @@ public async Task<bool> InitProvider(Dictionary<string, string> credentials, Dic
             if (credentials == null || credentials?.Any() == false)
             {
                 throw new ArgumentException(credentialError);
-            };
+            }
+            ;
 
             _authKey = credentials.ContainsKey("authkey") ? credentials["authkey"] : null;
             _apiToken = credentials.ContainsKey("apitoken") ? credentials["apitoken"] : null;

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

@@ -2083,7 +2083,8 @@ public virtual async System.Threading.Tasks.Task<ManagedCertificate> UpdateManag
 
                     var urlBuilder_ = new System.Text.StringBuilder();
                     if (!string.IsNullOrEmpty(_baseUrl)) urlBuilder_.Append(_baseUrl);
-                    // Operation Path: "{instanceId}/settings/update"
+                    // Operation Path: "api/v1/certificate/{instanceId}/settings/update"
+                    urlBuilder_.Append("api/v1/certificate/");
                     urlBuilder_.Append(System.Uri.EscapeDataString(ConvertToString(instanceId, System.Globalization.CultureInfo.InvariantCulture)));
                     urlBuilder_.Append("/settings/update");