misc: updated est configuration to be binded to certificate template

frontend/src/hooks/api/ca/index.tsx

@@ -1,20 +1,11 @@
 export { CaRenewalType, CaStatus, CaType } from "./enums";
 export {
   useCreateCa,
-  useCreateCaEstConfig,
   useCreateCertificate,
   useDeleteCa,
   useImportCaCertificate,
   useRenewCa,
   useSignIntermediate,
-  useUpdateCa,
-  useUpdateCaEstConfig
+  useUpdateCa
 } from "./mutations";
-export {
-  useGetCaById,
-  useGetCaCert,
-  useGetCaCerts,
-  useGetCaCrl,
-  useGetCaCsr,
-  useGetCaEstConfig
-} from "./queries";
+export { useGetCaById, useGetCaCert, useGetCaCerts, useGetCaCrl, useGetCaCsr } from "./queries";

frontend/src/hooks/api/ca/mutations.tsx

@@ -7,7 +7,6 @@ import { caKeys } from "./queries";
 import {
   TCertificateAuthority,
   TCreateCaDTO,
-  TCreateCaEstConfigDTO,
   TCreateCertificateDTO,
   TCreateCertificateResponse,
   TDeleteCaDTO,
@@ -17,8 +16,7 @@ import {
   TRenewCaResponse,
   TSignIntermediateDTO,
   TSignIntermediateResponse,
-  TUpdateCaDTO,
-  TUpdateCaEstConfigDTO
+  TUpdateCaDTO
 } from "./types";
 
 export const useCreateCa = () => {
@@ -134,29 +132,3 @@ export const useRenewCa = () => {
     }
   });
 };
-
-export const useCreateCaEstConfig = () => {
-  const queryClient = useQueryClient();
-  return useMutation<{}, {}, TCreateCaEstConfigDTO>({
-    mutationFn: async (body) => {
-      const { data } = await apiRequest.post(`/api/v1/pki/ca/${body.caId}/est-config`, body);
-      return data;
-    },
-    onSuccess: (_, { caId }) => {
-      queryClient.invalidateQueries(caKeys.getCaEstConfig(caId));
-    }
-  });
-};
-
-export const useUpdateCaEstConfig = () => {
-  const queryClient = useQueryClient();
-  return useMutation<{}, {}, TUpdateCaEstConfigDTO>({
-    mutationFn: async (body) => {
-      const { data } = await apiRequest.patch(`/api/v1/pki/ca/${body.caId}/est-config`, body);
-      return data;
-    },
-    onSuccess: (_, { caId }) => {
-      queryClient.invalidateQueries(caKeys.getCaEstConfig(caId));
-    }
-  });
-};

frontend/src/hooks/api/ca/queries.tsx

@@ -2,7 +2,7 @@ import { useQuery } from "@tanstack/react-query";
 
 import { apiRequest } from "@app/config/request";
 
-import { TCaEstConfig, TCertificateAuthority } from "./types";
+import { TCertificateAuthority } from "./types";
 
 export const caKeys = {
   getCaById: (caId: string) => [{ caId }, "ca"],
@@ -88,19 +88,3 @@ export const useGetCaCrl = (caId: string) => {
     enabled: Boolean(caId)
   });
 };
-
-export const useGetCaEstConfig = (caId: string) => {
-  return useQuery({
-    queryKey: caKeys.getCaEstConfig(caId),
-    queryFn: async () => {
-      const {
-        data: { caEstConfig }
-      } = await apiRequest.get<{
-        caEstConfig: TCaEstConfig;
-      }>(`/api/v1/pki/ca/${caId}/est-config`);
-
-      return caEstConfig;
-    },
-    enabled: Boolean(caId)
-  });
-};

frontend/src/hooks/api/ca/types.ts

@@ -110,23 +110,3 @@ export type TRenewCaResponse = {
   certificateChain: string;
   serialNumber: string;
 };
-
-export type TCaEstConfig = {
-  caId: string;
-  caChain: string;
-  isEnabled: false;
-};
-
-export type TCreateCaEstConfigDTO = {
-  caId: string;
-  caChain: string;
-  passphrase: string;
-  isEnabled: boolean;
-};
-
-export type TUpdateCaEstConfigDTO = {
-  caId: string;
-  caChain?: string;
-  passphrase?: string;
-  isEnabled?: boolean;
-};

frontend/src/hooks/api/certificateTemplates/index.tsx

@@ -1,2 +1,8 @@
-export { useCreateCertTemplate, useDeleteCertTemplate, useUpdateCertTemplate } from "./mutations";
-export { useGetCertTemplate } from "./queries";
+export {
+  useCreateCertTemplate,
+  useCreateEstConfig,
+  useDeleteCertTemplate,
+  useUpdateCertTemplate,
+  useUpdateEstConfig
+} from "./mutations";
+export { useGetCertTemplate, useGetEstConfig } from "./queries";

