From b5e2547af04569dc18aa1b8fa8793da04c7808be Mon Sep 17 00:00:00 2001 From: Sheen Capadngan Date: Fri, 28 Nov 2025 04:33:14 +0800 Subject: [PATCH] misc: addressed comments --- .../platform/pki/certificates.mdx | 2 +- .../platform/pki/enrollment-methods/api.mdx | 4 +-- frontend/src/hooks/api/ca/types.ts | 5 +++- .../api/certificateTemplates/mutations.tsx | 6 ++-- .../api/certificateTemplates/queries.tsx | 2 +- .../components/CaDetailsSection.tsx | 4 --- .../components/ExternalCaModal.tsx | 30 +------------------ 7 files changed, 12 insertions(+), 41 deletions(-) diff --git a/docs/documentation/platform/pki/certificates.mdx b/docs/documentation/platform/pki/certificates.mdx index 112587435b..da73de37df 100644 --- a/docs/documentation/platform/pki/certificates.mdx +++ b/docs/documentation/platform/pki/certificates.mdx @@ -221,7 +221,7 @@ In the following steps, we explore how to issue a X.509 certificate under a CA. ### Sample request ```bash Request - curl --location --request POST 'https://app.infisical.com/api/v3/pki/certificates/issue-certificate' \ + curl --location --request POST 'https://app.infisical.com/api/v1/cert-manager/certificates/issue-certificate' \ --header 'Content-Type: application/json' \ --data-raw '{ "profileId": "", diff --git a/docs/documentation/platform/pki/enrollment-methods/api.mdx b/docs/documentation/platform/pki/enrollment-methods/api.mdx index 288ae08ba1..bfbac7f2e1 100644 --- a/docs/documentation/platform/pki/enrollment-methods/api.mdx +++ b/docs/documentation/platform/pki/enrollment-methods/api.mdx @@ -105,7 +105,7 @@ Here, select the certificate profile from step 1 that will be used to issue the ### Sample request ```bash Request - curl --location --request POST 'https://app.infisical.com/api/v3/pki/certificates/issue-certificate' \ + curl --location --request POST 'https://app.infisical.com/api/v1/cert-manager/certificates/issue-certificate' \ --header 'Authorization: Bearer ' \ --header 'Content-Type: application/json' \ --data-raw '{ @@ -151,7 +151,7 @@ Here, select the certificate profile from step 1 that will be used to issue the ### Sample request ```bash Request - curl --location --request POST 'https://app.infisical.com/api/v3/pki/certificates/sign-certificate' \ + curl --location --request POST 'https://app.infisical.com/api/v1/cert-manager/certificates/sign-certificate' \ --header 'Authorization: Bearer ' \ --header 'Content-Type: application/json' \ --data-raw '{ diff --git a/frontend/src/hooks/api/ca/types.ts b/frontend/src/hooks/api/ca/types.ts index a074999759..57af492592 100644 --- a/frontend/src/hooks/api/ca/types.ts +++ b/frontend/src/hooks/api/ca/types.ts @@ -66,7 +66,10 @@ export type TUnifiedCertificateAuthority = | TAzureAdCsCertificateAuthority | TInternalCertificateAuthority; -export type TCreateCertificateAuthorityDTO = Omit; +export type TCreateCertificateAuthorityDTO = Omit< + TUnifiedCertificateAuthority, + "id" | "enableDirectIssuance" +>; export type TUpdateCertificateAuthorityDTO = Partial & { id: string; type: CaType; diff --git a/frontend/src/hooks/api/certificateTemplates/mutations.tsx b/frontend/src/hooks/api/certificateTemplates/mutations.tsx index d4647d5ee4..0acebae521 100644 --- a/frontend/src/hooks/api/certificateTemplates/mutations.tsx +++ b/frontend/src/hooks/api/certificateTemplates/mutations.tsx @@ -89,7 +89,7 @@ export const useCreateCertTemplateV2 = () => { mutationFn: async (dto) => { const { data } = await apiRequest.post<{ certificateTemplate: TCertificateTemplate; - }>("/api/v1/cert-manager/certificate-templates", dto); + }>("/api/v2/pki/certificate-templates", dto); return data.certificateTemplate; }, onSuccess: (_, { projectId }) => { @@ -108,7 +108,7 @@ export const useUpdateCertTemplateV2 = () => { return useMutation({ mutationFn: async (dto) => { const { data } = await apiRequest.patch<{ certificateTemplate: TCertificateTemplate }>( - `/api/v1/cert-manager/certificate-templates/${dto.templateName}`, + `/api/v2/pki/certificate-templates/${dto.templateName}`, dto ); @@ -130,7 +130,7 @@ export const useDeleteCertTemplateV2 = () => { return useMutation({ mutationFn: async (dto) => { const { data } = await apiRequest.delete<{ certificateTemplate: TCertificateTemplate }>( - `/api/v1/cert-manager/certificate-templates/${dto.templateName}`, + `/api/v2/pki/certificate-templates/${dto.templateName}`, { data: { projectId: dto.projectId diff --git a/frontend/src/hooks/api/certificateTemplates/queries.tsx b/frontend/src/hooks/api/certificateTemplates/queries.tsx index 4b823f2969..78c1ebd812 100644 --- a/frontend/src/hooks/api/certificateTemplates/queries.tsx +++ b/frontend/src/hooks/api/certificateTemplates/queries.tsx @@ -57,7 +57,7 @@ export const useListCertificateTemplates = ({ const { data } = await apiRequest.get<{ certificateTemplates: TCertificateTemplateV2[]; totalCount?: number; - }>("/api/v1/pki/certificate-templates", { + }>("/api/v2/pki/certificate-templates", { params: { limit, offset, diff --git a/frontend/src/pages/cert-manager/CertAuthDetailsByIDPage/components/CaDetailsSection.tsx b/frontend/src/pages/cert-manager/CertAuthDetailsByIDPage/components/CaDetailsSection.tsx index b965d96007..df33f51c88 100644 --- a/frontend/src/pages/cert-manager/CertAuthDetailsByIDPage/components/CaDetailsSection.tsx +++ b/frontend/src/pages/cert-manager/CertAuthDetailsByIDPage/components/CaDetailsSection.tsx @@ -152,10 +152,6 @@ export const CaDetailsSection = ({ caId, handlePopUpOpen }: Props) => { : "-"}

