PKI revamp: UI improvements

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

@@ -9,7 +9,6 @@ import { AuthMode } from "@app/services/auth/auth-type";
 import {
   createCertificateProfileSchema,
   deleteCertificateProfileSchema,
-  getCertificateProfileByIdSchema,
   listCertificateProfilesSchema,
   updateCertificateProfileSchema
 } from "@app/services/certificate-profile/certificate-profile-schemas";
@@ -49,7 +48,7 @@ export const registerCertificateProfilesRouter = async (server: FastifyZodProvid
           type: EventType.CREATE_CERTIFICATE_PROFILE,
           metadata: {
             certificateProfileId: certificateProfile.id,
-            name: certificateProfile.name,
+            name: certificateProfile.slug,
             projectId: certificateProfile.projectId,
             enrollmentType: certificateProfile.enrollmentType
           }
@@ -125,7 +124,9 @@ export const registerCertificateProfilesRouter = async (server: FastifyZodProvid
     schema: {
       hide: false,
       tags: [ApiDocsTags.PkiCertificateProfiles],
-      params: getCertificateProfileByIdSchema,
+      params: z.object({
+        id: z.string().min(1)
+      }),
       querystring: z.object({
         includeMetrics: z.coerce.boolean().optional().default(false),
         expiringDays: z.coerce.number().min(1).max(365).optional().default(7)
@@ -262,7 +263,9 @@ export const registerCertificateProfilesRouter = async (server: FastifyZodProvid
     schema: {
       hide: false,
       tags: [ApiDocsTags.PkiCertificateProfiles],
-      params: getCertificateProfileByIdSchema,
+      params: z.object({
+        id: z.string().min(1)
+      }),
       body: updateCertificateProfileSchema,
       response: {
         200: z.object({
@@ -288,7 +291,7 @@ export const registerCertificateProfilesRouter = async (server: FastifyZodProvid
           type: EventType.UPDATE_CERTIFICATE_PROFILE,
           metadata: {
             certificateProfileId: certificateProfile.id,
-            name: certificateProfile.name
+            name: certificateProfile.slug
           }
         }
       });
@@ -347,7 +350,9 @@ export const registerCertificateProfilesRouter = async (server: FastifyZodProvid
     schema: {
       hide: false,
       tags: [ApiDocsTags.PkiCertificateProfiles],
-      params: getCertificateProfileByIdSchema,
+      params: z.object({
+        id: z.string().min(1)
+      }),
       querystring: z.object({
         offset: z.number().min(0).default(0),
         limit: z.number().min(1).max(100).default(20),

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

@@ -52,7 +52,8 @@ export const registerCertificateTemplateRouter = async (server: FastifyZodProvid
         event: {
           type: EventType.GET_CERTIFICATE_TEMPLATE,
           metadata: {
-            certificateTemplateId: certificateTemplate.id
+            certificateTemplateId: certificateTemplate.id,
+            name: certificateTemplate.name
           }
         }
       });
@@ -116,12 +117,8 @@ export const registerCertificateTemplateRouter = async (server: FastifyZodProvid
           type: EventType.CREATE_CERTIFICATE_TEMPLATE,
           metadata: {
             certificateTemplateId: certificateTemplate.id,
-            caId: certificateTemplate.caId,
-            pkiCollectionId: certificateTemplate.pkiCollectionId as string,
             name: certificateTemplate.name,
-            commonName: certificateTemplate.commonName,
-            subjectAlternativeName: certificateTemplate.subjectAlternativeName,
-            ttl: certificateTemplate.ttl
+            projectId: certificateTemplate.projectId
           }
         }
       });
@@ -184,12 +181,7 @@ export const registerCertificateTemplateRouter = async (server: FastifyZodProvid
           type: EventType.UPDATE_CERTIFICATE_TEMPLATE,
           metadata: {
             certificateTemplateId: certificateTemplate.id,
-            caId: certificateTemplate.caId,
-            pkiCollectionId: certificateTemplate.pkiCollectionId as string,
-            name: certificateTemplate.name,
-            commonName: certificateTemplate.commonName,
-            subjectAlternativeName: certificateTemplate.subjectAlternativeName,
-            ttl: certificateTemplate.ttl
+            name: certificateTemplate.name
           }
         }
       });
@@ -230,7 +222,8 @@ export const registerCertificateTemplateRouter = async (server: FastifyZodProvid
         event: {
           type: EventType.DELETE_CERTIFICATE_TEMPLATE,
           metadata: {
-            certificateTemplateId: certificateTemplate.id
+            certificateTemplateId: certificateTemplate.id,
+            name: certificateTemplate.name
           }
         }
       });

backend/src/server/routes/v2/certificate-templates-v2-router.ts

@@ -48,10 +48,10 @@ export const registerCertificateTemplatesV2Router = async (server: FastifyZodPro
         ...req.auditLogInfo,
         projectId,
         event: {
-          type: EventType.CREATE_CERTIFICATE_TEMPLATE_V2,
+          type: EventType.CREATE_CERTIFICATE_TEMPLATE,
           metadata: {
             certificateTemplateId: certificateTemplate.id,
-            name: certificateTemplate.name,
+            name: certificateTemplate.slug,
             projectId: certificateTemplate.projectId
           }
         }
@@ -92,7 +92,7 @@ export const registerCertificateTemplatesV2Router = async (server: FastifyZodPro
         ...req.auditLogInfo,
         projectId: req.query.projectId,
         event: {
-          type: EventType.LIST_CERTIFICATE_TEMPLATES_V2,
+          type: EventType.LIST_CERTIFICATE_TEMPLATES,
           metadata: {
             projectId: req.query.projectId
           }
@@ -133,9 +133,10 @@ export const registerCertificateTemplatesV2Router = async (server: FastifyZodPro
         ...req.auditLogInfo,
         projectId: certificateTemplate.projectId,
         event: {
-          type: EventType.GET_CERTIFICATE_TEMPLATE_V2,
+          type: EventType.GET_CERTIFICATE_TEMPLATE,
           metadata: {
-            certificateTemplateId: certificateTemplate.id
+            certificateTemplateId: certificateTemplate.id,
+            name: certificateTemplate.slug
           }
         }
       });
@@ -176,10 +177,10 @@ export const registerCertificateTemplatesV2Router = async (server: FastifyZodPro
         ...req.auditLogInfo,
         projectId: certificateTemplate.projectId,
         event: {
-          type: EventType.UPDATE_CERTIFICATE_TEMPLATE_V2,
+          type: EventType.UPDATE_CERTIFICATE_TEMPLATE,
           metadata: {
             certificateTemplateId: certificateTemplate.id,
-            name: certificateTemplate.name
+            name: certificateTemplate.slug
           }
         }
       });
@@ -218,9 +219,10 @@ export const registerCertificateTemplatesV2Router = async (server: FastifyZodPro
         ...req.auditLogInfo,
         projectId: certificateTemplate.projectId,
         event: {
-          type: EventType.DELETE_CERTIFICATE_TEMPLATE_V2,
+          type: EventType.DELETE_CERTIFICATE_TEMPLATE,
           metadata: {
-            certificateTemplateId: certificateTemplate.id
+            certificateTemplateId: certificateTemplate.id,
+            name: certificateTemplate.slug
           }
         }
       });

backend/src/server/routes/v3/certificates-router.ts

@@ -196,7 +196,7 @@ export const registerCertificatesRouter = async (server: FastifyZodProvider) =>
       tags: [ApiDocsTags.PkiCertificates],
       body: z.object({
         profileId: z.string().uuid(),
-        identifiers: z
+        subjectAlternativeNames: z
           .array(
             z.object({
               type: z.enum(["dns", "ip"]),
@@ -217,7 +217,7 @@ export const registerCertificatesRouter = async (server: FastifyZodProvider) =>
         200: z.object({
           orderId: z.string(),
           status: z.enum(["pending", "processing", "valid", "invalid"]),
-          identifiers: z.array(
+          subjectAlternativeNames: z.array(
             z.object({
               type: z.enum(["dns", "ip"]),
               value: z.string(),
@@ -256,7 +256,7 @@ export const registerCertificatesRouter = async (server: FastifyZodProvider) =>
         actorOrgId: req.permission.orgId,
         profileId: req.body.profileId,
         certificateOrder: {
-          identifiers: req.body.identifiers,
+          subjectAlternativeNames: req.body.subjectAlternativeNames,
           validity: {
             ttl: req.body.ttl
           },
@@ -286,7 +286,7 @@ export const registerCertificatesRouter = async (server: FastifyZodProvider) =>
           metadata: {
             certificateProfileId: req.body.profileId,
             orderId: data.orderId,
-            identifiers: req.body.identifiers.map((id) => `${id.type}:${id.value}`)
+            subjectAlternativeNames: req.body.subjectAlternativeNames.map((san) => `${san.type}:${san.value}`)
           }
         }
       });