frontend/src/hooks/api/certificateTemplates/mutations.tsx

@@ -7,8 +7,10 @@ import { certTemplateKeys } from "./queries";
 import {
   TCertificateTemplate,
   TCreateCertificateTemplateDTO,
+  TCreateEstConfigDTO,
   TDeleteCertificateTemplateDTO,
-  TUpdateCertificateTemplateDTO
+  TUpdateCertificateTemplateDTO,
+  TUpdateEstConfigDTO
 } from "./types";
 
 export const useCreateCertTemplate = () => {
@@ -57,3 +59,35 @@ export const useDeleteCertTemplate = () => {
     }
   });
 };
+
+export const useCreateEstConfig = () => {
+  const queryClient = useQueryClient();
+  return useMutation<{}, {}, TCreateEstConfigDTO>({
+    mutationFn: async (body) => {
+      const { data } = await apiRequest.post(
+        `/api/v1/pki/certificate-templates/${body.certificateTemplateId}/est-config`,
+        body
+      );
+      return data;
+    },
+    onSuccess: (_, { certificateTemplateId }) => {
+      queryClient.invalidateQueries(certTemplateKeys.getEstConfig(certificateTemplateId));
+    }
+  });
+};
+
+export const useUpdateEstConfig = () => {
+  const queryClient = useQueryClient();
+  return useMutation<{}, {}, TUpdateEstConfigDTO>({
+    mutationFn: async (body) => {
+      const { data } = await apiRequest.patch(
+        `/api/v1/pki/certificate-templates/${body.certificateTemplateId}/est-config`,
+        body
+      );
+      return data;
+    },
+    onSuccess: (_, { certificateTemplateId }) => {
+      queryClient.invalidateQueries(certTemplateKeys.getEstConfig(certificateTemplateId));
+    }
+  });
+};

frontend/src/hooks/api/certificateTemplates/queries.tsx

@@ -2,10 +2,11 @@ import { useQuery } from "@tanstack/react-query";
 
 import { apiRequest } from "@app/config/request";
 
-import { TCertificateTemplate } from "./types";
+import { TCertificateTemplate, TEstConfig } from "./types";
 
 export const certTemplateKeys = {
-  getCertTemplateById: (id: string) => [{ id }, "cert-template"]
+  getCertTemplateById: (id: string) => [{ id }, "cert-template"],
+  getEstConfig: (id: string) => [{ id }, "cert-template-est-config"]
 };
 
 export const useGetCertTemplate = (id: string) => {
@@ -20,3 +21,17 @@ export const useGetCertTemplate = (id: string) => {
     enabled: Boolean(id)
   });
 };
+
+export const useGetEstConfig = (certificateTemplateId: string) => {
+  return useQuery({
+    queryKey: certTemplateKeys.getEstConfig(certificateTemplateId),
+    queryFn: async () => {
+      const { data: estConfig } = await apiRequest.get<TEstConfig>(
+        `/api/v1/pki/certificate-templates/${certificateTemplateId}/est-config`
+      );
+
+      return estConfig;
+    },
+    enabled: Boolean(certificateTemplateId)
+  });
+};

frontend/src/hooks/api/certificateTemplates/types.ts

@@ -35,3 +35,24 @@ export type TDeleteCertificateTemplateDTO = {
   id: string;
   projectId: string;
 };
+
+export type TCreateEstConfigDTO = {
+  certificateTemplateId: string;
+  caChain: string;
+  passphrase: string;
+  isEnabled: boolean;
+};
+
+export type TUpdateEstConfigDTO = {
+  certificateTemplateId: string;
+  caChain?: string;
+  passphrase?: string;
+  isEnabled?: boolean;
+};
+
+export type TEstConfig = {
+  id: string;
+  certificateTemplateId: string;
+  caChain: string;
+  isEnabled: false;
+};

frontend/src/views/Project/CertificatesPage/components/CertificatesTab/components/CertificateTemplateEnrollmentModal.tsx

@@ -15,7 +15,7 @@ import {
   Switch,
   TextArea
 } from "@app/components/v2";
