Cleanup

Author: webprofusion-chrisc

src/Certify.Models/ClassDiagram.cd

@@ -3,7 +3,7 @@
   <Class Name="Certify.Models.ManagedCertificate">
     <Position X="6.25" Y="0.75" Width="3" />
     <TypeIdentifier>
-      <HashCode>JAACKACUAAAIAiDEAABBugRwJIggBBCAAkAgAEAAZwA=</HashCode>
+      <HashCode>JAICKACUEAAJCiTEAIBAugR0JYgoABCAAEAgAEAAZwg=</HashCode>
       <FileName>Config\ManagedCertificate.cs</FileName>
     </TypeIdentifier>
     <ShowAsAssociation>
@@ -20,7 +20,7 @@
   <Class Name="Certify.Models.CertRequestChallengeConfig">
     <Position X="14.5" Y="9" Width="2.75" />
     <TypeIdentifier>
-      <HashCode>AAAAAAECAAAAAACAAAAAAAAAIAAAAAAAAIAAAABAAQA=</HashCode>
+      <HashCode>AAgAAAECAAAAAACAAAAAAAAAIAAAAAAAAIAAAABAAQA=</HashCode>
       <FileName>Config\CertRequestConfig.cs</FileName>
     </TypeIdentifier>
     <ShowAsCollectionAssociation>
@@ -30,7 +30,7 @@
   <Class Name="Certify.Models.CertRequestConfig">
     <Position X="10" Y="6.5" Width="3.5" />
     <TypeIdentifier>
-      <HashCode>ABgAIQCCKAiAICgAAgAAgGKQAAAAOCAAiSAAAAEIASA=</HashCode>
+      <HashCode>ABgCIQCKKAiAIGgAAgAAhGKSAAAgOCAEiSABAQEIASA=</HashCode>
       <FileName>Config\CertRequestConfig.cs</FileName>
     </TypeIdentifier>
     <ShowAsCollectionAssociation>
@@ -79,9 +79,9 @@
   <Enum Name="Certify.Config.TaskTriggerType">
     <Position X="0.5" Y="3.75" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAgAEAAAAAAAAAAAQAAAAAAAAIAAAgAAAA=</HashCode>
+      <HashCode>AAAAAAAAAAAgAEAAAAEAAAAAAQAAAAAAAAIAAAgAAAA=</HashCode>
       <FileName>Config\DeploymentTaskConfig.cs</FileName>
     </TypeIdentifier>
   </Enum>
   <Font Name="Segoe UI" Size="9" />
-</ClassDiagram>
+</ClassDiagram>

src/Certify.Models/readme.md

@@ -1,5 +1,5 @@
-# Certify.Models
+# Certify.Models
 
-This package contains the models used by the Certify application and includes some models users in API calls to the public certifytheweb.com API.
+This package contains the models used by the Certify application and includes some models used in API calls to the public certifytheweb.com API.
 
 If scripting or automating Certify, refer to the ManagedCertificate class for the main model used to represent a managed certificate.

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

@@ -1866,12 +1866,14 @@ private void RefreshIssuerCertCache()
                         {
                             using (TextReader textReader = new StringReader(cert.Value))
                             {
-                                var pemReader = new PemReader(textReader);
+                                using (var pemReader = new PemReader(textReader))
+                                {
 
-                                var pemObj = pemReader.ReadPemObject();
+                                    var pemObj = pemReader.ReadPemObject();
 
-                                var certBytes = pemObj.Content;
-                                _issuerCertCache.Add(certBytes);
+                                    var certBytes = pemObj.Content;
+                                    _issuerCertCache.Add(certBytes);
+                                }
                             }
                         }
                     }

src/Certify.Server/Certify.Server.HubService/Program.cs

@@ -141,14 +141,6 @@
 
 app.MapDefaultEndpoints();
 
-// Configure the HTTP request pipeline.
-if (app.Environment.IsDevelopment())
-{
-    app.MapOpenApi();
-
-    app.MapScalarApiReference();
-}
-
 app.UseHttpsRedirection();
 app.UseResponseCompression();
 
@@ -184,8 +176,10 @@
 
 app.MapDefaultControllerRoute().WithStaticAssets();
 
+// publish scalar api docs endpoint in dev, e.g. https://localhost:44361/scalar/
 app.MapOpenApi();
 app.MapScalarApiReference();
+
 // Enable middleware to serve generated Swagger as a JSON endpoint.
 app.UseSwagger();
 

src/Certify.Shared/Utils/PKI/CSRUtils.cs

@@ -139,23 +139,22 @@ private static T GetAsn1ObjectRecursive<T>(DerSequence sequence, string id) wher
 
         public static bool CanParsePrivateKey(string keyContent)
         {
-            using (var keyReader = new StringReader(keyContent))
-            {
-                var pemReader = new Org.BouncyCastle.OpenSsl.PemReader(keyReader);
-                var readObject = pemReader.ReadObject();
+            using var keyReader = new StringReader(keyContent);
+            using var pemReader = new Org.BouncyCastle.OpenSsl.PemReader(keyReader);
 
-                if (readObject is AsymmetricCipherKeyPair keyPair)
-                {
-                    return keyPair.Private.IsPrivate;
-                }
-                else if (readObject is AsymmetricKeyParameter keyParameter)
-                {
-                    return keyParameter.IsPrivate;
-                }
-                else
-                {
-                    return false;
-                }
+            var readObject = pemReader.ReadObject();
+
+            if (readObject is AsymmetricCipherKeyPair keyPair)
+            {
+                return keyPair.Private.IsPrivate;
+            }
+            else if (readObject is AsymmetricKeyParameter keyParameter)
+            {
+                return keyParameter.IsPrivate;
+            }
+            else
+            {
+                return false;
             }
         }
     }