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;
+};