PKI revamp: frontend implementation

2026-10-17 20:21:18 +00:00 · 2025-10-10 01:50:10 -03:00
parent 4ddce06887
commit 15a6b8da04
57 changed files with 5271 additions and 298 deletions
@@ -69,10 +69,24 @@ export const registerCertificateProfilesRouter = async (server: FastifyZodProvid
    schema: {
      hide: false,
      tags: [ApiDocsTags.PkiCertificateProfiles],
-      querystring: listCertificateProfilesSchema,
+      querystring: listCertificateProfilesSchema.extend({
+        includeMetrics: z.coerce.boolean().optional().default(false),
+        expiringDays: z.coerce.number().min(1).max(365).optional().default(7)
+      }),
      response: {
        200: z.object({
-          certificateProfiles: CertificateProfilesSchema.array(),
+          certificateProfiles: CertificateProfilesSchema.extend({
+            metrics: z
+              .object({
+                profileId: z.string(),
+                totalCertificates: z.number(),
+                activeCertificates: z.number(),
+                expiredCertificates: z.number(),
+                expiringCertificates: z.number(),
+                revokedCertificates: z.number()
+              })
+              .optional()
+          }).array(),
          totalCount: z.number()
        })
      }
@@ -112,6 +126,10 @@ export const registerCertificateProfilesRouter = async (server: FastifyZodProvid
      hide: false,
      tags: [ApiDocsTags.PkiCertificateProfiles],
      params: getCertificateProfileByIdSchema,
+      querystring: z.object({
+        includeMetrics: z.coerce.boolean().optional().default(false),
+        expiringDays: z.coerce.number().min(1).max(365).optional().default(7)
+      }),
      response: {
        200: z.object({
          certificateProfile: CertificateProfilesSchema.extend({
@@ -145,6 +163,16 @@ export const registerCertificateProfilesRouter = async (server: FastifyZodProvid
                autoRenew: z.boolean(),
                autoRenewDays: z.number().optional()
              })
+              .optional(),
+            metrics: z
+              .object({
+                profileId: z.string(),
+                totalCertificates: z.number(),
+                activeCertificates: z.number(),
+                expiredCertificates: z.number(),
+                expiringCertificates: z.number(),
+                revokedCertificates: z.number()
+              })
              .optional()
          })
        })
@@ -160,6 +188,20 @@ export const registerCertificateProfilesRouter = async (server: FastifyZodProvid
        profileId: req.params.id
      });

+      let result = certificateProfile;
+
+      if (req.query.includeMetrics) {
+        const metrics = await server.services.certificateProfile.getProfileMetrics({
+          actor: req.permission.type,
+          actorId: req.permission.id,
+          actorAuthMethod: req.permission.authMethod,
+          actorOrgId: req.permission.orgId,
+          profileId: req.params.id,
+          expiringDays: req.query.expiringDays
+        });
+        result = { ...certificateProfile, metrics };
+      }
+
      await server.services.auditLog.createAuditLog({
        ...req.auditLogInfo,
        projectId: certificateProfile.projectId,
@@ -171,7 +213,7 @@ export const registerCertificateProfilesRouter = async (server: FastifyZodProvid
        }
      });

-      return { certificateProfile };
+      return { certificateProfile: result };
    }
  });

@@ -322,7 +364,7 @@ export const registerCertificateProfilesRouter = async (server: FastifyZodProvid
              status: z.string(),
              notBefore: z.date(),
              notAfter: z.date(),
-              isRevoked: z.boolean(),
+              revokedAt: z.date().nullable().optional(),
              createdAt: z.date()
            })
          )
@@ -343,45 +385,4 @@ export const registerCertificateProfilesRouter = async (server: FastifyZodProvid
      return { certificates };
    }
  });
-
-  server.route({
-    method: "GET",
-    url: "/:id/metrics",
-    config: {
-      rateLimit: readLimit
-    },
-    schema: {
-      hide: false,
-      tags: [ApiDocsTags.PkiCertificateProfiles],
-      params: getCertificateProfileByIdSchema,
-      querystring: z.object({
-        expiringDays: z.number().min(1).max(365).default(30)
-      }),
-      response: {
-        200: z.object({
-          metrics: z.object({
-            profileId: z.string(),
-            totalCertificates: z.number(),
-            activeCertificates: z.number(),
-            expiredCertificates: z.number(),
-            expiringCertificates: z.number(),
-            revokedCertificates: z.number()
-          })
-        })
-      }
-    },
-    onRequest: verifyAuth([AuthMode.JWT, AuthMode.IDENTITY_ACCESS_TOKEN]),
-    handler: async (req) => {
-      const metrics = await server.services.certificateProfile.getProfileMetrics({
-        actor: req.permission.type,
-        actorId: req.permission.id,
-        actorAuthMethod: req.permission.authMethod,
-        actorOrgId: req.permission.orgId,
-        profileId: req.params.id,
-        expiringDays: req.query.expiringDays
-      });
-
-      return { metrics };
-    }
-  });
 };
@@ -33,14 +33,6 @@ export const registerCertificatesRouter = async (server: FastifyZodProvider) =>
        notBefore: validateCaDateField.optional(),
        notAfter: validateCaDateField.optional(),
        altNames: validateAltNamesField.optional(),
-        organization: z.string().optional(),
-        organizationUnit: z.string().optional(),
-        locality: z.string().optional(),
-        state: z.string().optional(),
-        country: z.string().length(2).optional(),
-        email: z.string().email().optional(),
-        streetAddress: z.string().optional(),
-        postalCode: z.string().optional(),
        signatureAlgorithm: z.string().optional(),
        keyAlgorithm: z.string().optional()
      }),
@@ -65,14 +57,6 @@ export const registerCertificatesRouter = async (server: FastifyZodProvider) =>
        profileId: req.body.profileId,
        certificateRequest: {
          commonName: req.body.commonName,
-          organization: req.body.organization,
-          organizationUnit: req.body.organizationUnit,
-          locality: req.body.locality,
-          state: req.body.state,
-          country: req.body.country,
-          email: req.body.email,
-          streetAddress: req.body.streetAddress,
-          postalCode: req.body.postalCode,
          keyUsages: req.body.keyUsages,
          extendedKeyUsages: req.body.extendedKeyUsages,
          subjectAlternativeNames: req.body.altNames
@@ -221,14 +205,6 @@ export const registerCertificatesRouter = async (server: FastifyZodProvider) =>
        notBefore: validateCaDateField.optional(),
        notAfter: validateCaDateField.optional(),
        commonName: validateTemplateRegexField.optional(),
-        organization: z.string().optional(),
-        organizationUnit: z.string().optional(),
-        locality: z.string().optional(),
-        state: z.string().optional(),
-        country: z.string().length(2).optional(),
-        email: z.string().email().optional(),
-        streetAddress: z.string().optional(),
-        postalCode: z.string().optional(),
        signatureAlgorithm: z.string().optional(),
        keyAlgorithm: z.string().optional()
      }),
@@ -280,14 +256,6 @@ export const registerCertificatesRouter = async (server: FastifyZodProvider) =>
            ttl: req.body.ttl
          },
          commonName: req.body.commonName,
-          organization: req.body.organization,
-          organizationUnit: req.body.organizationUnit,
-          locality: req.body.locality,
-          state: req.body.state,
-          country: req.body.country,
-          email: req.body.email,
-          streetAddress: req.body.streetAddress,
-          postalCode: req.body.postalCode,
          keyUsages: req.body.keyUsages,
          extendedKeyUsages: req.body.extendedKeyUsages,
          notBefore: req.body.notBefore ? new Date(req.body.notBefore) : undefined,