Merge branch 'main' of https://github.com/Infisical/infisical into feat/suborg-scope-support

frontend/src/const/routes.ts

@@ -294,8 +294,8 @@ export const ROUTE_PATHS = Object.freeze({
   },
   CertManager: {
     CertAuthDetailsByIDPage: setRoute(
-      "/organizations/$orgId/projects/cert-management/$projectId/ca/$caName",
-      "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/cert-management/$projectId/_cert-manager-layout/ca/$caName"
+      "/organizations/$orgId/projects/cert-management/$projectId/ca/$caId",
+      "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/cert-management/$projectId/_cert-manager-layout/ca/$caId"
     ),
     SubscribersPage: setRoute(
       "/organizations/$orgId/projects/cert-management/$projectId/subscribers",

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

@@ -13,12 +13,12 @@ export {
 export {
   useGetAzureAdcsTemplates,
   useGetCa,
-  useGetCaById,
   useGetCaCert,
   useGetCaCerts,
   useGetCaCertTemplates,
   useGetCaCrls,
   useGetCaCsr,
+  useGetInternalCaById,
   useListCasByProjectId,
   useListCasByTypeAndProjectId,
   useListExternalCasByProjectId

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

@@ -27,21 +27,20 @@ import {
 export const useUpdateCa = () => {
   const queryClient = useQueryClient();
   return useMutation<TUnifiedCertificateAuthority, object, TUpdateCertificateAuthorityDTO>({
-    mutationFn: async ({ caName, ...body }) => {
+    mutationFn: async ({ id, ...body }) => {
       const { data } = await apiRequest.patch<TUnifiedCertificateAuthority>(
-        `/api/v1/pki/ca/${body.type}/${caName}`,
+        `/api/v1/cert-manager/ca/${body.type}/${id}`,
         body
       );
 
       return data;
     },
-    onSuccess: ({ projectId, type }, { caName }) => {
-      caKeys.getCaByNameAndProjectId(caName, projectId);
+    onSuccess: ({ projectId, type }, { id }) => {
       queryClient.invalidateQueries({
         queryKey: caKeys.listCasByTypeAndProjectId(type, projectId)
       });
       queryClient.invalidateQueries({
-        queryKey: caKeys.getCaByNameAndProjectId(caName, projectId)
+        queryKey: caKeys.getCaById(id)
       });
       // Invalidate external CAs list
       queryClient.invalidateQueries({
@@ -56,7 +55,7 @@ export const useCreateCa = () => {
   return useMutation<TUnifiedCertificateAuthority, object, TCreateCertificateAuthorityDTO>({
     mutationFn: async (body) => {
       const { data } = await apiRequest.post<TUnifiedCertificateAuthority>(
-        `/api/v1/pki/ca/${body.type}`,
+        `/api/v1/cert-manager/ca/${body.type}`,
         body
       );
       return data;
@@ -76,14 +75,9 @@ export const useCreateCa = () => {
 export const useDeleteCa = () => {
   const queryClient = useQueryClient();
   return useMutation<TUnifiedCertificateAuthority, object, TDeleteCertificateAuthorityDTO>({
-    mutationFn: async ({ caName, type, projectId }) => {
+    mutationFn: async ({ id, type }) => {
       const { data } = await apiRequest.delete<TUnifiedCertificateAuthority>(
-        `/api/v1/pki/ca/${type}/${caName}`,
-        {
-          data: {
-            projectId
-          }
-        }
+        `/api/v1/cert-manager/ca/${type}/${id}`
       );
       return data;
     },
@@ -104,7 +98,7 @@ export const useSignIntermediate = () => {
   return useMutation<TSignIntermediateResponse, object, TSignIntermediateDTO>({
     mutationFn: async (body) => {
       const { data } = await apiRequest.post<TSignIntermediateResponse>(
-        `/api/v1/pki/ca/${body.caId}/sign-intermediate`,
+        `/api/v1/cert-manager/ca/internal/${body.caId}/sign-intermediate`,
         body
       );
       return data;
@@ -117,13 +111,14 @@ export const useImportCaCertificate = (projectId: string) => {
   return useMutation<TImportCaCertificateResponse, object, TImportCaCertificateDTO>({
     mutationFn: async ({ caId, ...body }) => {
       const { data } = await apiRequest.post<TImportCaCertificateResponse>(
-        `/api/v1/pki/ca/${caId}/import-certificate`,
+        `/api/v1/cert-manager/ca/internal/${caId}/import-certificate`,
         body
       );
       return data;
     },
     onSuccess: (_, { caId }) => {
       queryClient.invalidateQueries({ queryKey: projectKeys.getProjectCas({ projectId }) });
+      queryClient.invalidateQueries({ queryKey: caKeys.getCaById(caId) });
       queryClient.invalidateQueries({ queryKey: caKeys.getCaCerts(caId) });
       queryClient.invalidateQueries({ queryKey: caKeys.getCaCert(caId) });
       queryClient.invalidateQueries({
@@ -133,7 +128,7 @@ export const useImportCaCertificate = (projectId: string) => {
   });
 };
 
-// consider rename to issue certificate
+// TODO: DEPRECATE
 export const useCreateCertificate = () => {
   const queryClient = useQueryClient();
   return useMutation<TCreateCertificateResponse, object, TCreateCertificateDTO>({
@@ -157,7 +152,7 @@ export const useCreateCertificateV3 = (options?: { projectId?: string }) => {
   return useMutation<TCreateCertificateV3Response, object, TCreateCertificateV3DTO>({
     mutationFn: async (body) => {
       const { data } = await apiRequest.post<TCreateCertificateV3Response>(
-        "/api/v3/pki/certificates/issue-certificate",
+        "/api/v1/cert-manager/certificates/issue-certificate",
         body
       );
       return data;
@@ -185,7 +180,7 @@ export const useOrderCertificateWithProfile = () => {
   return useMutation<TOrderCertificateResponse, object, TOrderCertificateDTO>({
     mutationFn: async (body) => {
       const { data } = await apiRequest.post<TOrderCertificateResponse>(
-        "/api/v3/pki/certificates/order-certificate",
+        "/api/v1/cert-manager/certificates/order-certificate",
         body
       );
       return data;
@@ -203,7 +198,7 @@ export const useRenewCa = () => {
   return useMutation<TRenewCaResponse, object, TRenewCaDTO>({
     mutationFn: async (body) => {
       const { data } = await apiRequest.post<TRenewCaResponse>(
-        `/api/v1/pki/ca/${body.caId}/renew`,
+        `/api/v1/cert-manager/ca/internal/${body.caId}/renew`,
         body
       );
       return data;

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

@@ -4,7 +4,11 @@ import { apiRequest } from "@app/config/request";
 
 import { TCertificateTemplate } from "../certificateTemplates/types";
 import { CaType } from "./enums";
-import { TAzureAdCsTemplate, TCertificateAuthority, TUnifiedCertificateAuthority } from "./types";
+import {
+  TAzureAdCsTemplate,
+  TInternalCertificateAuthority,
+  TUnifiedCertificateAuthority
+} from "./types";
 
 export const caKeys = {
   getCaById: (caId: string) => [{ caId }, "ca"],
@@ -25,24 +29,16 @@ export const caKeys = {
   ]
 };
 
-export const useGetCa = ({
-  caName,
-  projectId,
-  type
-}: {
-  caName: string;
-  projectId: string;
-  type: CaType;
-}) => {
+export const useGetCa = ({ caId, type }: { caId: string; type: CaType }) => {
   return useQuery({
-    queryKey: caKeys.getCaByNameAndProjectId(caName, projectId),
+    queryKey: caKeys.getCaById(caId),
     queryFn: async () => {
       const { data } = await apiRequest.get<TUnifiedCertificateAuthority>(
-        `/api/v1/pki/ca/${type}/${caName}?projectId=${projectId}`
+        `/api/v1/cert-manager/ca/${type}/${caId}`
       );
       return data;
     },
-    enabled: Boolean(caName && projectId && type)
+    enabled: Boolean(caId && type)
   });
 };
 
@@ -51,7 +47,7 @@ export const useListCasByTypeAndProjectId = (type: CaType, projectId: string) =>
     queryKey: caKeys.listCasByTypeAndProjectId(type, projectId),
     queryFn: async () => {
       const { data } = await apiRequest.get<TUnifiedCertificateAuthority[]>(
-        `/api/v1/pki/ca/${type}?projectId=${projectId}`
+        `/api/v1/cert-manager/ca/${type}?projectId=${projectId}`
       );
 
       return data;
@@ -65,7 +61,7 @@ export const useListCasByProjectId = (projectId: string) => {
     queryFn: async () => {
       const { data } = await apiRequest.get<{
         certificateAuthorities: TUnifiedCertificateAuthority[];
-      }>(`/api/v2/pki/ca?projectId=${projectId}`);
+      }>(`/api/v1/cert-manager/ca?projectId=${projectId}`);
 
       return data.certificateAuthorities;
     }
@@ -78,10 +74,10 @@ export const useListExternalCasByProjectId = (projectId: string) => {
     queryFn: async () => {
       const [acmeResponse, azureAdCsResponse] = await Promise.allSettled([
         apiRequest.get<TUnifiedCertificateAuthority[]>(
-          `/api/v1/pki/ca/${CaType.ACME}?projectId=${projectId}`
+          `/api/v1/cert-manager/ca/${CaType.ACME}?projectId=${projectId}`
         ),
         apiRequest.get<TUnifiedCertificateAuthority[]>(
-          `/api/v1/pki/ca/${CaType.AZURE_AD_CS}?projectId=${projectId}`
+          `/api/v1/cert-manager/ca/${CaType.AZURE_AD_CS}?projectId=${projectId}`
         )
       ]);
 
@@ -100,14 +96,14 @@ export const useListExternalCasByProjectId = (projectId: string) => {
   });
 };
 
-export const useGetCaById = (caId: string) => {
+export const useGetInternalCaById = (caId: string) => {
   return useQuery({
     queryKey: caKeys.getCaById(caId),
     queryFn: async () => {
-      const {
-        data: { ca }
-      } = await apiRequest.get<{ ca: TCertificateAuthority }>(`/api/v1/pki/ca/${caId}`);
-      return ca;
+      const { data } = await apiRequest.get<TInternalCertificateAuthority>(
+        `/api/v1/cert-manager/ca/internal/${caId}`
+      );
+      return data;
     },
     enabled: Boolean(caId)
   });
@@ -124,7 +120,7 @@ export const useGetCaCerts = (caId: string) => {
           serialNumber: string;
           version: number;
         }[]
-      >(`/api/v1/pki/ca/${caId}/ca-certificates`); // TODO: consider updating endpoint structure
+      >(`/api/v1/cert-manager/ca/internal/${caId}/ca-certificates`);
       return data;
     },
     enabled: Boolean(caId)
@@ -139,7 +135,7 @@ export const useGetCaCert = (caId: string) => {
         certificate: string;
         certificateChain: string;
         serialNumber: string;
-      }>(`/api/v1/pki/ca/${caId}/certificate`); // TODO: consider updating endpoint structure
+      }>(`/api/v1/cert-manager/ca/internal/${caId}/certificate`);
       return data;
     },
     enabled: Boolean(caId)
@@ -154,7 +150,7 @@ export const useGetCaCsr = (caId: string) => {
         data: { csr }
       } = await apiRequest.get<{
         csr: string;
-      }>(`/api/v1/pki/ca/${caId}/csr`);
+      }>(`/api/v1/cert-manager/ca/internal/${caId}/csr`);
       return csr;
     },
     enabled: Boolean(caId)
@@ -170,13 +166,14 @@ export const useGetCaCrls = (caId: string) => {
           id: string;
           crl: string;
         }[]
-      >(`/api/v1/pki/ca/${caId}/crls`);
+      >(`/api/v1/cert-manager/ca/internal/${caId}/crls`);
       return data;
     },
     enabled: Boolean(caId)
   });
 };
 
+// TODO: DEPRECATE
 export const useGetCaCertTemplates = (caId: string) => {
   return useQuery({
     queryKey: caKeys.getCaCertTemplates(caId),
@@ -202,7 +199,7 @@ export const useGetAzureAdcsTemplates = ({
     queryFn: async () => {
       const { data } = await apiRequest.get<{
         templates: TAzureAdCsTemplate[];
-      }>(`/api/v1/pki/ca/azure-ad-cs/${caId}/templates?projectId=${projectId}`);
+      }>(`/api/v1/cert-manager/ca/azure-ad-cs/${caId}/templates?projectId=${projectId}`);
       return data;
     },
     enabled: Boolean(caId && projectId)

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

@@ -66,17 +66,19 @@ export type TUnifiedCertificateAuthority =
   | TAzureAdCsCertificateAuthority
   | TInternalCertificateAuthority;
 
-export type TCreateCertificateAuthorityDTO = Omit<TUnifiedCertificateAuthority, "id">;
+export type TCreateCertificateAuthorityDTO = Omit<
+  TUnifiedCertificateAuthority,
+  "id" | "enableDirectIssuance"
+>;
 export type TUpdateCertificateAuthorityDTO = Partial<TUnifiedCertificateAuthority> & {
-  caName: string;
-  projectId: string;
+  id: string;
   type: CaType;
 };
 
 export type TDeleteCertificateAuthorityDTO = {
-  caName: string;
-  type: CaType;
+  id: string;
   projectId: string;
+  type: CaType;
 };
 
 export type TCertificateAuthority = {

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

@@ -17,7 +17,7 @@ export const useCreateCertificateProfile = () => {
     mutationFn: async (data) => {
       const { data: response } = await apiRequest.post<{
         certificateProfile: TCertificateProfile;
-      }>("/api/v1/pki/certificate-profiles", data);
+      }>("/api/v1/cert-manager/certificate-profiles", data);
       return response.certificateProfile;
     },
     onSuccess: (_, { projectId }) => {
@@ -35,7 +35,7 @@ export const useUpdateCertificateProfile = () => {
     mutationFn: async ({ profileId, ...data }) => {
       const { data: response } = await apiRequest.patch<{
         certificateProfile: TCertificateProfile;
-      }>(`/api/v1/pki/certificate-profiles/${profileId}`, data);
+      }>(`/api/v1/cert-manager/certificate-profiles/${profileId}`, data);
       return response.certificateProfile;
     },
     onSuccess: (profile, { profileId }) => {
@@ -56,7 +56,7 @@ export const useDeleteCertificateProfile = () => {
     mutationFn: async ({ profileId }) => {
       const { data: response } = await apiRequest.delete<{
         certificateProfile: TCertificateProfile;
-      }>(`/api/v1/pki/certificate-profiles/${profileId}`);
+      }>(`/api/v1/cert-manager/certificate-profiles/${profileId}`);
       return response.certificateProfile;
     },
     onSuccess: (profile, { profileId }) => {

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

@@ -71,7 +71,7 @@ export const useListCertificateProfiles = ({
       const { data } = await apiRequest.get<{
         certificateProfiles: TCertificateProfile[];
         totalCount: number;
-      }>("/api/v1/pki/certificate-profiles", {
+      }>("/api/v1/cert-manager/certificate-profiles", {
         params: {
           projectId,
           limit,
@@ -93,7 +93,7 @@ export const useGetCertificateProfileById = ({ profileId }: TGetCertificateProfi
     queryFn: async () => {
       const { data } = await apiRequest.get<{
         certificateProfile: TCertificateProfileWithDetails;
-      }>(`/api/v1/pki/certificate-profiles/${profileId}`);
+      }>(`/api/v1/cert-manager/certificate-profiles/${profileId}`);
       return data.certificateProfile;
     },
     enabled: Boolean(profileId)
@@ -109,7 +109,7 @@ export const useGetCertificateProfileBySlug = ({
     queryFn: async () => {
       const { data } = await apiRequest.get<{
         certificateProfile: TCertificateProfile;
-      }>(`/api/v1/pki/certificate-profiles/slug/${slug}`, {
+      }>(`/api/v1/cert-manager/certificate-profiles/slug/${slug}`, {
         params: { projectId }
       });
       return data.certificateProfile;
@@ -125,7 +125,7 @@ export const useRevealAcmeEabSecret = ({ profileId }: TRevealAcmeEabSecretDTO) =
       const { data } = await apiRequest.get<{
         eabKid: string;
         eabSecret: string;
-      }>(`/api/v1/pki/certificate-profiles/${profileId}/acme/eab-secret/reveal`);
+      }>(`/api/v1/cert-manager/certificate-profiles/${profileId}/acme/eab-secret/reveal`);
       return data;
     },
     enabled: Boolean(profileId)
@@ -144,7 +144,7 @@ export const useGetProfileCertificates = ({
     queryFn: async () => {
       const { data } = await apiRequest.get<{
         certificates: TProfileCertificate[];
-      }>(`/api/v1/pki/certificate-profiles/${profileId}/certificates`, {
+      }>(`/api/v1/cert-manager/certificate-profiles/${profileId}/certificates`, {
         params: {
           offset,
           limit,

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

@@ -21,6 +21,7 @@ import {
   TUpdateEstConfigDTO
 } from "./types";
 
+// TODO: DEPRECATE
 export const useCreateCertTemplate = () => {
   const queryClient = useQueryClient();
   return useMutation<TCertificateTemplate, object, TCreateCertificateTemplateDTO>({
@@ -40,6 +41,7 @@ export const useCreateCertTemplate = () => {
   });
 };
 
+// TODO: DEPRECATE
 export const useUpdateCertTemplate = () => {
   const queryClient = useQueryClient();
   return useMutation<TCertificateTemplate, object, TUpdateCertificateTemplateDTO>({
@@ -61,6 +63,7 @@ export const useUpdateCertTemplate = () => {
   });
 };
 
+// TODO: DEPRECATE
 export const useDeleteCertTemplate = () => {
   const queryClient = useQueryClient();
   return useMutation<TCertificateTemplate, object, TDeleteCertificateTemplateDTO>({
@@ -147,6 +150,7 @@ export const useDeleteCertTemplateV2 = () => {
   });
 };
 
+// TODO: DEPRECATE
 export const useCreateEstConfig = () => {
   const queryClient = useQueryClient();
   return useMutation<object, object, TCreateEstConfigDTO>({
@@ -165,6 +169,7 @@ export const useCreateEstConfig = () => {
   });
 };
 
+// TODO: DEPRECATE
 export const useUpdateEstConfig = () => {
   const queryClient = useQueryClient();
   return useMutation<object, object, TUpdateEstConfigDTO>({
@@ -193,7 +198,7 @@ export const useCreateCertificateTemplateV2WithPolicies = () => {
     mutationFn: async (data) => {
       const { data: response } = await apiRequest.post<{
         certificateTemplate: TCertificateTemplateV2WithPolicies;
-      }>("/api/v2/certificate-templates", data);
+      }>("/api/v1/cert-manager/certificate-templates", data);
       return response.certificateTemplate;
     },
     onSuccess: (_, { projectId }) => {
@@ -214,7 +219,7 @@ export const useUpdateCertificateTemplateV2WithPolicies = () => {
     mutationFn: async ({ templateId, ...data }) => {
       const { data: response } = await apiRequest.patch<{
         certificateTemplate: TCertificateTemplateV2WithPolicies;
-      }>(`/api/v2/certificate-templates/${templateId}`, data);
+      }>(`/api/v1/cert-manager/certificate-templates/${templateId}`, data);
       return response.certificateTemplate;
     },
     onSuccess: (template, { templateId }) => {
@@ -238,7 +243,7 @@ export const useDeleteCertificateTemplateV2WithPolicies = () => {
     mutationFn: async ({ templateId }) => {
       const { data: response } = await apiRequest.delete<{
         certificateTemplate: TCertificateTemplateV2WithPolicies;
-      }>(`/api/v2/certificate-templates/${templateId}`);
+      }>(`/api/v1/cert-manager/certificate-templates/${templateId}`);
       return response.certificateTemplate;
     },
     onSuccess: (template, { templateId }) => {

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

@@ -31,6 +31,7 @@ export const certTemplateKeys = {
   getTemplateV2ById: (id: string) => ["cert-template-v2", id]
 };
 
+// TODO: DEPRECATE
 export const useGetCertTemplate = (id: string) => {
   return useQuery({
     queryKey: certTemplateKeys.getCertTemplateById(id),
@@ -44,6 +45,7 @@ export const useGetCertTemplate = (id: string) => {
   });
 };
 
+// TODO: DEPRECATE
 export const useListCertificateTemplates = ({
   limit = 100,
   offset = 0,
@@ -67,6 +69,7 @@ export const useListCertificateTemplates = ({
   });
 };
 
+// TODO: DEPRECATE
 export const useGetEstConfig = (certificateTemplateId: string) => {
   return useQuery({
     queryKey: certTemplateKeys.getEstConfig(certificateTemplateId),
@@ -92,7 +95,7 @@ export const useListCertificateTemplatesV2 = ({
       const { data } = await apiRequest.get<{
         certificateTemplates: TCertificateTemplateV2WithPolicies[];
         totalCount: number;
-      }>("/api/v2/certificate-templates", {
+      }>("/api/v1/cert-manager/certificate-templates", {
         params: {
           projectId,
           limit,
@@ -113,7 +116,7 @@ export const useGetCertificateTemplateV2ById = ({
     queryFn: async () => {
       const { data } = await apiRequest.get<{
         certificateTemplate: TCertificateTemplateV2WithPolicies;
-      }>(`/api/v2/certificate-templates/${templateId}`);
+      }>(`/api/v1/cert-manager/certificate-templates/${templateId}`);
       return data.certificateTemplate;
     },
     enabled: Boolean(templateId)

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

@@ -19,11 +19,11 @@ import {
 export const useDeleteCert = () => {
   const queryClient = useQueryClient();
   return useMutation<TCertificate, object, TDeleteCertDTO>({
-    mutationFn: async ({ serialNumber }) => {
+    mutationFn: async ({ id }) => {
       const {
         data: { certificate }
       } = await apiRequest.delete<{ certificate: TCertificate }>(
-        `/api/v1/pki/certificates/${serialNumber}`
+        `/api/v1/cert-manager/certificates/${id}`
       );
       return certificate;
     },
@@ -47,11 +47,11 @@ export const useDeleteCert = () => {
 export const useRevokeCert = () => {
   const queryClient = useQueryClient();
   return useMutation<TCertificate, object, TRevokeCertDTO>({
-    mutationFn: async ({ serialNumber, revocationReason }) => {
+    mutationFn: async ({ id, revocationReason }) => {
       const {
         data: { certificate }
       } = await apiRequest.post<{ certificate: TCertificate }>(
-        `/api/v1/pki/certificates/${serialNumber}/revoke`,
+        `/api/v1/cert-manager/certificates/${id}/revoke`,
         {
           revocationReason
         }
@@ -80,7 +80,7 @@ export const useImportCertificate = () => {
   return useMutation<TImportCertificateResponse, object, TImportCertificateDTO>({
     mutationFn: async (body) => {
       const { data } = await apiRequest.post<TImportCertificateResponse>(
-        "/api/v1/pki/certificates/import-certificate",
+        "/api/v1/cert-manager/certificates/import-certificate",
         body
       );
       return data;
@@ -98,7 +98,7 @@ export const useRenewCertificate = () => {
   return useMutation<TRenewCertificateResponse, object, TRenewCertificateDTO>({
     mutationFn: async ({ certificateId }) => {
       const { data } = await apiRequest.post<TRenewCertificateResponse>(
-        `/api/v3/pki/certificates/${certificateId}/renew`,
+        `/api/v1/cert-manager/certificates/${certificateId}/renew`,
         {}
       );
       return data;
@@ -131,7 +131,7 @@ export const useUpdateRenewalConfig = () => {
   >({
     mutationFn: async ({ certificateId, renewBeforeDays, enableAutoRenewal }) => {
       const { data } = await apiRequest.patch<{ message: string; renewBeforeDays?: number }>(
-        `/api/v3/pki/certificates/${certificateId}/config`,
+        `/api/v1/cert-manager/certificates/${certificateId}/config`,
         { renewBeforeDays, enableAutoRenewal }
       );
       return data;
@@ -149,10 +149,10 @@ export const useUpdateRenewalConfig = () => {
 
 export const useDownloadCertPkcs12 = () => {
   return useMutation<void, object, TDownloadPkcs12DTO>({
-    mutationFn: async ({ serialNumber, projectSlug, password, alias }) => {
+    mutationFn: async ({ certificateId, projectSlug, password, alias }) => {
       try {
         const response = await apiRequest.post(
-          `/api/v1/pki/certificates/${serialNumber}/pkcs12`,
+          `/api/v1/cert-manager/certificates/${certificateId}/pkcs12`,
           {
             password,
             alias
@@ -168,7 +168,7 @@ export const useDownloadCertPkcs12 = () => {
         const url = window.URL.createObjectURL(blob);
         const link = document.createElement("a");
         link.href = url;
-        link.download = `certificate-${serialNumber}.p12`;
+        link.download = `certificate-${certificateId}.p12`;
         document.body.appendChild(link);
         link.click();
         document.body.removeChild(link);

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

@@ -24,13 +24,13 @@ export type TCertificate = {
 };
 
 export type TDeleteCertDTO = {
+  id: string;
   projectId: string;
-  serialNumber: string;
 };
 
 export type TRevokeCertDTO = {
   projectId: string;
-  serialNumber: string;
+  id: string;
   revocationReason: string;
 };
 
@@ -74,7 +74,7 @@ export type TUpdateRenewalConfigDTO = {
 };
 
 export type TDownloadPkcs12DTO = {
-  serialNumber: string;
+  certificateId: string;
   projectSlug: string;
   password: string;
   alias: string;

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

@@ -6,6 +6,7 @@ import { projectKeys } from "../projects";
 import { pkiAlertKeys } from "./queries";
 import { TCreatePkiAlertDTO, TDeletePkiAlertDTO, TPkiAlert, TUpdatePkiAlertDTO } from "./types";
 
+// TODO: DEPRECATE
 export const useCreatePkiAlert = () => {
   const queryClient = useQueryClient();
   return useMutation<TPkiAlert, object, TCreatePkiAlertDTO>({
@@ -19,6 +20,7 @@ export const useCreatePkiAlert = () => {
   });
 };
 
+// TODO: DEPRECATE
 export const useUpdatePkiAlert = () => {
   const queryClient = useQueryClient();
   return useMutation<TPkiAlert, object, TUpdatePkiAlertDTO>({
@@ -36,6 +38,7 @@ export const useUpdatePkiAlert = () => {
   });
 };
 
+// TODO: DEPRECATE
 export const useDeletePkiAlert = () => {
   const queryClient = useQueryClient();
   return useMutation<TPkiAlert, object, TDeletePkiAlertDTO>({

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

@@ -8,6 +8,7 @@ export const pkiAlertKeys = {
   getPkiAlertById: (alertId: string) => [{ alertId }, "alert"]
 };
 
+// TODO: DEPRECATE
 export const useGetPkiAlertById = (alertId: string) => {
   return useQuery({
     queryKey: pkiAlertKeys.getPkiAlertById(alertId),

frontend/src/hooks/api/pkiAlertsV2/mutations.ts

@@ -11,7 +11,7 @@ export const useCreatePkiAlertV2 = () => {
   return useMutation<TPkiAlertV2, unknown, TCreatePkiAlertV2>({
     mutationFn: async (data) => {
       const { data: response } = await apiRequest.post<{ alert: TPkiAlertV2 }>(
-        "/api/v2/pki/alerts",
+        "/api/v1/cert-manager/alerts",
         data
       );
       return response.alert;
@@ -30,7 +30,7 @@ export const useUpdatePkiAlertV2 = () => {
   return useMutation<TPkiAlertV2, unknown, TUpdatePkiAlertV2>({
     mutationFn: async ({ alertId, ...data }) => {
       const { data: response } = await apiRequest.patch<{ alert: TPkiAlertV2 }>(
-        `/api/v2/pki/alerts/${alertId}`,
+        `/api/v1/cert-manager/alerts/${alertId}`,
         data
       );
       return response.alert;
@@ -52,7 +52,7 @@ export const useDeletePkiAlertV2 = () => {
   return useMutation<TPkiAlertV2, unknown, TDeletePkiAlertV2>({
     mutationFn: async ({ alertId }) => {
       const { data } = await apiRequest.delete<{ alert: TPkiAlertV2 }>(
-        `/api/v2/pki/alerts/${alertId}`
+        `/api/v1/cert-manager/alerts/${alertId}`
       );
       return data.alert;
     },

frontend/src/hooks/api/pkiAlertsV2/queries.ts

@@ -24,14 +24,16 @@ export const pkiAlertsV2Keys = {
 };
 
 const fetchPkiAlertsV2 = async (params: TGetPkiAlertsV2): Promise<TGetPkiAlertsV2Response> => {
-  const { data } = await apiRequest.get<TGetPkiAlertsV2Response>("/api/v2/pki/alerts", {
+  const { data } = await apiRequest.get<TGetPkiAlertsV2Response>("/api/v1/cert-manager/alerts", {
     params
   });
   return data;
 };
 
 const fetchPkiAlertV2ById = async ({ alertId }: TGetPkiAlertV2ById): Promise<TPkiAlertV2> => {
-  const { data } = await apiRequest.get<{ alert: TPkiAlertV2 }>(`/api/v2/pki/alerts/${alertId}`);
+  const { data } = await apiRequest.get<{ alert: TPkiAlertV2 }>(
+    `/api/v1/cert-manager/alerts/${alertId}`
+  );
   return data.alert;
 };
 
@@ -40,7 +42,7 @@ const fetchPkiAlertV2MatchingCertificates = async (
 ): Promise<TGetPkiAlertV2MatchingCertificatesResponse> => {
   const { alertId, ...queryParams } = params;
   const { data } = await apiRequest.get<TGetPkiAlertV2MatchingCertificatesResponse>(
-    `/api/v2/pki/alerts/${alertId}/certificates`,
+    `/api/v1/cert-manager/alerts/${alertId}/certificates`,
     { params: queryParams }
   );
   return data;
@@ -50,7 +52,7 @@ const fetchPkiAlertV2CurrentMatchingCertificates = async (
   params: TGetPkiAlertV2CurrentMatchingCertificates
 ): Promise<TGetPkiAlertV2CurrentMatchingCertificatesResponse> => {
   const { data } = await apiRequest.post<TGetPkiAlertV2CurrentMatchingCertificatesResponse>(
-    "/api/v2/pki/alerts/preview/certificates",
+    "/api/v1/cert-manager/alerts/preview/certificates",
     params
   );
   return data;

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

@@ -17,7 +17,10 @@ export const useCreatePkiSync = () => {
   const queryClient = useQueryClient();
   return useMutation({
     mutationFn: async ({ destination, ...params }: TCreatePkiSyncDTO) => {
-      const { data } = await apiRequest.post<TPkiSync>(`/api/v1/pki/syncs/${destination}`, params);
+      const { data } = await apiRequest.post<TPkiSync>(
+        `/api/v1/cert-manager/syncs/${destination}`,
+        params
+      );
 
       return data;
     },
@@ -31,7 +34,7 @@ export const useUpdatePkiSync = () => {
   return useMutation({
     mutationFn: async ({ syncId, projectId, destination, ...params }: TUpdatePkiSyncDTO) => {
       const { data } = await apiRequest.patch<TPkiSync>(
-        `/api/v1/pki/syncs/${destination}/${syncId}`,
+        `/api/v1/cert-manager/syncs/${destination}/${syncId}`,
         params,
         { params: { projectId } }
       );
@@ -49,9 +52,12 @@ export const useDeletePkiSync = () => {
   const queryClient = useQueryClient();
   return useMutation({
     mutationFn: async ({ syncId, projectId, destination }: TDeletePkiSyncDTO) => {
-      const { data } = await apiRequest.delete(`/api/v1/pki/syncs/${destination}/${syncId}`, {
-        params: { projectId }
-      });
+      const { data } = await apiRequest.delete(
+        `/api/v1/cert-manager/syncs/${destination}/${syncId}`,
+        {
+          params: { projectId }
+        }
+      );
 
       return data;
     },
@@ -66,7 +72,9 @@ export const useTriggerPkiSyncSyncCertificates = () => {
   const queryClient = useQueryClient();
   return useMutation({
     mutationFn: async ({ syncId, destination }: TTriggerPkiSyncSyncCertificatesDTO) => {
-      const { data } = await apiRequest.post(`/api/v1/pki/syncs/${destination}/${syncId}/sync`);
+      const { data } = await apiRequest.post(
+        `/api/v1/cert-manager/syncs/${destination}/${syncId}/sync`
+      );
 
       return data;
     },
@@ -111,7 +119,9 @@ export const useTriggerPkiSyncImportCertificates = () => {
   const queryClient = useQueryClient();
   return useMutation({
     mutationFn: async ({ syncId, destination }: TTriggerPkiSyncImportCertificatesDTO) => {
-      const { data } = await apiRequest.post(`/api/v1/pki/syncs/${destination}/${syncId}/import`);
+      const { data } = await apiRequest.post(
+        `/api/v1/cert-manager/syncs/${destination}/${syncId}/import`
+      );
 
       return data;
     },
@@ -157,7 +167,7 @@ export const useTriggerPkiSyncRemoveCertificates = () => {
   return useMutation({
     mutationFn: async ({ syncId, destination }: TTriggerPkiSyncRemoveCertificatesDTO) => {
       const { data } = await apiRequest.post(
-        `/api/v1/pki/syncs/${destination}/${syncId}/remove-certificates`
+        `/api/v1/cert-manager/syncs/${destination}/${syncId}/remove-certificates`
       );
 
       return data;
@@ -209,9 +219,12 @@ export const useAddCertificatesToPkiSync = () => {
       pkiSyncId: string;
       certificateIds: string[];
     }) => {
-      const { data } = await apiRequest.post(`/api/v1/pki/syncs/${pkiSyncId}/certificates`, {
-        certificateIds
-      });
+      const { data } = await apiRequest.post(
+        `/api/v1/cert-manager/syncs/${pkiSyncId}/certificates`,
+        {
+          certificateIds
+        }
+      );
 
       return data;
     },
@@ -231,9 +244,12 @@ export const useRemoveCertificatesFromPkiSync = () => {
       pkiSyncId: string;
       certificateIds: string[];
     }) => {
-      const { data } = await apiRequest.delete(`/api/v1/pki/syncs/${pkiSyncId}/certificates`, {
-        data: { certificateIds }
-      });
+      const { data } = await apiRequest.delete(
+        `/api/v1/cert-manager/syncs/${pkiSyncId}/certificates`,
+        {
+          data: { certificateIds }
+        }
+      );
 
       return data;
     },

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

@@ -37,7 +37,9 @@ export const usePkiSyncOptions = (
   return useQuery({
     queryKey: pkiSyncKeys.options(),
     queryFn: async () => {
-      const { data } = await apiRequest.get<TListPkiSyncOptions>("/api/v1/pki/syncs/options");
+      const { data } = await apiRequest.get<TListPkiSyncOptions>(
+        "/api/v1/cert-manager/syncs/options"
+      );
 
       return data.pkiSyncOptions;
     },
@@ -58,7 +60,7 @@ export const fetchPkiSyncsByProjectId = async (projectId: string, certificateId?
     params.certificateId = certificateId;
   }
 
-  const { data } = await apiRequest.get<TListPkiSyncs>("/api/v1/pki/syncs", {
+  const { data } = await apiRequest.get<TListPkiSyncs>("/api/v1/cert-manager/syncs", {
     params
   });
 
@@ -110,7 +112,7 @@ export const useGetPkiSync = (
   return useQuery({
     queryKey: pkiSyncKeys.byId(syncId, projectId),
     queryFn: async () => {
-      const { data } = await apiRequest.get<TPkiSync>(`/api/v1/pki/syncs/${syncId}`, {
+      const { data } = await apiRequest.get<TPkiSync>(`/api/v1/cert-manager/syncs/${syncId}`, {
         params: { projectId }
       });
 
@@ -138,7 +140,7 @@ export const useListPkiSyncCertificates = (
   return useQuery({
     queryKey: pkiSyncKeys.certificates(syncId, { offset, limit }),
     queryFn: async () => {
-      const { data } = await apiRequest.get(`/api/v1/pki/syncs/${syncId}/certificates`, {
+      const { data } = await apiRequest.get(`/api/v1/cert-manager/syncs/${syncId}/certificates`, {
         params: { offset, limit }
       });
       return {

frontend/src/pages/cert-manager/CertAuthDetailsByIDPage/CertAuthDetailsByIDPage.tsx

@@ -44,10 +44,9 @@ const Page = () => {
   const params = useParams({
     from: ROUTE_PATHS.CertManager.CertAuthDetailsByIDPage.id
   });
-  const { caName } = params as { caName: string };
+  const { caId } = params as { caId: string };
   const { data } = useGetCa({
-    caName,
-    projectId: currentProject?.id || "",
+    caId,
     type: CaType.INTERNAL
   }) as { data: TInternalCertificateAuthority };
 
@@ -66,7 +65,7 @@ const Page = () => {
     if (!currentProject?.slug) return;
 
     await deleteCa({
-      caName,
+      id: data.id,
       projectId: currentProject.id,
       type: CaType.INTERNAL
     });
@@ -138,7 +137,7 @@ const Page = () => {
           </PageHeader>
           <div className="flex">
             <div className="mr-4 w-96">
-              <CaDetailsSection caName={data.name} handlePopUpOpen={handlePopUpOpen} />
+              <CaDetailsSection caId={data.id} handlePopUpOpen={handlePopUpOpen} />
             </div>
             <div className="w-full">
               <CaCertificatesSection caId={data.id} />

frontend/src/pages/cert-manager/CertAuthDetailsByIDPage/components/CaCrlsSection/CaCrlsTable.tsx

@@ -51,7 +51,7 @@ export const CaCrlsTable = ({ caId }: Props) => {
                 <Tr key={`ca-crl-${id}`}>
                   <Td>
                     <div className="flex items-center">
-                      {`${window.origin}/api/v1/pki/crl/${id}`}
+                      {`${window.origin}/api/v1/cert-manager/crl/${id}`}
                     </div>
                   </Td>
                   {/* <Td>{format(new Date(caCrlObj.thisUpdate), "yyyy-MM-dd")}</Td> */}

frontend/src/pages/cert-manager/CertAuthDetailsByIDPage/components/CaDetailsSection.tsx

@@ -4,7 +4,7 @@ import { format } from "date-fns";
 
 import { ProjectPermissionCan } from "@app/components/permissions";
 import { Button, IconButton, Tooltip } from "@app/components/v2";
-import { ProjectPermissionActions, ProjectPermissionSub, useProject } from "@app/context";
+import { ProjectPermissionActions, ProjectPermissionSub } from "@app/context";
 import { useTimedReset } from "@app/hooks";
 import { CaStatus, CaType, InternalCaType, useGetCa } from "@app/hooks/api";
 import { caStatusToNameMap, caTypeToNameMap } from "@app/hooks/api/ca/constants";
@@ -13,15 +13,14 @@ import { certKeyAlgorithmToNameMap } from "@app/hooks/api/certificates/constants
 import { UsePopUpState } from "@app/hooks/usePopUp";
 
 type Props = {
-  caName: string;
+  caId: string;
   handlePopUpOpen: (
     popUpName: keyof UsePopUpState<["ca", "renewCa", "installCaCert"]>,
     data?: object
   ) => void;
 };
 
-export const CaDetailsSection = ({ caName, handlePopUpOpen }: Props) => {
-  const { currentProject } = useProject();
+export const CaDetailsSection = ({ caId, handlePopUpOpen }: Props) => {
   const [copyTextId, isCopyingId, setCopyTextId] = useTimedReset<string>({
     initialState: "Copy ID to clipboard"
   });
@@ -30,8 +29,7 @@ export const CaDetailsSection = ({ caName, handlePopUpOpen }: Props) => {
   });
 
   const { data } = useGetCa({
-    caName,
-    projectId: currentProject.id,
+    caId,
     type: CaType.INTERNAL
   });
 
@@ -53,7 +51,7 @@ export const CaDetailsSection = ({ caName, handlePopUpOpen }: Props) => {
                   onClick={(e) => {
                     e.stopPropagation();
                     handlePopUpOpen("ca", {
-                      name: ca.name
+                      caId: ca.id
                     });
                   }}
                 >
@@ -154,10 +152,6 @@ export const CaDetailsSection = ({ caName, handlePopUpOpen }: Props) => {
               : "-"}
           </p>
         </div>
-        <div className="mb-4">
-          <p className="text-sm font-medium text-mineshaft-300">Enable Direct Issuance</p>
-          <p className="text-sm text-mineshaft-300">{ca.enableDirectIssuance ? "True" : "False"}</p>
-        </div>
         {ca.status === CaStatus.ACTIVE && (
           <ProjectPermissionCan
             I={ProjectPermissionActions.Edit}

frontend/src/pages/cert-manager/CertAuthDetailsByIDPage/route.tsx

@@ -3,7 +3,7 @@ import { createFileRoute, linkOptions } from "@tanstack/react-router";
 import { CertAuthDetailsByIDPage } from "./CertAuthDetailsByIDPage";
 
 export const Route = createFileRoute(
-  "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/cert-management/$projectId/_cert-manager-layout/ca/$caName"
+  "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/cert-management/$projectId/_cert-manager-layout/ca/$caId"
 )({
   component: CertAuthDetailsByIDPage,
   beforeLoad: ({ context, params }) => {
@@ -21,7 +21,7 @@ export const Route = createFileRoute(
           })
         },
         {
-          label: params.caName
+          label: params.caId
         }
       ]
     };

frontend/src/pages/cert-manager/CertificateAuthoritiesPage/components/CaInstallCertModal/InternalCaInstallForm.tsx

@@ -9,8 +9,8 @@ import { Button, FormControl, Input, Select, SelectItem } from "@app/components/
 import { useProject } from "@app/context";
 import {
   CaStatus,
-  useGetCaById,
   useGetCaCsr,
+  useGetInternalCaById,
   useImportCaCertificate,
   useListWorkspaceCas,
   useSignIntermediate
@@ -51,7 +51,7 @@ export const InternalCaInstallForm = ({ caId, handlePopUpToggle }: Props) => {
     projectId: currentProject.id,
     status: CaStatus.ACTIVE
   });
-  const { data: ca } = useGetCaById(caId);
+  const { data: ca } = useGetInternalCaById(caId);
   const { data: csr } = useGetCaCsr(caId);
 
   const { mutateAsync: signIntermediate } = useSignIntermediate();
@@ -83,18 +83,21 @@ export const InternalCaInstallForm = ({ caId, handlePopUpToggle }: Props) => {
 
   const parentCaId = watch("parentCaId");
 
-  const { data: parentCa } = useGetCaById(parentCaId);
+  const { data: parentCa } = useGetInternalCaById(parentCaId);
 
   useEffect(() => {
-    if (parentCa?.maxPathLength) {
+    if (parentCa?.configuration.maxPathLength) {
       setValue(
         "maxPathLength",
-        (parentCa.maxPathLength === -1 ? 3 : parentCa.maxPathLength - 1).toString()
+        (parentCa.configuration.maxPathLength === -1
+          ? 3
+          : parentCa.configuration.maxPathLength - 1
+        ).toString()
       );
     }
 
-    if (parentCa?.notAfter) {
-      const parentCaNotAfter = new Date(parentCa.notAfter);
+    if (parentCa?.configuration.notAfter) {
+      const parentCaNotAfter = new Date(parentCa.configuration.notAfter);
       const middleDate = getMiddleDate(new Date(), parentCaNotAfter);
       setValue("notAfter", format(middleDate, "yyyy-MM-dd"));
     }
@@ -197,7 +200,7 @@ export const InternalCaInstallForm = ({ caId, handlePopUpToggle }: Props) => {
               onValueChange={onChange}
               className="w-full"
             >
-              {generatePathLengthOpts(parentCa?.maxPathLength || 0).map((value) => (
+              {generatePathLengthOpts(parentCa?.configuration.maxPathLength || 0).map((value) => (
                 <SelectItem value={String(value)} key={`ca-path-length-${value}`}>
                   {`${value}`}
                 </SelectItem>

frontend/src/pages/cert-manager/CertificateAuthoritiesPage/components/CaModal.tsx

@@ -46,7 +46,6 @@ const schema = z
     name: slugSchema({
       field: "Name"
     }),
-    enableDirectIssuance: z.boolean(),
     status: z.nativeEnum(CaStatus),
     configuration: z
       .object({
@@ -80,8 +79,7 @@ const caTypes = [
 export const CaModal = ({ popUp, handlePopUpToggle }: Props) => {
   const { currentProject } = useProject();
   const { data: ca } = useGetCa({
-    caName: (popUp?.ca?.data as { name: string })?.name || "",
-    projectId: currentProject?.id || "",
+    caId: (popUp?.ca?.data as { caId: string })?.caId || "",
     type: CaType.INTERNAL
   });
 
@@ -100,7 +98,6 @@ export const CaModal = ({ popUp, handlePopUpToggle }: Props) => {
       type: CaType.INTERNAL,
       name: "",
       status: CaStatus.ACTIVE,
-      enableDirectIssuance: true,
       configuration: {
         type: InternalCaType.ROOT,
         organization: "",
@@ -124,7 +121,6 @@ export const CaModal = ({ popUp, handlePopUpToggle }: Props) => {
         type: ca.type,
         name: ca.name,
         status: ca.status,
-        enableDirectIssuance: ca.enableDirectIssuance,
         configuration: {
           type: ca.configuration.type,
           organization: ca.configuration.organization,
@@ -151,7 +147,6 @@ export const CaModal = ({ popUp, handlePopUpToggle }: Props) => {
         type: CaType.INTERNAL,
         name: "",
         status: CaStatus.ACTIVE,
-        enableDirectIssuance: false,
         configuration: {
           type: InternalCaType.ROOT,
           organization: "",
@@ -168,24 +163,16 @@ export const CaModal = ({ popUp, handlePopUpToggle }: Props) => {
     }
   }, [ca]);
 
-  const onFormSubmit = async ({
-    type,
-    name,
-    enableDirectIssuance,
-    status,
-    configuration
-  }: FormData) => {
+  const onFormSubmit = async ({ type, name, status, configuration }: FormData) => {
     if (!currentProject?.slug) return;
 
     if (ca) {
       // update
       await updateMutateAsync({
-        caName: ca.name,
-        projectId: currentProject.id,
+        id: ca.id,
         name,
         type: CaType.INTERNAL,
-        status,
-        enableDirectIssuance
+        status
       });
     } else {
       // create
@@ -194,7 +181,6 @@ export const CaModal = ({ popUp, handlePopUpToggle }: Props) => {
         name,
         type,
         status,
-        enableDirectIssuance,
         configuration: {
           ...configuration,
           maxPathLength: Number(configuration.maxPathLength)

frontend/src/pages/cert-manager/CertificateAuthoritiesPage/components/CaSection.tsx

@@ -26,10 +26,10 @@ export const CaSection = () => {
     "caStatus" // enable / disable
   ] as const);
 
-  const onRemoveCaSubmit = async (caName: string) => {
+  const onRemoveCaSubmit = async (id: string) => {
     if (!currentProject?.slug) return;
 
-    await deleteCa({ caName, projectId: currentProject.id, type: CaType.INTERNAL });
+    await deleteCa({ id, projectId: currentProject.id, type: CaType.INTERNAL });
 
     createNotification({
       text: "Successfully deleted CA",
@@ -39,10 +39,10 @@ export const CaSection = () => {
     handlePopUpClose("deleteCa");
   };
 
-  const onUpdateCaStatus = async ({ caName, status }: { caName: string; status: CaStatus }) => {
+  const onUpdateCaStatus = async ({ caId, status }: { caId: string; status: CaStatus }) => {
     if (!currentProject?.slug) return;
 
-    await updateCa({ caName, projectId: currentProject.id, type: CaType.INTERNAL, status });
+    await updateCa({ id: caId, type: CaType.INTERNAL, status });
 
     createNotification({
       text: `Successfully ${status === CaStatus.ACTIVE ? "enabled" : "disabled"} CA`,
@@ -85,9 +85,7 @@ export const CaSection = () => {
         subTitle="This action will delete other CAs and certificates below it in your CA hierarchy."
         onChange={(isOpen) => handlePopUpToggle("deleteCa", isOpen)}
         deleteKey="confirm"
-        onDeleteApproved={() =>
-          onRemoveCaSubmit((popUp?.deleteCa?.data as { caName: string })?.caName)
-        }
+        onDeleteApproved={() => onRemoveCaSubmit((popUp?.deleteCa?.data as { caId: string })?.caId)}
       />
       <DeleteActionModal
         isOpen={popUp.caStatus.isOpen}
@@ -104,7 +102,7 @@ export const CaSection = () => {
         onChange={(isOpen) => handlePopUpToggle("caStatus", isOpen)}
         deleteKey="confirm"
         onDeleteApproved={() =>
-          onUpdateCaStatus(popUp?.caStatus?.data as { caName: string; status: CaStatus })
+          onUpdateCaStatus(popUp?.caStatus?.data as { caId: string; status: CaStatus })
         }
       />
     </div>

frontend/src/pages/cert-manager/CertificateAuthoritiesPage/components/CaTable.tsx

@@ -81,11 +81,11 @@ export const CaTable = ({ handlePopUpOpen }: Props) => {
                     key={`ca-${ca.id}`}
                     onClick={() =>
                       navigate({
-                        to: "/organizations/$orgId/projects/cert-management/$projectId/ca/$caName",
+                        to: "/organizations/$orgId/projects/cert-management/$projectId/ca/$caId",
                         params: {
                           orgId: currentOrg.id,
                           projectId: currentProject.id,
-                          caName: ca.name
+                          caId: ca.id
                         }
                       })
                     }
@@ -180,7 +180,7 @@ export const CaTable = ({ handlePopUpOpen }: Props) => {
                                   onClick={(e) => {
                                     e.stopPropagation();
                                     handlePopUpOpen("caStatus", {
-                                      caName: ca.name,
+                                      caId: ca.id,
                                       status:
                                         ca.status === CaStatus.ACTIVE
                                           ? CaStatus.DISABLED
@@ -207,7 +207,7 @@ export const CaTable = ({ handlePopUpOpen }: Props) => {
                                 onClick={(e) => {
                                   e.stopPropagation();
                                   handlePopUpOpen("deleteCa", {
-                                    caName: ca.name
+                                    caId: ca.id
                                   });
                                 }}
                                 disabled={!isAllowed}

frontend/src/pages/cert-manager/CertificateAuthoritiesPage/components/ExternalCaModal.tsx

@@ -14,8 +14,7 @@ import {
   Modal,
   ModalContent,
   Select,
-  SelectItem,
-  Switch
+  SelectItem
 } from "@app/components/v2";
 import { useProject } from "@app/context";
 import { APP_CONNECTION_MAP } from "@app/helpers/appConnections";
@@ -63,7 +62,6 @@ const baseSchema = z.object({
   name: slugSchema({
     field: "Name"
   }),
-  enableDirectIssuance: z.boolean(),
   status: z.nativeEnum(CaStatus)
 });
 
@@ -135,8 +133,7 @@ export const ExternalCaModal = ({ popUp, handlePopUpToggle }: Props) => {
   const { currentProject } = useProject();
 
   const { data: ca, isLoading: isCaLoading } = useGetCa({
-    caName: (popUp?.ca?.data as { name: string })?.name || "",
-    projectId: currentProject?.id || "",
+    caId: (popUp?.ca?.data as { caId: string })?.caId || "",
     type: (popUp?.ca?.data as { type: CaType })?.type || ""
   });
 
@@ -172,7 +169,6 @@ export const ExternalCaModal = ({ popUp, handlePopUpToggle }: Props) => {
           type: CaType.AZURE_AD_CS,
           name: "",
           status: CaStatus.ACTIVE,
-          enableDirectIssuance: false,
           configuration: {
             azureAdcsConnection: {
               id: "",
@@ -185,7 +181,6 @@ export const ExternalCaModal = ({ popUp, handlePopUpToggle }: Props) => {
           type: CaType.ACME,
           name: "",
           status: CaStatus.ACTIVE,
-          enableDirectIssuance: true,
           configuration: {
             dnsAppConnection: {
               id: "",
@@ -275,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,
@@ -300,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,
@@ -315,7 +308,6 @@ export const ExternalCaModal = ({ popUp, handlePopUpToggle }: Props) => {
   const onFormSubmit = async ({
     type,
     name,
-    enableDirectIssuance,
     status,
     configuration: formConfiguration
   }: FormData) => {
@@ -342,12 +334,11 @@ export const ExternalCaModal = ({ popUp, handlePopUpToggle }: Props) => {
 
     if (ca) {
       await updateMutateAsync({
-        caName: ca.name,
+        id: ca.id,
         projectId: currentProject.id,
         name,
         type,
         status,
-        enableDirectIssuance: type === CaType.AZURE_AD_CS ? false : enableDirectIssuance,
         configuration: configPayload
       });
     } else {
@@ -356,7 +347,6 @@ export const ExternalCaModal = ({ popUp, handlePopUpToggle }: Props) => {
         name,
         type,
         status,
-        enableDirectIssuance: type === CaType.AZURE_AD_CS ? false : enableDirectIssuance,
         configuration: configPayload
       });
     }
@@ -649,25 +639,6 @@ export const ExternalCaModal = ({ popUp, handlePopUpToggle }: Props) => {
               name="configuration.azureAdcsConnection"
             />
           )}
-          {caType === CaType.ACME && (
-            <Controller
-              control={control}
-              name="enableDirectIssuance"
-              render={({ field, fieldState: { error } }) => {
-                return (
-                  <FormControl isError={Boolean(error)} errorText={error?.message} className="my-8">
-                    <Switch
-                      id="is-active"
-                      onCheckedChange={(value) => field.onChange(value)}
-                      isChecked={field.value}
-                    >
-                      <p className="w-full">Enable Direct Issuance</p>
-                    </Switch>
-                  </FormControl>
-                );
-              }}
-            />
-          )}
           <div className="flex items-center">
             <Button
               className="mr-4"

frontend/src/pages/cert-manager/CertificateAuthoritiesPage/components/ExternalCaSection.tsx

@@ -22,10 +22,10 @@ export const ExternalCaSection = () => {
     "caStatus" // enable / disable
   ] as const);
 
-  const onRemoveCaSubmit = async (caName: string, type: CaType) => {
+  const onRemoveCaSubmit = async (id: string, type: CaType) => {
     if (!currentProject?.id) return;
 
-    await deleteCa({ caName, type, projectId: currentProject.id });
+    await deleteCa({ id, type, projectId: currentProject.id });
 
     createNotification({
       text: "Successfully deleted CA",
@@ -36,17 +36,17 @@ export const ExternalCaSection = () => {
   };
 
   const onUpdateCaStatus = async ({
-    name,
+    caId,
     type,
     status
   }: {
-    name: string;
+    caId: string;
     type: CaType;
     status: CaStatus;
   }) => {
     if (!currentProject?.slug) return;
 
-    await updateCa({ caName: name, type, status, projectId: currentProject.id });
+    await updateCa({ id: caId, type, status });
 
     createNotification({
       text: `Successfully ${status === CaStatus.ACTIVE ? "enabled" : "disabled"} CA`,
@@ -88,7 +88,7 @@ export const ExternalCaSection = () => {
         deleteKey="confirm"
         onDeleteApproved={() =>
           onRemoveCaSubmit(
-            (popUp?.deleteCa?.data as { name: string })?.name,
+            (popUp?.deleteCa?.data as { caId: string })?.caId,
             (popUp?.deleteCa?.data as { type: CaType })?.type
           )
         }
@@ -110,7 +110,7 @@ export const ExternalCaSection = () => {
         deleteKey="confirm"
         onDeleteApproved={() =>
           onUpdateCaStatus(
-            popUp?.caStatus?.data as { name: string; type: CaType; status: CaStatus }
+            popUp?.caStatus?.data as { caId: string; type: CaType; status: CaStatus }
           )
         }
       />

frontend/src/pages/cert-manager/CertificateAuthoritiesPage/components/ExternalCaTable.tsx

@@ -35,6 +35,7 @@ type Props = {
   handlePopUpOpen: (
     popUpName: keyof UsePopUpState<["ca", "deleteCa", "caStatus"]>,
     data?: {
+      caId?: string;
       name?: string;
       type?: CaType;
       status?: CaStatus;
@@ -70,6 +71,7 @@ export const ExternalCaTable = ({ handlePopUpOpen }: Props) => {
                     key={`ca-${ca.id}`}
                     onClick={() => {
                       handlePopUpOpen("ca", {
+                        caId: ca.id,
                         name: ca.name,
                         type: ca.type
                       });
@@ -104,6 +106,7 @@ export const ExternalCaTable = ({ handlePopUpOpen }: Props) => {
                                 onClick={(e) => {
                                   e.stopPropagation();
                                   handlePopUpOpen("ca", {
+                                    caId: ca.id,
                                     name: ca.name,
                                     type: ca.type
                                   });
@@ -129,7 +132,7 @@ export const ExternalCaTable = ({ handlePopUpOpen }: Props) => {
                                   onClick={(e) => {
                                     e.stopPropagation();
                                     handlePopUpOpen("caStatus", {
-                                      name: ca.name,
+                                      caId: ca.id,
                                       type: ca.type,
                                       status:
                                         ca.status === CaStatus.ACTIVE
@@ -157,7 +160,7 @@ export const ExternalCaTable = ({ handlePopUpOpen }: Props) => {
                                 onClick={(e) => {
                                   e.stopPropagation();
                                   handlePopUpOpen("deleteCa", {
-                                    name: ca.name,
+                                    caId: ca.id,
                                     type: ca.type
                                   });
                                 }}

frontend/src/pages/cert-manager/CertificatesPage/components/CertificateExportModal.tsx

@@ -21,7 +21,13 @@ type Props = {
   ) => void;
   onFormatSelected: (
     format: "pem" | "pkcs12",
-    serialNumber: string,
+    {
+      certificateId,
+      serialNumber
+    }: {
+      certificateId: string;
+      serialNumber: string;
+    },
     options?: ExportOptions
   ) => void;
 };
@@ -42,8 +48,11 @@ export const CertificateExportModal = ({ popUp, handlePopUpToggle, onFormatSelec
     alias: ""
   });
 
-  const serialNumber =
-    (popUp?.certificateExport?.data as { serialNumber: string })?.serialNumber || "";
+  const { certificateId, serialNumber } =
+    (popUp?.certificateExport?.data as {
+      certificateId: string;
+      serialNumber: string;
+    }) || {};
 
   // Reset form whenever the modal opens
   useEffect(() => {
@@ -64,14 +73,21 @@ export const CertificateExportModal = ({ popUp, handlePopUpToggle, onFormatSelec
   };
 
   const handleExport = () => {
-    if (serialNumber && isFormValid()) {
+    if ((certificateId || serialNumber) && isFormValid()) {
       const options: ExportOptions = {};
 
       if (selectedFormat === "pkcs12") {
         options.pkcs12 = pkcs12Options;
       }
 
-      onFormatSelected(selectedFormat, serialNumber, options);
+      onFormatSelected(
+        selectedFormat,
+        {
+          certificateId,
+          serialNumber
+        },
+        options
+      );
       handlePopUpToggle("certificateExport", false);
     }
   };
@@ -151,7 +167,7 @@ export const CertificateExportModal = ({ popUp, handlePopUpToggle, onFormatSelec
               colorSchema="primary"
               leftIcon={<FontAwesomeIcon icon={faDownload} />}
               onClick={handleExport}
-              disabled={!serialNumber || !isFormValid()}
+              disabled={!(certificateId || serialNumber) || !isFormValid()}
             >
               Export {selectedFormat.toUpperCase()}
             </Button>

frontend/src/pages/cert-manager/CertificatesPage/components/CertificateRevocationModal.tsx

@@ -50,11 +50,11 @@ export const CertificateRevocationModal = ({ popUp, handlePopUpToggle }: Props)
   const onFormSubmit = async ({ revocationReason }: FormData) => {
     if (!currentProject?.slug) return;
 
-    const { serialNumber } = popUp.revokeCertificate.data as { serialNumber: string };
+    const { certificateId } = popUp.revokeCertificate.data as { certificateId: string };
 
     await revokeCertificate({
       projectId: currentProject.id,
-      serialNumber,
+      id: certificateId,
       revocationReason
     });
 

frontend/src/pages/cert-manager/CertificatesPage/components/CertificateTemplateModal.tsx

@@ -26,8 +26,8 @@ import { useProject } from "@app/context";
 import {
   CaStatus,
   useCreateCertTemplate,
-  useGetCaById,
   useGetCertTemplate,
+  useGetInternalCaById,
   useListWorkspaceCas,
   useListWorkspacePkiCollections,
   useUpdateCertTemplate
@@ -84,7 +84,7 @@ type Props = {
 export const CertificateTemplateModal = ({ popUp, handlePopUpToggle, caId }: Props) => {
   const { currentProject } = useProject();
 
-  const { data: ca } = useGetCaById(caId);
+  const { data: ca } = useGetInternalCaById(caId);
 
   const { data: certTemplate } = useGetCertTemplate(
     (popUp?.certificateTemplate?.data as { id: string })?.id || ""

frontend/src/pages/cert-manager/CertificatesPage/components/CertificatesSection.tsx

@@ -39,11 +39,11 @@ export const CertificatesSection = () => {
     "managePkiSyncs"
   ] as const);
 
-  const onRemoveCertificateSubmit = async (serialNumber: string) => {
+  const onRemoveCertificateSubmit = async (id: string) => {
     if (!currentProject?.slug) return;
 
     await deleteCert({
-      serialNumber,
+      id,
       projectId: currentProject.id
     });
 
@@ -57,7 +57,13 @@ export const CertificatesSection = () => {
 
   const handleCertificateExport = async (
     format: "pem" | "pkcs12",
-    serialNumber: string,
+    {
+      certificateId,
+      serialNumber
+    }: {
+      certificateId: string;
+      serialNumber: string;
+    },
     options?: ExportOptions
   ) => {
     if (format === "pem") {
@@ -75,7 +81,7 @@ export const CertificatesSection = () => {
 
       try {
         await downloadCertPkcs12({
-          serialNumber,
+          certificateId,
           projectSlug: currentProject.slug,
           password: options.pkcs12.password,
           alias: options.pkcs12.alias
@@ -150,7 +156,7 @@ export const CertificatesSection = () => {
         deleteKey="confirm"
         onDeleteApproved={() =>
           onRemoveCertificateSubmit(
-            (popUp?.deleteCertificate?.data as { serialNumber: string })?.serialNumber
+            (popUp?.deleteCertificate?.data as { certificateId: string })?.certificateId
           )
         }
       />

frontend/src/pages/cert-manager/CertificatesPage/components/CertificatesTable.tsx

@@ -277,6 +277,7 @@ export const CertificatesTable = ({ handlePopUpOpen }: Props) => {
                               )}
                               onClick={async () =>
                                 handlePopUpOpen("certificateExport", {
+                                  certificateId: certificate.id,
                                   serialNumber: certificate.serialNumber
                                 })
                               }
@@ -501,7 +502,7 @@ export const CertificatesTable = ({ handlePopUpOpen }: Props) => {
                                   )}
                                   onClick={async () =>
                                     handlePopUpOpen("revokeCertificate", {
-                                      serialNumber: certificate.serialNumber
+                                      certificateId: certificate.id
                                     })
                                   }
                                   disabled={!isAllowed}
@@ -524,7 +525,7 @@ export const CertificatesTable = ({ handlePopUpOpen }: Props) => {
                               )}
                               onClick={async () =>
                                 handlePopUpOpen("deleteCertificate", {
-                                  serialNumber: certificate.serialNumber,
+                                  certificateId: certificate.id,
                                   commonName: certificate.commonName
                                 })
                               }

frontend/src/pages/cert-manager/PkiSubscriberDetailsByIDPage/components/PkiSubscriberCertificatesTable.tsx

@@ -171,7 +171,7 @@ export const PkiSubscriberCertificatesTable = ({ subscriberName, handlePopUpOpen
                                     onClick={() =>
                                       handlePopUpOpen &&
                                       handlePopUpOpen("revokeCertificate", {
-                                        serialNumber: certificate.serialNumber
+                                        certificateId: certificate.id
                                       })
                                     }
                                     disabled={!isAllowed}

frontend/src/pages/cert-manager/PoliciesPage/components/CertificateProfilesTab/ProfileRow.tsx

@@ -29,7 +29,7 @@ import {
   ProjectPermissionSub
 } from "@app/context/ProjectPermissionContext/types";
 import { usePopUp, useToggle } from "@app/hooks";
-import { useGetCaById } from "@app/hooks/api/ca/queries";
+import { useGetInternalCaById } from "@app/hooks/api/ca/queries";
 import { IssuerType, TCertificateProfile } from "@app/hooks/api/certificateProfiles";
 import { useGetCertificateTemplateV2ById } from "@app/hooks/api/certificateTemplates/queries";
 import { CertificateIssuanceModal } from "@app/pages/cert-manager/CertificatesPage/components/CertificateIssuanceModal";
@@ -49,7 +49,7 @@ export const ProfileRow = ({
 }: Props) => {
   const { permission } = useProjectPermission();
 
-  const { data: caData } = useGetCaById(profile.caId ?? "");
+  const { data: caData } = useGetInternalCaById(profile.caId ?? "");
 
   const { popUp, handlePopUpToggle } = usePopUp(["issueCertificate"] as const);
 
@@ -123,7 +123,9 @@ export const ProfileRow = ({
         <span className="text-sm text-mineshaft-300">
           {profile.issuerType === IssuerType.SELF_SIGNED
             ? "Self-signed"
-            : caData?.friendlyName || caData?.commonName || profile.caId}
+            : caData?.configuration.friendlyName ||
+              caData?.configuration.commonName ||
+              profile.caId}
         </span>
       </Td>
       <Td>

frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentitySection.tsx

@@ -203,7 +203,11 @@ export const IdentitySection = withPermission(
         >
           <ModalContent
             bodyClassName="overflow-visible"
-            title="Add Machine Identity"
+            title={
+              isSubOrganization
+                ? "Add Machine Identity to Sub-Organization"
+                : "Create Organization Machine Identity"
+            }
             subTitle={
               isSubOrganization
                 ? "Create a new machine identity or assign an existing one"

frontend/src/pages/project/AccessControlPage/components/IdentityTab/IdentityTab.tsx

@@ -12,8 +12,7 @@ import {
 } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { useNavigate } from "@tanstack/react-router";
-import { AnimatePresence, motion } from "framer-motion";
-import { LinkIcon, PlusIcon } from "lucide-react";
+import { InfoIcon } from "lucide-react";
 import { twMerge } from "tailwind-merge";
 
 import { createNotification } from "@app/components/notifications";
@@ -83,10 +82,9 @@ import { ProjectLinkIdentityModal } from "./components/ProjectLinkIdentityModal"
 
 const MAX_ROLES_TO_BE_SHOWN_IN_TABLE = 2;
 
-enum WizardSteps {
-  SelectAction = "select-action",
-  LinkIdentity = "link-identity",
-  ProjectIdentity = "project-identity"
+enum AddIdentityType {
+  CreateNew,
+  AssignExisting
 }
 
 export const IdentityTab = withProjectPermission(
@@ -95,7 +93,9 @@ export const IdentityTab = withProjectPermission(
     const navigate = useNavigate();
     const { isSubOrganization, currentOrg } = useOrganization();
 
-    const [wizardStep, setWizardStep] = useState(WizardSteps.SelectAction);
+    const [addMachineIdentityType, setAddMachineIdentityType] = useState<AddIdentityType>(
+      AddIdentityType.CreateNew
+    );
 
     const {
       offset,
@@ -510,93 +510,89 @@ export const IdentityTab = withProjectPermission(
           isOpen={popUp.createIdentity.isOpen}
           onOpenChange={(open) => {
             handlePopUpToggle("createIdentity", open);
-            if (!open) setWizardStep(WizardSteps.SelectAction);
           }}
         >
           <ModalContent
             bodyClassName="overflow-visible"
-            title="Add Project Machine Identity"
+            title="Add Machine Identity to Project"
             subTitle="Create a new machine identity or assign an existing one"
           >
-            <AnimatePresence mode="wait">
-              {wizardStep === WizardSteps.SelectAction && (
-                <motion.div
-                  key="select-type-step"
-                  transition={{ duration: 0.1 }}
-                  initial={{ opacity: 0, translateX: 30 }}
-                  animate={{ opacity: 1, translateX: 0 }}
-                  exit={{ opacity: 0, translateX: -30 }}
+            <div className="mb-4 flex items-center justify-center gap-x-2">
+              <div className="flex w-3/4 gap-x-0.5 rounded-md border border-mineshaft-600 bg-mineshaft-800 p-1">
+                <Button
+                  variant="outline_bg"
+                  onClick={() => {
+                    setAddMachineIdentityType(AddIdentityType.CreateNew);
+                  }}
+                  size="xs"
+                  className={twMerge(
+                    "min-w-[2.4rem] flex-1 rounded border-none hover:bg-mineshaft-600",
+                    addMachineIdentityType === AddIdentityType.CreateNew
+                      ? "bg-mineshaft-500"
+                      : "bg-transparent"
+                  )}
                 >
-                  <div
-                    className="cursor-pointer rounded-md border border-mineshaft-600 p-4 transition-all hover:bg-mineshaft-700"
-                    role="button"
-                    tabIndex={0}
-                    onClick={() => setWizardStep(WizardSteps.ProjectIdentity)}
-                    onKeyDown={(e) => {
-                      if (e.key === "Enter") {
-                        setWizardStep(WizardSteps.ProjectIdentity);
-                      }
-                    }}
-                  >
-                    <div className="flex items-center gap-2">
-                      <PlusIcon size="1rem" />
-                      <div>Create Machine Identity</div>
-                    </div>
-                    <div className="mt-2 text-xs text-mineshaft-300">
-                      Create a new machine identity specifically for this project. This machine
-                      identity will be managed at the project-level.
-                    </div>
-                  </div>
-                  <div
-                    className="mt-4 cursor-pointer rounded-md border border-mineshaft-600 p-4 transition-all hover:bg-mineshaft-700"
-                    role="button"
-                    tabIndex={0}
-                    onClick={() => setWizardStep(WizardSteps.LinkIdentity)}
-                    onKeyDown={(e) => {
-                      if (e.key === "Enter") {
-                        setWizardStep(WizardSteps.LinkIdentity);
-                      }
-                    }}
-                  >
-                    <div className="flex items-center gap-2">
-                      <LinkIcon size="1rem" />
-                      <div>Assign Existing Machine Identity</div>
-                    </div>
-                    <div className="mt-2 text-xs text-mineshaft-300">
-                      Assign an existing machine identity from your organization. The machine
-                      identity will continue to be managed at its original scope.
-                    </div>
-                  </div>
-                </motion.div>
-              )}
-              {wizardStep === WizardSteps.ProjectIdentity && (
-                <motion.div
-                  key="identity-step"
-                  transition={{ duration: 0.1 }}
-                  initial={{ opacity: 0, translateX: 30 }}
-                  animate={{ opacity: 1, translateX: 0 }}
-                  exit={{ opacity: 0, translateX: -30 }}
+                  Create New
+                </Button>
+                <Button
+                  variant="outline_bg"
+                  onClick={() => {
+                    setAddMachineIdentityType(AddIdentityType.AssignExisting);
+                  }}
+                  size="xs"
+                  className={twMerge(
+                    "min-w-[2.4rem] flex-1 rounded border-none hover:bg-mineshaft-600",
+                    addMachineIdentityType === AddIdentityType.AssignExisting
+                      ? "bg-mineshaft-500"
+                      : "bg-transparent"
+                  )}
                 >
-                  <ProjectIdentityModal
-                    onClose={() => {
-                      handlePopUpClose("createIdentity");
-                      setWizardStep(WizardSteps.SelectAction);
-                    }}
-                  />
-                </motion.div>
-              )}
-              {wizardStep === WizardSteps.LinkIdentity && (
-                <motion.div
-                  key="link-step"
-                  transition={{ duration: 0.1 }}
-                  initial={{ opacity: 0, translateX: 30 }}
-                  animate={{ opacity: 1, translateX: 0 }}
-                  exit={{ opacity: 0, translateX: -30 }}
-                >
-                  <ProjectLinkIdentityModal handlePopUpToggle={handlePopUpToggle} />
-                </motion.div>
-              )}
-            </AnimatePresence>
+                  Assign Existing
+                </Button>
+              </div>
+              <Tooltip
+                className="max-w-sm"
+                position="right"
+                align="start"
+                content={
+                  <>
+                    <p className="mb-2 text-mineshaft-300">
+                      You can add machine identities to your project in one of two ways:
+                    </p>
+                    <ul className="ml-3.5 flex list-disc flex-col gap-y-4">
+                      <li className="text-mineshaft-200">
+                        <strong className="font-medium text-mineshaft-100">Create New</strong> -
+                        Create a dedicated machine identity managed at the project-level.
+                        <p className="mt-2">
+                          This method is recommended for autonomous teams that need to manage
+                          machine identity authentication.
+                        </p>
+                      </li>
+                      <li>
+                        <strong className="font-medium text-mineshaft-100">Assign Existing</strong>{" "}
+                        - Assign an existing machine identity from your organization.
+                        <p className="mt-2">
+                          This method is recommended for organizations that need to maintain
+                          centralized control.
+                        </p>
+                      </li>
+                    </ul>
+                  </>
+                }
+              >
+                <InfoIcon size={16} className="text-mineshaft-400" />
+              </Tooltip>
+            </div>
+            {addMachineIdentityType === AddIdentityType.CreateNew && (
+              <ProjectIdentityModal
+                onClose={() => {
+                  handlePopUpClose("createIdentity");
+                }}
+              />
+            )}
+            {addMachineIdentityType === AddIdentityType.AssignExisting && (
+              <ProjectLinkIdentityModal handlePopUpToggle={handlePopUpToggle} />
+            )}
           </ModalContent>
         </Modal>
         <DeleteActionModal

frontend/src/pages/project/AccessControlPage/components/IdentityTab/components/ProjectLinkIdentityModal.tsx

@@ -5,7 +5,7 @@ import { useQuery } from "@tanstack/react-query";
 import { z } from "zod";
 
 import { createNotification } from "@app/components/notifications";
-import { Button, FilterableSelect, FormControl, ModalClose, Spinner } from "@app/components/v2";
+import { Button, FilterableSelect, FormControl, ModalClose } from "@app/components/v2";
 import { useProject } from "@app/context";
 import {
   projectIdentityMembershipQuery,
@@ -101,13 +101,6 @@ export const ProjectLinkIdentityModal = ({ handlePopUpToggle }: Props) => {
     handlePopUpToggle("createIdentity", false);
   };
 
-  if (isMembershipsLoading || isRolesLoading)
-    return (
-      <div className="flex w-full items-center justify-center py-10">
-        <Spinner className="text-mineshaft-400" />
-      </div>
-    );
-
   return (
     <form onSubmit={handleSubmit(onFormSubmit)}>
       <Controller
@@ -118,6 +111,7 @@ export const ProjectLinkIdentityModal = ({ handlePopUpToggle }: Props) => {
             <FilterableSelect
               value={value}
               onChange={onChange}
+              isLoading={isMembershipsLoading}
               placeholder="Select machine identity..."
               // onInputChange={setSearchValue}
               options={filteredIdentityMembershipOrgs.map((membership) => ({
@@ -142,6 +136,7 @@ export const ProjectLinkIdentityModal = ({ handlePopUpToggle }: Props) => {
           >
             <FilterableSelect
               value={value}
+              isLoading={isRolesLoading}
               onChange={onChange}
               options={roles}
               placeholder="Select role..."
@@ -159,7 +154,7 @@ export const ProjectLinkIdentityModal = ({ handlePopUpToggle }: Props) => {
           isLoading={isSubmitting}
           isDisabled={isSubmitting}
         >
-          Link
+          Assign to Project
         </Button>
         <ModalClose asChild>
           <Button colorSchema="secondary" variant="plain">

frontend/src/routeTree.gen.ts

@@ -1515,8 +1515,8 @@ const certManagerPkiSyncDetailsByIDPageRouteRoute =
 
 const certManagerCertAuthDetailsByIDPageRouteRoute =
   certManagerCertAuthDetailsByIDPageRouteImport.update({
-    id: '/ca/$caName',
-    path: '/ca/$caName',
+    id: '/ca/$caId',
+    path: '/ca/$caId',
     getParentRoute: () => certManagerLayoutRoute,
   } as any)
 
@@ -3182,10 +3182,10 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof secretScanningSecretScanningDataSourcesPageRouteImport
       parentRoute: typeof AuthenticateInjectOrgDetailsOrgLayoutOrganizationsOrgIdProjectsSecretScanningProjectIdSecretScanningLayoutDataSourcesImport
     }
-    '/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/cert-management/$projectId/_cert-manager-layout/ca/$caName': {
-      id: '/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/cert-management/$projectId/_cert-manager-layout/ca/$caName'
-      path: '/ca/$caName'
-      fullPath: '/organizations/$orgId/projects/cert-management/$projectId/ca/$caName'
+    '/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/cert-management/$projectId/_cert-manager-layout/ca/$caId': {
+      id: '/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/cert-management/$projectId/_cert-manager-layout/ca/$caId'
+      path: '/ca/$caId'
+      fullPath: '/organizations/$orgId/projects/cert-management/$projectId/ca/$caId'
       preLoaderRoute: typeof certManagerCertAuthDetailsByIDPageRouteImport
       parentRoute: typeof certManagerLayoutImport
     }
@@ -5199,7 +5199,7 @@ export interface FileRoutesByFullPath {
   '/organizations/$orgId/projects/pam/$projectId/sessions/': typeof pamPamSessionsPageRouteRoute
   '/organizations/$orgId/projects/secret-management/$projectId/integrations/': typeof secretManagerIntegrationsListPageRouteRoute
   '/organizations/$orgId/projects/secret-scanning/$projectId/data-sources/': typeof secretScanningSecretScanningDataSourcesPageRouteRoute
-  '/organizations/$orgId/projects/cert-management/$projectId/ca/$caName': typeof certManagerCertAuthDetailsByIDPageRouteRoute
+  '/organizations/$orgId/projects/cert-management/$projectId/ca/$caId': typeof certManagerCertAuthDetailsByIDPageRouteRoute
   '/organizations/$orgId/projects/cert-management/$projectId/integrations/$syncId': typeof certManagerPkiSyncDetailsByIDPageRouteRoute
   '/organizations/$orgId/projects/cert-management/$projectId/subscribers/$subscriberName': typeof certManagerPkiSubscriberDetailsByIDPageRouteRoute
   '/organizations/$orgId/projects/pam/$projectId/sessions/$sessionId': typeof pamPamSessionsByIDPageRouteRoute
@@ -5429,7 +5429,7 @@ export interface FileRoutesByTo {
   '/organizations/$orgId/projects/pam/$projectId/sessions': typeof pamPamSessionsPageRouteRoute
   '/organizations/$orgId/projects/secret-management/$projectId/integrations': typeof secretManagerIntegrationsListPageRouteRoute
   '/organizations/$orgId/projects/secret-scanning/$projectId/data-sources': typeof secretScanningSecretScanningDataSourcesPageRouteRoute
-  '/organizations/$orgId/projects/cert-management/$projectId/ca/$caName': typeof certManagerCertAuthDetailsByIDPageRouteRoute
+  '/organizations/$orgId/projects/cert-management/$projectId/ca/$caId': typeof certManagerCertAuthDetailsByIDPageRouteRoute
   '/organizations/$orgId/projects/cert-management/$projectId/integrations/$syncId': typeof certManagerPkiSyncDetailsByIDPageRouteRoute
   '/organizations/$orgId/projects/cert-management/$projectId/subscribers/$subscriberName': typeof certManagerPkiSubscriberDetailsByIDPageRouteRoute
   '/organizations/$orgId/projects/pam/$projectId/sessions/$sessionId': typeof pamPamSessionsByIDPageRouteRoute
@@ -5682,7 +5682,7 @@ export interface FileRoutesById {
   '/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/pam/$projectId/_pam-layout/sessions/': typeof pamPamSessionsPageRouteRoute
   '/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/integrations/': typeof secretManagerIntegrationsListPageRouteRoute
   '/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-scanning/$projectId/_secret-scanning-layout/data-sources/': typeof secretScanningSecretScanningDataSourcesPageRouteRoute
-  '/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/cert-management/$projectId/_cert-manager-layout/ca/$caName': typeof certManagerCertAuthDetailsByIDPageRouteRoute
+  '/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/cert-management/$projectId/_cert-manager-layout/ca/$caId': typeof certManagerCertAuthDetailsByIDPageRouteRoute
   '/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/cert-management/$projectId/_cert-manager-layout/integrations/$syncId': typeof certManagerPkiSyncDetailsByIDPageRouteRoute
   '/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/cert-management/$projectId/_cert-manager-layout/subscribers/$subscriberName': typeof certManagerPkiSubscriberDetailsByIDPageRouteRoute
   '/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/pam/$projectId/_pam-layout/sessions/$sessionId': typeof pamPamSessionsByIDPageRouteRoute
@@ -5927,7 +5927,7 @@ export interface FileRouteTypes {
     | '/organizations/$orgId/projects/pam/$projectId/sessions/'
     | '/organizations/$orgId/projects/secret-management/$projectId/integrations/'
     | '/organizations/$orgId/projects/secret-scanning/$projectId/data-sources/'
-    | '/organizations/$orgId/projects/cert-management/$projectId/ca/$caName'
+    | '/organizations/$orgId/projects/cert-management/$projectId/ca/$caId'
     | '/organizations/$orgId/projects/cert-management/$projectId/integrations/$syncId'
     | '/organizations/$orgId/projects/cert-management/$projectId/subscribers/$subscriberName'
     | '/organizations/$orgId/projects/pam/$projectId/sessions/$sessionId'
@@ -6156,7 +6156,7 @@ export interface FileRouteTypes {
     | '/organizations/$orgId/projects/pam/$projectId/sessions'
     | '/organizations/$orgId/projects/secret-management/$projectId/integrations'
     | '/organizations/$orgId/projects/secret-scanning/$projectId/data-sources'
-    | '/organizations/$orgId/projects/cert-management/$projectId/ca/$caName'
+    | '/organizations/$orgId/projects/cert-management/$projectId/ca/$caId'
     | '/organizations/$orgId/projects/cert-management/$projectId/integrations/$syncId'
     | '/organizations/$orgId/projects/cert-management/$projectId/subscribers/$subscriberName'
     | '/organizations/$orgId/projects/pam/$projectId/sessions/$sessionId'
@@ -6407,7 +6407,7 @@ export interface FileRouteTypes {
     | '/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/pam/$projectId/_pam-layout/sessions/'
     | '/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/integrations/'
     | '/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-scanning/$projectId/_secret-scanning-layout/data-sources/'
-    | '/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/cert-management/$projectId/_cert-manager-layout/ca/$caName'
+    | '/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/cert-management/$projectId/_cert-manager-layout/ca/$caId'
     | '/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/cert-management/$projectId/_cert-manager-layout/integrations/$syncId'
     | '/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/cert-management/$projectId/_cert-manager-layout/subscribers/$subscriberName'
     | '/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/pam/$projectId/_pam-layout/sessions/$sessionId'
@@ -7030,7 +7030,7 @@ export const routeTree = rootRoute
         "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/cert-management/$projectId/_cert-manager-layout/certificate-templates",
         "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/cert-management/$projectId/_cert-manager-layout/integrations",
         "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/cert-management/$projectId/_cert-manager-layout/subscribers",
-        "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/cert-management/$projectId/_cert-manager-layout/ca/$caName",
+        "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/cert-management/$projectId/_cert-manager-layout/ca/$caId",
         "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/cert-management/$projectId/_cert-manager-layout/groups/$groupId",
         "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/cert-management/$projectId/_cert-manager-layout/identities/$identityId",
         "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/cert-management/$projectId/_cert-manager-layout/members/$membershipId",
@@ -7415,7 +7415,7 @@ export const routeTree = rootRoute
       "filePath": "secret-scanning/SecretScanningDataSourcesPage/route.tsx",
       "parent": "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-scanning/$projectId/_secret-scanning-layout/data-sources"
     },
-    "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/cert-management/$projectId/_cert-manager-layout/ca/$caName": {
+    "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/cert-management/$projectId/_cert-manager-layout/ca/$caId": {
       "filePath": "cert-manager/CertAuthDetailsByIDPage/route.tsx",
       "parent": "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/cert-management/$projectId/_cert-manager-layout"
     },

frontend/src/routes.ts

@@ -282,7 +282,7 @@ const certManagerRoutes = route("/organizations/$orgId/projects/cert-management/
     route("/certificate-templates", [index("cert-manager/PkiTemplateListPage/route.tsx")]),
     route("/certificate-authorities", "cert-manager/CertificateAuthoritiesPage/route.tsx"),
     route("/alerting", "cert-manager/AlertingPage/route.tsx"),
-    route("/ca/$caName", "cert-manager/CertAuthDetailsByIDPage/route.tsx"),
+    route("/ca/$caId", "cert-manager/CertAuthDetailsByIDPage/route.tsx"),
     route("/pki-collections/$collectionId", "cert-manager/PkiCollectionDetailsByIDPage/routes.tsx"),
     route("/integrations", [
       index("cert-manager/IntegrationsListPage/route.tsx"),