Resolve PR issues

backend/src/server/routes/index.ts

@@ -71,7 +71,7 @@ import { authPaswordServiceFactory } from "@app/services/auth/auth-password-serv
 import { authSignupServiceFactory } from "@app/services/auth/auth-signup-service";
 import { tokenDALFactory } from "@app/services/auth-token/auth-token-dal";
 import { tokenServiceFactory } from "@app/services/auth-token/auth-token-service";
-import { certificateCertDALFactory } from "@app/services/certificate/certificate-cert-dal";
+import { certificateBodyDALFactory } from "@app/services/certificate/certificate-body-dal";
 import { certificateDALFactory } from "@app/services/certificate/certificate-dal";
 import { certificateServiceFactory } from "@app/services/certificate/certificate-service";
 import { certificateAuthorityCertDALFactory } from "@app/services/certificate-authority/certificate-authority-cert-dal";
@@ -521,11 +521,11 @@ export const registerRoutes = async (
   const certificateAuthorityCrlDAL = certificateAuthorityCrlDALFactory(db);
 
   const certificateDAL = certificateDALFactory(db);
-  const certificateCertDAL = certificateCertDALFactory(db);
+  const certificateBodyDAL = certificateBodyDALFactory(db);
 
   const certificateService = certificateServiceFactory({
     certificateDAL,
-    certificateCertDAL,
+    certificateBodyDAL,
     certificateAuthorityDAL,
     certificateAuthorityCertDAL,
     certificateAuthorityCrlDAL,
@@ -552,7 +552,7 @@ export const registerRoutes = async (
     certificateAuthorityCrlDAL,
     certificateAuthorityQueue,
     certificateDAL,
-    certificateCertDAL,
+    certificateBodyDAL,
     projectDAL,
     kmsService,
     permissionService

backend/src/server/routes/v1/certificate-authority-router.ts

@@ -1,3 +1,4 @@
+import ms from "ms";
 import { z } from "zod";
 
 import { CertificateAuthoritiesSchema } from "@app/db/schemas";
@@ -21,7 +22,8 @@ export const registerCaRouter = async (server: FastifyZodProvider) => {
       body: z
         .object({
           projectSlug: z.string().trim(),
-          type: z.enum([CaType.ROOT, CaType.INTERMEDIATE]),
+          type: z.nativeEnum(CaType),
+          friendlyName: z.string().optional(),
           commonName: z.string().trim(),
           organization: z.string().trim(),
           ou: z.string().trim(),
@@ -32,14 +34,7 @@ export const registerCaRouter = async (server: FastifyZodProvider) => {
           notBefore: validateCaDateField.optional(),
           notAfter: validateCaDateField.optional(),
           maxPathLength: z.number().min(-1).default(-1),
-          keyAlgorithm: z
-            .enum([
-              CertKeyAlgorithm.RSA_2048,
-              CertKeyAlgorithm.RSA_4096,
-              CertKeyAlgorithm.ECDSA_P256,
-              CertKeyAlgorithm.ECDSA_P384
-            ])
-            .default(CertKeyAlgorithm.RSA_2048)
+          keyAlgorithm: z.nativeEnum(CertKeyAlgorithm).default(CertKeyAlgorithm.RSA_2048)
         })
         .refine(
           (data) => {
@@ -342,8 +337,9 @@ export const registerCaRouter = async (server: FastifyZodProvider) => {
       }),
       body: z
         .object({
+          friendlyName: z.string().optional(),
           commonName: z.string().trim().min(1),
-          ttl: z.number().int().min(0).optional(),
+          ttl: z.string().refine((val) => ms(val) > 0, "TTL must be a positive number"),
           notBefore: validateCaDateField.optional(),
           notAfter: validateCaDateField.optional()
         })

backend/src/server/routes/v1/certificate-router.ts

@@ -52,17 +52,7 @@ export const registerCertRouter = async (server: FastifyZodProvider) => {
         serialNumber: z.string().trim()
       }),
       body: z.object({
-        revocationReason: z.enum([
-          CrlReason.UNSPECIFIED,
-          CrlReason.KEY_COMPROMISE,
-          CrlReason.CA_COMPROMISE,
-          CrlReason.AFFILIATION_CHANGED,
-          CrlReason.SUPERSEDED,
-          CrlReason.CESSATION_OF_OPERATION,
-          CrlReason.CERTIFICATE_HOLD,
-          CrlReason.PRIVILEGE_WITHDRAWN,
-          CrlReason.A_A_COMPROMISE
-        ])
+        revocationReason: z.nativeEnum(CrlReason)
       }),
       response: {
         200: z.object({