-import { useCreateCaEstConfig, useGetCaEstConfig, useUpdateCaEstConfig } from "@app/hooks/api";
+import { useCreateEstConfig, useGetEstConfig, useUpdateEstConfig } from "@app/hooks/api";
 import { UsePopUpState } from "@app/hooks/usePopUp";
 
 enum EnrollmentMethod {
@@ -39,13 +39,13 @@ const schema = z.object({
 
 export type FormData = z.infer<typeof schema>;
 
-export const CaEnrollmentModal = ({ popUp, handlePopUpToggle }: Props) => {
+export const CertificateTemplateEnrollmentModal = ({ popUp, handlePopUpToggle }: Props) => {
   const popUpData = popUp?.enrollmentOptions?.data as {
-    caId: string;
+    id: string;
   };
-  const caId = popUpData?.caId;
+  const certificateTemplateId = popUpData?.id;
 
-  const { data } = useGetCaEstConfig(caId);
+  const { data } = useGetEstConfig(certificateTemplateId);
 
   const {
     control,
@@ -57,8 +57,8 @@ export const CaEnrollmentModal = ({ popUp, handlePopUpToggle }: Props) => {
     resolver: zodResolver(schema)
   });
 
-  const { mutateAsync: createCaEstConfig } = useCreateCaEstConfig();
-  const { mutateAsync: updateCaEstConfig } = useUpdateCaEstConfig();
+  const { mutateAsync: createEstConfig } = useCreateEstConfig();
+  const { mutateAsync: updateEstConfig } = useUpdateEstConfig();
 
   useEffect(() => {
     if (data) {
@@ -77,8 +77,8 @@ export const CaEnrollmentModal = ({ popUp, handlePopUpToggle }: Props) => {
   const onFormSubmit = async ({ caChain, passphrase, isEnabled }: FormData) => {
     try {
       if (data) {
-        await updateCaEstConfig({
-          caId,
+        await updateEstConfig({
+          certificateTemplateId,
           caChain,
           passphrase,
           isEnabled
@@ -89,8 +89,8 @@ export const CaEnrollmentModal = ({ popUp, handlePopUpToggle }: Props) => {
           return;
         }
 
-        await createCaEstConfig({
-          caId,
+        await createEstConfig({
+          certificateTemplateId,
           caChain,
           passphrase,
           isEnabled

frontend/src/views/Project/CertificatesPage/components/CertificatesTab/components/CertificateTemplatesSection.tsx

@@ -8,13 +8,15 @@ import { ProjectPermissionActions, ProjectPermissionSub, useWorkspace } from "@a
 import { usePopUp } from "@app/hooks";
 import { useDeleteCertTemplate } from "@app/hooks/api";
 
+import { CertificateTemplateEnrollmentModal } from "./CertificateTemplateEnrollmentModal";
 import { CertificateTemplateModal } from "./CertificateTemplateModal";
 import { CertificateTemplatesTable } from "./CertificateTemplatesTable";
 
 export const CertificateTemplatesSection = () => {
   const { popUp, handlePopUpOpen, handlePopUpClose, handlePopUpToggle } = usePopUp([
     "certificateTemplate",
-    "deleteCertificateTemplate"
+    "deleteCertificateTemplate",
+    "enrollmentOptions"
   ] as const);
 
   const { currentWorkspace } = useWorkspace();
@@ -69,6 +71,7 @@ export const CertificateTemplatesSection = () => {
       </div>
       <CertificateTemplatesTable handlePopUpOpen={handlePopUpOpen} />
       <CertificateTemplateModal popUp={popUp} handlePopUpToggle={handlePopUpToggle} />
+      <CertificateTemplateEnrollmentModal popUp={popUp} handlePopUpToggle={handlePopUpToggle} />
       <DeleteActionModal
         isOpen={popUp.deleteCertificateTemplate.isOpen}
         title={`Are you sure want to delete the certificate template ${

frontend/src/views/Project/CertificatesPage/components/CertificatesTab/components/CertificateTemplatesTable.tsx

@@ -1,4 +1,4 @@
-import { faEllipsis, faFileAlt, faTrash } from "@fortawesome/free-solid-svg-icons";
+import { faEllipsis, faFileAlt, faTrash, faUserPlus } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { twMerge } from "tailwind-merge";
 
@@ -25,7 +25,9 @@ import { UsePopUpState } from "@app/hooks/usePopUp";
 
 type Props = {
   handlePopUpOpen: (
-    popUpName: keyof UsePopUpState<["certificateTemplate", "deleteCertificateTemplate"]>,
+    popUpName: keyof UsePopUpState<
+      ["certificateTemplate", "deleteCertificateTemplate", "enrollmentOptions"]
+    >,
     data?: {
       id?: string;
       name?: string;
@@ -78,6 +80,16 @@ export const CertificateTemplatesTable = ({ handlePopUpOpen }: Props) => {
                           >
                             Manage Policies
                           </DropdownMenuItem>
+                          <DropdownMenuItem
+                            onClick={() =>
+                              handlePopUpOpen("enrollmentOptions", {
+                                id: certificateTemplate.id
+                              })
+                            }
+                            icon={<FontAwesomeIcon icon={faUserPlus} />}
+                          >
+                            Manage Enrollment
+                          </DropdownMenuItem>
                           <ProjectPermissionCan
                             I={ProjectPermissionActions.Delete}
                             a={ProjectPermissionSub.CertificateTemplates}