-
-

Enable Direct Issuance

-

{ca.enableDirectIssuance ? "True" : "False"}

-
{ca.status === CaStatus.ACTIVE && ( { type: CaType.AZURE_AD_CS, name: "", status: CaStatus.ACTIVE, - enableDirectIssuance: false, configuration: { azureAdcsConnection: { id: "", @@ -184,7 +181,6 @@ export const ExternalCaModal = ({ popUp, handlePopUpToggle }: Props) => { type: CaType.ACME, name: "", status: CaStatus.ACTIVE, - enableDirectIssuance: true, configuration: { dnsAppConnection: { id: "", @@ -274,7 +270,6 @@ export const ExternalCaModal = ({ popUp, handlePopUpToggle }: Props) => { type: ca.type, name: ca.name, status: ca.status, - enableDirectIssuance: ca.enableDirectIssuance, configuration: { dnsAppConnection: { id: ca.configuration.dnsAppConnectionId, @@ -299,7 +294,6 @@ export const ExternalCaModal = ({ popUp, handlePopUpToggle }: Props) => { type: ca.type, name: ca.name, status: ca.status, - enableDirectIssuance: false, configuration: { azureAdcsConnection: { id: ca.configuration.azureAdcsConnectionId, @@ -314,7 +308,6 @@ export const ExternalCaModal = ({ popUp, handlePopUpToggle }: Props) => { const onFormSubmit = async ({ type, name, - enableDirectIssuance, status, configuration: formConfiguration }: FormData) => { @@ -346,7 +339,6 @@ export const ExternalCaModal = ({ popUp, handlePopUpToggle }: Props) => { name, type, status, - enableDirectIssuance: type === CaType.AZURE_AD_CS ? false : enableDirectIssuance, configuration: configPayload }); } else { @@ -355,7 +347,6 @@ export const ExternalCaModal = ({ popUp, handlePopUpToggle }: Props) => { name, type, status, - enableDirectIssuance: type === CaType.AZURE_AD_CS ? false : enableDirectIssuance, configuration: configPayload }); } @@ -648,25 +639,6 @@ export const ExternalCaModal = ({ popUp, handlePopUpToggle }: Props) => { name="configuration.azureAdcsConnection" /> )} - {caType === CaType.ACME && ( - { - return ( - - field.onChange(value)} - isChecked={field.value} - > -

Enable Direct Issuance

- - - ); - }} - /> - )}