fix bundle endpoint for old certs

2026-10-14 13:22:08 +00:00 · 2025-05-17 12:44:05 -04:00
parent df053bbae9
commit 923feb81f3
8 changed files with 24 additions and 17 deletions
@@ -105,7 +105,7 @@ export const buildCertificateChain = async ({
  kmsService,
  kmsId
 }: TBuildCertificateChainDTO) => {
-  if (!encryptedCertificateChain && (!caCert || !caCertChain)) {
+  if (!encryptedCertificateChain && !caCert) {
    return null;
  }

@@ -337,18 +337,24 @@ export const certificateServiceFactory = ({
      encryptedCertificateChain: certBody.encryptedCertificateChain || undefined
    });

-    const { certPrivateKey } = await getCertificateCredentials({
-      certId: cert.id,
-      projectId: ca.projectId,
-      certificateSecretDAL,
-      projectDAL,
-      kmsService
-    });
+    let privateKey: string | null = null;
+    try {
+      const { certPrivateKey } = await getCertificateCredentials({
+        certId: cert.id,
+        projectId: ca.projectId,
+        certificateSecretDAL,
+        projectDAL,
+        kmsService
+      });
+      privateKey = certPrivateKey;
+    } catch (e) {
+      // This will error for older certificates
+    }

    return {
      certificate,
      certificateChain,
-      privateKey: certPrivateKey,
+      privateKey,
      serialNumber,
      cert,
      ca