get_certificate cleanup

api/kiwi_vpn_api/easyrsa.py

@@ -237,9 +237,14 @@ class EasyRSA:
 
     def get_certificate(
         self,
-        cert_type: CertificateType | None,
+        *,
+        cert_type: CertificateType | None = None,
         dn: DistinguishedName | None = None,
     ) -> x509.Certificate | None:
+        """
+        Get a certificate from the PKI directory
+        """
+
         if cert_type is CertificateType.ca:
             cert_filename = self.output_directory.joinpath("ca.crt")
 
@@ -279,10 +284,7 @@ class EasyRSA:
             EASYRSA_REQ_CN="kiwi-vpn-ca",
         )
 
-        cert = self.get_certificate(
+        cert = self.get_certificate(cert_type=CertificateType.ca)
-            cert_type=CertificateType.ca,
-            dn=None,
-        )
         assert cert is not None
 
         # # this takes long!
@@ -340,10 +342,7 @@ class EasyRSA:
             **dn.easyrsa_env,
         )
 
-        return self.get_certificate(
+        return self.get_certificate(dn=dn)
-            cert_type=None,
-            dn=dn,
-        )
 
     def revoke(
         self,

api/kiwi_vpn_api/routers/_common.py

@@ -145,7 +145,7 @@ async def get_pki() -> EasyRSA:
     - 425: EasyRSA not initialized
     """
 
-    if EASYRSA.get_certificate(CertificateType.ca) is None:
+    if EASYRSA.get_certificate(cert_type=CertificateType.ca) is None:
         raise HTTPException(status_code=status.HTTP_425_TOO_EARLY)
 
     return EASYRSA