Merge branch 'heads/main' into ENG-2785

frontend/src/pages/cert-manager/AlertingPage/components/PkiAlertModal.tsx

@@ -13,7 +13,7 @@ import {
   Select,
   SelectItem
 } from "@app/components/v2";
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import {
   useCreatePkiAlert,
   useGetPkiAlertById,
@@ -60,15 +60,15 @@ type Props = {
 };
 
 export const PkiAlertModal = ({ popUp, handlePopUpToggle }: Props) => {
-  const { currentWorkspace } = useWorkspace();
-  const projectId = currentWorkspace?.id || "";
+  const { currentProject } = useProject();
+  const projectId = currentProject?.id || "";
 
   const { data: alert } = useGetPkiAlertById(
     (popUp?.pkiAlert?.data as { alertId: string })?.alertId || ""
   );
 
   const { data: pkiCollections } = useListWorkspacePkiCollections({
-    workspaceId: projectId
+    projectId
   });
 
   const { mutateAsync: createPkiAlert } = useCreatePkiAlert();

frontend/src/pages/cert-manager/AlertingPage/components/PkiAlertsSection.tsx

@@ -4,7 +4,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { createNotification } from "@app/components/notifications";
 import { ProjectPermissionCan } from "@app/components/permissions";
 import { Button, DeleteActionModal } from "@app/components/v2";
-import { ProjectPermissionActions, ProjectPermissionSub, useWorkspace } from "@app/context";
+import { ProjectPermissionActions, ProjectPermissionSub, useProject } from "@app/context";
 import { useDeletePkiAlert } from "@app/hooks/api";
 import { usePopUp } from "@app/hooks/usePopUp";
 
@@ -12,8 +12,8 @@ import { PkiAlertModal } from "./PkiAlertModal";
 import { PkiAlertsTable } from "./PkiAlertsTable";
 
 export const PkiAlertsSection = () => {
-  const { currentWorkspace } = useWorkspace();
-  const projectId = currentWorkspace?.id || "";
+  const { currentProject } = useProject();
+  const projectId = currentProject?.id || "";
   const { mutateAsync: deletePkiAlert } = useDeletePkiAlert();
 
   const { popUp, handlePopUpOpen, handlePopUpClose, handlePopUpToggle } = usePopUp([

frontend/src/pages/cert-manager/AlertingPage/components/PkiAlertsTable.tsx

@@ -10,7 +10,7 @@ import {
   THead,
   Tr
 } from "@app/components/v2";
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import { useListWorkspacePkiAlerts } from "@app/hooks/api";
 import { UsePopUpState } from "@app/hooks/usePopUp";
 
@@ -24,11 +24,11 @@ type Props = {
 };
 
 export const PkiAlertsTable = ({ handlePopUpOpen }: Props) => {
-  const { currentWorkspace } = useWorkspace();
-  const projectId = currentWorkspace?.id || "";
+  const { currentProject } = useProject();
+  const projectId = currentProject?.id || "";
 
   const { data, isPending } = useListWorkspacePkiAlerts({
-    workspaceId: projectId
+    projectId
   });
 
   return (

frontend/src/pages/cert-manager/AlertingPage/components/PkiCollectionModal.tsx

@@ -6,7 +6,7 @@ import { z } from "zod";
 
 import { createNotification } from "@app/components/notifications";
 import { Button, FormControl, Input, Modal, ModalContent } from "@app/components/v2";
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import {
   useCreatePkiCollection,
   useGetPkiCollectionById,
@@ -28,8 +28,8 @@ type Props = {
 
 export const PkiCollectionModal = ({ popUp, handlePopUpToggle }: Props) => {
   const navigate = useNavigate();
-  const { currentWorkspace } = useWorkspace();
-  const projectId = currentWorkspace?.id || "";
+  const { currentProject } = useProject();
+  const projectId = currentProject?.id || "";
 
   const { data: pkiCollection } = useGetPkiCollectionById(
     (popUp?.pkiCollection?.data as { collectionId: string })?.collectionId || ""

frontend/src/pages/cert-manager/AlertingPage/components/PkiCollectionSection.tsx

@@ -4,7 +4,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { createNotification } from "@app/components/notifications";
 import { ProjectPermissionCan } from "@app/components/permissions";
 import { Button, DeleteActionModal } from "@app/components/v2";
-import { ProjectPermissionActions, ProjectPermissionSub, useWorkspace } from "@app/context";
+import { ProjectPermissionActions, ProjectPermissionSub, useProject } from "@app/context";
 import { useDeletePkiCollection } from "@app/hooks/api";
 import { usePopUp } from "@app/hooks/usePopUp";
 
@@ -12,8 +12,8 @@ import { PkiCollectionModal } from "./PkiCollectionModal";
 import { PkiCollectionTable } from "./PkiCollectionTable";
 
 export const PkiCollectionSection = () => {
-  const { currentWorkspace } = useWorkspace();
-  const projectId = currentWorkspace?.id || "";
+  const { currentProject } = useProject();
+  const projectId = currentProject?.id || "";
   const { mutateAsync: deletePkiCollection } = useDeletePkiCollection();
 
   const { popUp, handlePopUpOpen, handlePopUpClose, handlePopUpToggle } = usePopUp([

frontend/src/pages/cert-manager/AlertingPage/components/PkiCollectionTable.tsx

@@ -19,7 +19,7 @@ import {
   THead,
   Tr
 } from "@app/components/v2";
-import { ProjectPermissionActions, ProjectPermissionSub, useWorkspace } from "@app/context";
+import { ProjectPermissionActions, ProjectPermissionSub, useProject } from "@app/context";
 import { useListWorkspacePkiCollections } from "@app/hooks/api";
 import { UsePopUpState } from "@app/hooks/usePopUp";
 
@@ -32,11 +32,11 @@ type Props = {
 
 export const PkiCollectionTable = ({ handlePopUpOpen }: Props) => {
   const navigate = useNavigate();
-  const { currentWorkspace } = useWorkspace();
-  const projectId = currentWorkspace?.id || "";
+  const { currentProject } = useProject();
+  const projectId = currentProject?.id || "";
 
   const { data, isPending } = useListWorkspacePkiCollections({
-    workspaceId: projectId
+    projectId
   });
 
   return (

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

@@ -15,7 +15,7 @@ import {
   Tooltip
 } from "@app/components/v2";
 import { ROUTE_PATHS } from "@app/const/routes";
-import { ProjectPermissionActions, ProjectPermissionSub, useWorkspace } from "@app/context";
+import { ProjectPermissionActions, ProjectPermissionSub, useProject } from "@app/context";
 import { CaType, useDeleteCa, useGetCa } from "@app/hooks/api";
 import { TInternalCertificateAuthority } from "@app/hooks/api/ca/types";
 import { usePopUp } from "@app/hooks/usePopUp";
@@ -30,7 +30,7 @@ import {
 } from "./components";
 
 const Page = () => {
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
   const navigate = useNavigate();
   const params = useParams({
     from: ROUTE_PATHS.CertManager.CertAuthDetailsByIDPage.id
@@ -38,11 +38,11 @@ const Page = () => {
   const { caName } = params as { caName: string };
   const { data } = useGetCa({
     caName,
-    projectId: currentWorkspace?.id || "",
+    projectId: currentProject?.id || "",
     type: CaType.INTERNAL
   }) as { data: TInternalCertificateAuthority };
 
-  const projectId = currentWorkspace?.id || "";
+  const projectId = currentProject?.id || "";
 
   const { mutateAsync: deleteCa } = useDeleteCa();
 
@@ -55,11 +55,11 @@ const Page = () => {
 
   const onRemoveCaSubmit = async () => {
     try {
-      if (!currentWorkspace?.slug) return;
+      if (!currentProject?.slug) return;
 
       await deleteCa({
         caName,
-        projectId: currentWorkspace.id,
+        projectId: currentProject.id,
         type: CaType.INTERNAL
       });
 

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, useWorkspace } from "@app/context";
+import { ProjectPermissionActions, ProjectPermissionSub, useProject } 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";
@@ -21,7 +21,7 @@ type Props = {
 };
 
 export const CaDetailsSection = ({ caName, handlePopUpOpen }: Props) => {
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
   const [copyTextId, isCopyingId, setCopyTextId] = useTimedReset<string>({
     initialState: "Copy ID to clipboard"
   });
@@ -31,7 +31,7 @@ export const CaDetailsSection = ({ caName, handlePopUpOpen }: Props) => {
 
   const { data } = useGetCa({
     caName,
-    projectId: currentWorkspace.id,
+    projectId: currentProject.id,
     type: CaType.INTERNAL
   });
 

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

@@ -13,7 +13,7 @@ import {
   Select,
   SelectItem
 } from "@app/components/v2";
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import {
   CaRenewalType,
   useRenewCa
@@ -45,8 +45,8 @@ type Props = {
 };
 
 export const CaRenewalModal = ({ popUp, handlePopUpToggle }: Props) => {
-  const { currentWorkspace } = useWorkspace();
-  const projectSlug = currentWorkspace?.slug || "";
+  const { currentProject } = useProject();
+  const projectSlug = currentProject?.slug || "";
 
   const popUpData = popUp?.renewCa?.data as {
     caId: string;

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

@@ -8,7 +8,7 @@ import { z } from "zod";
 
 import { createNotification } from "@app/components/notifications";
 import { Button, FormControl, IconButton, TextArea, Tooltip } from "@app/components/v2";
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import { useTimedReset } from "@app/hooks";
 import { useGetCaCsr, useImportCaCertificate } from "@app/hooks/api";
 import { UsePopUpState } from "@app/hooks/usePopUp";
@@ -26,7 +26,7 @@ type Props = {
 };
 
 export const ExternalCaInstallForm = ({ caId, handlePopUpToggle }: Props) => {
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
   const [copyTextCaCsr, isCopyingCaCsr, setCopyTextCaCsr] = useTimedReset<string>({
     initialState: "Copy to clipboard"
   });
@@ -41,7 +41,7 @@ export const ExternalCaInstallForm = ({ caId, handlePopUpToggle }: Props) => {
   });
 
   const { data: csr } = useGetCaCsr(caId);
-  const { mutateAsync: importCaCertificate } = useImportCaCertificate(currentWorkspace.id);
+  const { mutateAsync: importCaCertificate } = useImportCaCertificate(currentProject.id);
 
   useEffect(() => {
     reset();
@@ -49,11 +49,11 @@ export const ExternalCaInstallForm = ({ caId, handlePopUpToggle }: Props) => {
 
   const onFormSubmit = async ({ certificate, certificateChain }: FormData) => {
     try {
-      if (!csr || !caId || !currentWorkspace?.slug) return;
+      if (!csr || !caId || !currentProject?.slug) return;
 
       await importCaCertificate({
         caId,
-        projectSlug: currentWorkspace?.slug,
+        projectSlug: currentProject?.slug,
         certificate,
         certificateChain
       });

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

@@ -6,7 +6,7 @@ import { z } from "zod";
 
 import { createNotification } from "@app/components/notifications";
 import { Button, FormControl, Input, Select, SelectItem } from "@app/components/v2";
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import {
   CaStatus,
   useGetCaById,
@@ -46,16 +46,16 @@ type Props = {
 };
 
 export const InternalCaInstallForm = ({ caId, handlePopUpToggle }: Props) => {
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
   const { data: cas } = useListWorkspaceCas({
-    projectSlug: currentWorkspace?.slug ?? "",
+    projectId: currentProject.id,
     status: CaStatus.ACTIVE
   });
   const { data: ca } = useGetCaById(caId);
   const { data: csr } = useGetCaCsr(caId);
 
   const { mutateAsync: signIntermediate } = useSignIntermediate();
-  const { mutateAsync: importCaCertificate } = useImportCaCertificate(currentWorkspace.id);
+  const { mutateAsync: importCaCertificate } = useImportCaCertificate(currentProject.id);
 
   const {
     control,
@@ -102,7 +102,7 @@ export const InternalCaInstallForm = ({ caId, handlePopUpToggle }: Props) => {
 
   const onFormSubmit = async ({ notAfter, maxPathLength }: FormData) => {
     try {
-      if (!csr || !caId || !currentWorkspace?.slug) return;
+      if (!csr || !caId || !currentProject?.slug) return;
 
       const { certificate, certificateChain } = await signIntermediate({
         caId: parentCaId,
@@ -114,7 +114,7 @@ export const InternalCaInstallForm = ({ caId, handlePopUpToggle }: Props) => {
 
       await importCaCertificate({
         caId,
-        projectSlug: currentWorkspace?.slug,
+        projectSlug: currentProject?.slug,
         certificate,
         certificateChain
       });

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

@@ -16,7 +16,7 @@ import {
   Switch
   // DatePicker
 } from "@app/components/v2";
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import {
   CaStatus,
   CaType,
@@ -84,10 +84,10 @@ const caTypes = [
 ];
 
 export const CaModal = ({ popUp, handlePopUpToggle }: Props) => {
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
   const { data: ca } = useGetCa({
     caName: (popUp?.ca?.data as { name: string })?.name || "",
-    projectId: currentWorkspace?.id || "",
+    projectId: currentProject?.id || "",
     type: CaType.INTERNAL
   });
 
@@ -178,13 +178,13 @@ export const CaModal = ({ popUp, handlePopUpToggle }: Props) => {
     configuration
   }: FormData) => {
     try {
-      if (!currentWorkspace?.slug) return;
+      if (!currentProject?.slug) return;
 
       if (ca) {
         // update
         await updateMutateAsync({
           caName: ca.name,
-          projectId: currentWorkspace.id,
+          projectId: currentProject.id,
           name,
           type: CaType.INTERNAL,
           status,
@@ -193,7 +193,7 @@ export const CaModal = ({ popUp, handlePopUpToggle }: Props) => {
       } else {
         // create
         await createMutateAsync({
-          projectId: currentWorkspace.id,
+          projectId: currentProject.id,
           name,
           type,
           status,

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

@@ -5,7 +5,7 @@ import { UpgradePlanModal } from "@app/components/license/UpgradePlanModal";
 import { createNotification } from "@app/components/notifications";
 import { ProjectPermissionCan } from "@app/components/permissions";
 import { Button, DeleteActionModal } from "@app/components/v2";
-import { ProjectPermissionActions, ProjectPermissionSub, useWorkspace } from "@app/context";
+import { ProjectPermissionActions, ProjectPermissionSub, useProject } from "@app/context";
 import { CaStatus, CaType, useDeleteCa, useUpdateCa } from "@app/hooks/api";
 import { usePopUp } from "@app/hooks/usePopUp";
 
@@ -15,7 +15,7 @@ import { CaModal } from "./CaModal";
 import { CaTable } from "./CaTable";
 
 export const CaSection = () => {
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
   const { mutateAsync: deleteCa } = useDeleteCa();
   const { mutateAsync: updateCa } = useUpdateCa();
 
@@ -30,9 +30,9 @@ export const CaSection = () => {
 
   const onRemoveCaSubmit = async (caName: string) => {
     try {
-      if (!currentWorkspace?.slug) return;
+      if (!currentProject?.slug) return;
 
-      await deleteCa({ caName, projectId: currentWorkspace.id, type: CaType.INTERNAL });
+      await deleteCa({ caName, projectId: currentProject.id, type: CaType.INTERNAL });
 
       createNotification({
         text: "Successfully deleted CA",
@@ -50,9 +50,9 @@ export const CaSection = () => {
 
   const onUpdateCaStatus = async ({ caName, status }: { caName: string; status: CaStatus }) => {
     try {
-      if (!currentWorkspace?.slug) return;
+      if (!currentProject?.slug) return;
 
-      await updateCa({ caName, projectId: currentWorkspace.id, type: CaType.INTERNAL, status });
+      await updateCa({ caName, projectId: currentProject.id, type: CaType.INTERNAL, status });
 
       createNotification({
         text: `Successfully ${status === CaStatus.ACTIVE ? "enabled" : "disabled"} CA`,

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

@@ -22,7 +22,7 @@ import {
   Tooltip,
   Tr
 } from "@app/components/v2";
-import { ProjectPermissionActions, ProjectPermissionSub, useWorkspace } from "@app/context";
+import { ProjectPermissionActions, ProjectPermissionSub, useProject } from "@app/context";
 import { CaStatus, CaType, useListCasByTypeAndProjectId } from "@app/hooks/api";
 import {
   caStatusToNameMap,
@@ -49,8 +49,8 @@ type Props = {
 
 export const CaTable = ({ handlePopUpOpen }: Props) => {
   const navigate = useNavigate();
-  const { currentWorkspace } = useWorkspace();
-  const { data, isPending } = useListCasByTypeAndProjectId(CaType.INTERNAL, currentWorkspace.id);
+  const { currentProject } = useProject();
+  const { data, isPending } = useListCasByTypeAndProjectId(CaType.INTERNAL, currentProject.id);
   const cas = data as TInternalCertificateAuthority[];
 
   return (
@@ -80,7 +80,7 @@ export const CaTable = ({ handlePopUpOpen }: Props) => {
                       navigate({
                         to: "/projects/cert-management/$projectId/ca/$caName",
                         params: {
-                          projectId: currentWorkspace.id,
+                          projectId: currentProject.id,
                           caName: ca.name
                         }
                       })

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

@@ -4,6 +4,7 @@ import { SingleValue } from "react-select";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { z } from "zod";
 
+import { AppConnectionOption } from "@app/components/app-connections";
 import { createNotification } from "@app/components/notifications";
 import {
   Button,
@@ -16,7 +17,7 @@ import {
   SelectItem,
   Switch
 } from "@app/components/v2";
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import { APP_CONNECTION_MAP } from "@app/helpers/appConnections";
 import {
   TAvailableAppConnection,
@@ -127,11 +128,11 @@ const caTypes = [
 ];
 
 export const ExternalCaModal = ({ popUp, handlePopUpToggle }: Props) => {
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
 
   const { data: ca, isLoading: isCaLoading } = useGetCa({
     caName: (popUp?.ca?.data as { name: string })?.name || "",
-    projectId: currentWorkspace?.id || "",
+    projectId: currentProject?.id || "",
     type: (popUp?.ca?.data as { type: CaType })?.type || ""
   });
 
@@ -201,17 +202,17 @@ export const ExternalCaModal = ({ popUp, handlePopUpToggle }: Props) => {
   }, [popUp?.ca?.isOpen, popUp?.ca?.data, reset, ca]);
 
   const { data: availableRoute53Connections, isPending: isRoute53Pending } =
-    useListAvailableAppConnections(AppConnection.AWS, {
+    useListAvailableAppConnections(AppConnection.AWS, currentProject.id, {
       enabled: caType === CaType.ACME
     });
 
   const { data: availableCloudflareConnections, isPending: isCloudflarePending } =
-    useListAvailableAppConnections(AppConnection.Cloudflare, {
+    useListAvailableAppConnections(AppConnection.Cloudflare, currentProject.id, {
       enabled: caType === CaType.ACME
     });
 
   const { data: availableAzureConnections, isPending: isAzurePending } =
-    useListAvailableAppConnections(AppConnection.AzureADCS, {
+    useListAvailableAppConnections(AppConnection.AzureADCS, currentProject.id, {
       enabled: caType === CaType.AZURE_AD_CS
     });
 
@@ -297,7 +298,7 @@ export const ExternalCaModal = ({ popUp, handlePopUpToggle }: Props) => {
     configuration: formConfiguration
   }: FormData) => {
     try {
-      if (!currentWorkspace?.slug) return;
+      if (!currentProject?.slug) return;
 
       let configPayload: any;
 
@@ -321,7 +322,7 @@ export const ExternalCaModal = ({ popUp, handlePopUpToggle }: Props) => {
       if (ca) {
         await updateMutateAsync({
           caName: ca.name,
-          projectId: currentWorkspace.id,
+          projectId: currentProject.id,
           name,
           type,
           status,
@@ -330,7 +331,7 @@ export const ExternalCaModal = ({ popUp, handlePopUpToggle }: Props) => {
         });
       } else {
         await createMutateAsync({
-          projectId: currentWorkspace.id,
+          projectId: currentProject.id,
           name,
           type,
           status,
@@ -457,6 +458,7 @@ export const ExternalCaModal = ({ popUp, handlePopUpToggle }: Props) => {
                       placeholder="Select connection..."
                       getOptionLabel={(option) => option.name}
                       getOptionValue={(option) => option.id}
+                      components={{ Option: AppConnectionOption }}
                     />
                   </FormControl>
                 )}
@@ -599,6 +601,7 @@ export const ExternalCaModal = ({ popUp, handlePopUpToggle }: Props) => {
                     placeholder="Select connection..."
                     getOptionLabel={(option) => option.name}
                     getOptionValue={(option) => option.id}
+                    components={{ Option: AppConnectionOption }}
                   />
                 </FormControl>
               )}

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

@@ -5,7 +5,7 @@ import { UpgradePlanModal } from "@app/components/license/UpgradePlanModal";
 import { createNotification } from "@app/components/notifications";
 import { ProjectPermissionCan } from "@app/components/permissions";
 import { Button, DeleteActionModal } from "@app/components/v2";
-import { ProjectPermissionActions, ProjectPermissionSub, useWorkspace } from "@app/context";
+import { ProjectPermissionActions, ProjectPermissionSub, useProject } from "@app/context";
 import { CaStatus, CaType, useDeleteCa, useUpdateCa } from "@app/hooks/api";
 import { usePopUp } from "@app/hooks/usePopUp";
 
@@ -13,7 +13,7 @@ import { ExternalCaModal } from "./ExternalCaModal";
 import { ExternalCaTable } from "./ExternalCaTable";
 
 export const ExternalCaSection = () => {
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
   const { mutateAsync: deleteCa } = useDeleteCa();
   const { mutateAsync: updateCa } = useUpdateCa();
 
@@ -26,9 +26,9 @@ export const ExternalCaSection = () => {
 
   const onRemoveCaSubmit = async (caName: string, type: CaType) => {
     try {
-      if (!currentWorkspace?.id) return;
+      if (!currentProject?.id) return;
 
-      await deleteCa({ caName, type, projectId: currentWorkspace.id });
+      await deleteCa({ caName, type, projectId: currentProject.id });
 
       createNotification({
         text: "Successfully deleted CA",
@@ -54,9 +54,9 @@ export const ExternalCaSection = () => {
     status: CaStatus;
   }) => {
     try {
-      if (!currentWorkspace?.slug) return;
+      if (!currentProject?.slug) return;
 
-      await updateCa({ caName: name, type, status, projectId: currentWorkspace.id });
+      await updateCa({ caName: name, type, status, projectId: currentProject.id });
 
       createNotification({
         text: `Successfully ${status === CaStatus.ACTIVE ? "enabled" : "disabled"} CA`,

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

@@ -26,7 +26,7 @@ import {
   Tooltip,
   Tr
 } from "@app/components/v2";
-import { ProjectPermissionActions, ProjectPermissionSub, useWorkspace } from "@app/context";
+import { ProjectPermissionActions, ProjectPermissionSub, useProject } from "@app/context";
 import { CaStatus, CaType, useListExternalCasByProjectId } from "@app/hooks/api";
 import { caStatusToNameMap, getCaStatusBadgeVariant } from "@app/hooks/api/ca/constants";
 import { UsePopUpState } from "@app/hooks/usePopUp";
@@ -44,8 +44,8 @@ type Props = {
 };
 
 export const ExternalCaTable = ({ handlePopUpOpen }: Props) => {
-  const { currentWorkspace } = useWorkspace();
-  const { data, isPending } = useListExternalCasByProjectId(currentWorkspace.id);
+  const { currentProject } = useProject();
+  const { data, isPending } = useListExternalCasByProjectId(currentProject.id);
 
   return (
     <div>

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

@@ -14,7 +14,7 @@ import {
   SelectItem,
   TextArea
 } from "@app/components/v2";
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import { useGetCert, useImportCertificate, useListWorkspacePkiCollections } from "@app/hooks/api";
 import { UsePopUpState } from "@app/hooks/usePopUp";
 
@@ -48,13 +48,13 @@ type TCertificateDetails = {
 
 export const CertificateImportModal = ({ popUp, handlePopUpToggle }: Props) => {
   const [certificateDetails, setCertificateDetails] = useState<TCertificateDetails | null>(null);
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
   const { data: cert } = useGetCert(
     (popUp?.certificateImport?.data as { serialNumber: string })?.serialNumber || ""
   );
 
   const { data } = useListWorkspacePkiCollections({
-    workspaceId: currentWorkspace?.id || ""
+    projectId: currentProject?.id || ""
   });
 
   const { mutateAsync: importCertificate } = useImportCertificate();
@@ -76,10 +76,10 @@ export const CertificateImportModal = ({ popUp, handlePopUpToggle }: Props) => {
     collectionId
   }: FormData) => {
     try {
-      if (!currentWorkspace?.slug) return;
+      if (!currentProject?.slug) return;
 
       const { serialNumber, certificate, certificateChain, privateKey } = await importCertificate({
-        projectSlug: currentWorkspace.slug,
+        projectSlug: currentProject.slug,
 
         certificatePem,
         privateKeyPem,

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

@@ -22,7 +22,7 @@ import {
   SelectItem,
   Tooltip
 } from "@app/components/v2";
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import {
   CaStatus,
   useCreateCertificate,
@@ -89,22 +89,22 @@ const CERT_TEMPLATE_NONE_VALUE = "none";
 
 export const CertificateModal = ({ popUp, handlePopUpToggle }: Props) => {
   const [certificateDetails, setCertificateDetails] = useState<TCertificateDetails | null>(null);
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
   const { data: cert } = useGetCert(
     (popUp?.certificate?.data as { serialNumber: string })?.serialNumber || ""
   );
 
   const { data: cas } = useListWorkspaceCas({
-    projectSlug: currentWorkspace?.slug ?? "",
+    projectId: currentProject.id,
     status: CaStatus.ACTIVE
   });
 
   const { data } = useListWorkspacePkiCollections({
-    workspaceId: currentWorkspace?.id || ""
+    projectId: currentProject?.id || ""
   });
 
   const { data: templatesData } = useListWorkspaceCertificateTemplates({
-    workspaceId: currentWorkspace?.id || ""
+    projectId: currentProject?.id || ""
   });
 
   const { mutateAsync: createCertificate } = useCreateCertificate();
@@ -191,12 +191,12 @@ export const CertificateModal = ({ popUp, handlePopUpToggle }: Props) => {
     extendedKeyUsages
   }: FormData) => {
     try {
-      if (!currentWorkspace?.slug) return;
+      if (!currentProject?.slug) return;
 
       const { serialNumber, certificate, certificateChain, privateKey } = await createCertificate({
         caId: !selectedCertTemplate ? caId : undefined,
         certificateTemplateId: selectedCertTemplate ? selectedCertTemplateId : undefined,
-        projectSlug: currentWorkspace.slug,
+        projectSlug: currentProject.slug,
         pkiCollectionId: collectionId,
         friendlyName,
         commonName,

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

@@ -4,7 +4,7 @@ import { z } from "zod";
 
 import { createNotification } from "@app/components/notifications";
 import { Button, FormControl, Modal, ModalContent, Select, SelectItem } from "@app/components/v2";
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import { useRevokeCert } from "@app/hooks/api";
 import { crlReasons } from "@app/hooks/api/certificates/constants";
 import { CrlReason } from "@app/hooks/api/certificates/enums";
@@ -35,7 +35,7 @@ type Props = {
 };
 
 export const CertificateRevocationModal = ({ popUp, handlePopUpToggle }: Props) => {
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
   const { mutateAsync: revokeCertificate } = useRevokeCert();
 
   const {
@@ -49,12 +49,12 @@ export const CertificateRevocationModal = ({ popUp, handlePopUpToggle }: Props)
 
   const onFormSubmit = async ({ revocationReason }: FormData) => {
     try {
-      if (!currentWorkspace?.slug) return;
+      if (!currentProject?.slug) return;
 
       const { serialNumber } = popUp.revokeCertificate.data as { serialNumber: string };
 
       await revokeCertificate({
-        projectSlug: currentWorkspace.slug,
+        projectSlug: currentProject.slug,
         serialNumber,
         revocationReason
       });

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

@@ -22,7 +22,7 @@ import {
   SelectItem,
   Tooltip
 } from "@app/components/v2";
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import {
   CaStatus,
   useCreateCertTemplate,
@@ -82,7 +82,7 @@ type Props = {
 };
 
 export const CertificateTemplateModal = ({ popUp, handlePopUpToggle, caId }: Props) => {
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
 
   const { data: ca } = useGetCaById(caId);
 
@@ -91,12 +91,12 @@ export const CertificateTemplateModal = ({ popUp, handlePopUpToggle, caId }: Pro
   );
 
   const { data: cas } = useListWorkspaceCas({
-    projectSlug: currentWorkspace?.slug ?? "",
+    projectId: currentProject?.id,
     status: CaStatus.ACTIVE
   });
 
   const { data: collectionsData } = useListWorkspacePkiCollections({
-    workspaceId: currentWorkspace?.id || ""
+    projectId: currentProject?.id || ""
   });
 
   const { mutateAsync: createCertTemplate } = useCreateCertTemplate();
@@ -155,7 +155,7 @@ export const CertificateTemplateModal = ({ popUp, handlePopUpToggle, caId }: Pro
     keyUsages,
     extendedKeyUsages
   }: FormData) => {
-    if (!currentWorkspace?.id) {
+    if (!currentProject?.id) {
       return;
     }
 
@@ -163,7 +163,7 @@ export const CertificateTemplateModal = ({ popUp, handlePopUpToggle, caId }: Pro
       if (certTemplate) {
         await updateCertTemplate({
           id: certTemplate.id,
-          projectId: currentWorkspace.id,
+          projectId: currentProject.id,
           pkiCollectionId: collectionId,
           caId,
           name,
@@ -184,7 +184,7 @@ export const CertificateTemplateModal = ({ popUp, handlePopUpToggle, caId }: Pro
         });
       } else {
         await createCertTemplate({
-          projectId: currentWorkspace.id,
+          projectId: currentProject.id,
           pkiCollectionId: collectionId,
           caId,
           name,

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

@@ -12,7 +12,7 @@ import { DeleteActionModal, IconButton } from "@app/components/v2";
 import {
   ProjectPermissionPkiTemplateActions,
   ProjectPermissionSub,
-  useWorkspace
+  useProject
 } from "@app/context";
 import { usePopUp } from "@app/hooks";
 import { useDeleteCertTemplate } from "@app/hooks/api";
@@ -33,18 +33,18 @@ export const CertificateTemplatesSection = ({ caId }: Props) => {
     "upgradePlan"
   ] as const);
 
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
   const { mutateAsync: deleteCertTemplate } = useDeleteCertTemplate();
 
   const onRemoveCertificateTemplateSubmit = async (id: string) => {
-    if (!currentWorkspace?.id) {
+    if (!currentProject?.id) {
       return;
     }
 
     try {
       await deleteCertTemplate({
         id,
-        projectId: currentWorkspace.id
+        projectId: currentProject.id
       });
 
       createNotification({

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

@@ -7,7 +7,7 @@ import { Button, DeleteActionModal } from "@app/components/v2";
 import {
   ProjectPermissionCertificateActions,
   ProjectPermissionSub,
-  useWorkspace
+  useProject
 } from "@app/context";
 import { useDeleteCert } from "@app/hooks/api";
 import { usePopUp } from "@app/hooks/usePopUp";
@@ -19,7 +19,7 @@ import { CertificateRevocationModal } from "./CertificateRevocationModal";
 import { CertificatesTable } from "./CertificatesTable";
 
 export const CertificatesSection = () => {
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
   const { mutateAsync: deleteCert } = useDeleteCert();
 
   const { popUp, handlePopUpOpen, handlePopUpClose, handlePopUpToggle } = usePopUp([
@@ -32,9 +32,9 @@ export const CertificatesSection = () => {
 
   const onRemoveCertificateSubmit = async (serialNumber: string) => {
     try {
-      if (!currentWorkspace?.slug) return;
+      if (!currentProject?.slug) return;
 
-      await deleteCert({ serialNumber, projectSlug: currentWorkspace.slug });
+      await deleteCert({ serialNumber, projectSlug: currentProject.slug });
 
       createNotification({
         text: "Successfully deleted certificate",

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

@@ -33,7 +33,7 @@ import {
 import {
   ProjectPermissionCertificateActions,
   ProjectPermissionSub,
-  useWorkspace
+  useProject
 } from "@app/context";
 import { useListWorkspaceCertificates } from "@app/hooks/api";
 import { caSupportsCapability } from "@app/hooks/api/ca/constants";
@@ -62,15 +62,15 @@ export const CertificatesTable = ({ handlePopUpOpen }: Props) => {
   const [page, setPage] = useState(1);
   const [perPage, setPerPage] = useState(PER_PAGE_INIT);
 
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
   const { data, isPending } = useListWorkspaceCertificates({
-    projectSlug: currentWorkspace?.slug ?? "",
+    projectId: currentProject?.id ?? "",
     offset: (page - 1) * perPage,
     limit: perPage
   });
 
   // Fetch CA data to determine capabilities
-  const { data: caData } = useListCasByProjectId(currentWorkspace?.id ?? "");
+  const { data: caData } = useListCasByProjectId(currentProject?.id ?? "");
 
   // Create mapping from caId to CA type for capability checking
   const caCapabilityMap = useMemo(() => {

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

@@ -0,0 +1,69 @@
+import { Helmet } from "react-helmet";
+import { useTranslation } from "react-i18next";
+import { useNavigate, useSearch } from "@tanstack/react-router";
+
+import { ProjectPermissionCan } from "@app/components/permissions";
+import { PageHeader, Tab, TabList, TabPanel, Tabs } from "@app/components/v2";
+import { ROUTE_PATHS } from "@app/const/routes";
+import { ProjectPermissionSub, useProject } from "@app/context";
+import { ProjectPermissionPkiSyncActions } from "@app/context/ProjectPermissionContext/types";
+import { IntegrationsListPageTabs } from "@app/types/integrations";
+
+import { PkiSyncsTab } from "./components";
+
+export const IntegrationsListPage = () => {
+  const navigate = useNavigate();
+  const { currentProject } = useProject();
+  const { t } = useTranslation();
+
+  const { selectedTab } = useSearch({
+    from: ROUTE_PATHS.CertManager.IntegrationsListPage.id
+  });
+
+  const currentTab = selectedTab || IntegrationsListPageTabs.PkiSyncs;
+
+  const updateSelectedTab = (tab: string) => {
+    navigate({
+      to: ROUTE_PATHS.CertManager.IntegrationsListPage.path,
+      search: {
+        selectedTab: tab as IntegrationsListPageTabs
+      },
+      params: {
+        projectId: currentProject?.id
+      }
+    });
+  };
+
+  return (
+    <>
+      <Helmet>
+        <title>{t("common.head-title", { title: t("integrations.title") })}</title>
+        <meta property="og:image" content="/images/message.png" />
+        <meta property="og:title" content="Manage your certificates in seconds" />
+        <meta name="og:description" content="Sync and manage PKI certificates across services" />
+      </Helmet>
+      <div className="container relative mx-auto max-w-7xl pb-12 text-white">
+        <div className="mb-8">
+          <PageHeader
+            title="Integrations"
+            description="Manage integrations with third-party certificate services."
+          />
+          <Tabs value={currentTab} onValueChange={updateSelectedTab}>
+            <TabList>
+              <Tab value={IntegrationsListPageTabs.PkiSyncs}>Certificate Syncs</Tab>
+            </TabList>
+            <TabPanel value={IntegrationsListPageTabs.PkiSyncs}>
+              <ProjectPermissionCan
+                renderGuardBanner
+                I={ProjectPermissionPkiSyncActions.Read}
+                a={ProjectPermissionSub.PkiSyncs}
+              >
+                <PkiSyncsTab />
+              </ProjectPermissionCan>
+            </TabPanel>
+          </Tabs>
+        </div>
+      </div>
+    </>
+  );
+};

frontend/src/pages/cert-manager/IntegrationsListPage/components/PkiSyncsTab/PkiSyncTable/PkiSyncDestinationCol/PkiSyncDestinationCol.tsx

@@ -0,0 +1,14 @@
+import { TPkiSync } from "@app/hooks/api/pkiSyncs";
+
+import { getPkiSyncDestinationColValues } from "../helpers";
+import { PkiSyncTableCell } from "../PkiSyncTableCell";
+
+type Props = {
+  pkiSync: TPkiSync;
+};
+
+export const PkiSyncDestinationCol = ({ pkiSync }: Props) => {
+  const { primaryText, secondaryText } = getPkiSyncDestinationColValues(pkiSync);
+
+  return <PkiSyncTableCell primaryText={primaryText} secondaryText={secondaryText} />;
+};

frontend/src/pages/cert-manager/IntegrationsListPage/components/PkiSyncsTab/PkiSyncTable/PkiSyncDestinationCol/index.ts

@@ -0,0 +1 @@
+export { PkiSyncDestinationCol } from "./PkiSyncDestinationCol";

frontend/src/pages/cert-manager/IntegrationsListPage/components/PkiSyncsTab/PkiSyncTable/PkiSyncRow.tsx

@@ -0,0 +1,398 @@
+import { useCallback, useMemo } from "react";
+import { subject } from "@casl/ability";
+import {
+  faBan,
+  faCalendarCheck,
+  faCheck,
+  faCopy,
+  faDownload,
+  faEllipsisV,
+  faEraser,
+  faInfoCircle,
+  faRotate,
+  faToggleOff,
+  faToggleOn,
+  faTrash,
+  faTriangleExclamation,
+  faXmark
+} from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { useNavigate } from "@tanstack/react-router";
+import { format } from "date-fns";
+import { twMerge } from "tailwind-merge";
+
+import { createNotification } from "@app/components/notifications";
+import { ProjectPermissionCan } from "@app/components/permissions";
+import {
+  PkiSyncImportStatusBadge,
+  PkiSyncRemoveStatusBadge,
+  PkiSyncStatusBadge
+} from "@app/components/pki-syncs";
+import {
+  Badge,
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+  IconButton,
+  Td,
+  Tooltip,
+  Tr
+} from "@app/components/v2";
+import { ROUTE_PATHS } from "@app/const/routes";
+import { ProjectPermissionSub } from "@app/context";
+import { ProjectPermissionPkiSyncActions } from "@app/context/ProjectPermissionContext/types";
+import { PKI_SYNC_MAP } from "@app/helpers/pkiSyncs";
+import { useToggle } from "@app/hooks";
+import { PkiSyncStatus, TPkiSync, usePkiSyncOption } from "@app/hooks/api/pkiSyncs";
+
+import { PkiSyncDestinationCol } from "./PkiSyncDestinationCol";
+import { PkiSyncTableCell } from "./PkiSyncTableCell";
+
+type Props = {
+  pkiSync: TPkiSync;
+  onDelete: (pkiSync: TPkiSync) => void;
+  onTriggerSyncCertificates: (pkiSync: TPkiSync) => void;
+  onTriggerImportCertificates: (pkiSync: TPkiSync) => void;
+  onTriggerRemoveCertificates: (pkiSync: TPkiSync) => void;
+  onToggleEnable: (pkiSync: TPkiSync) => void;
+};
+
+export const PkiSyncRow = ({
+  pkiSync,
+  onDelete,
+  onTriggerSyncCertificates,
+  onTriggerImportCertificates,
+  onTriggerRemoveCertificates,
+  onToggleEnable
+}: Props) => {
+  const navigate = useNavigate();
+  const {
+    id,
+    subscriberId,
+    lastSyncMessage,
+    destination,
+    lastSyncedAt,
+    name,
+    description,
+    syncStatus,
+    isAutoSyncEnabled,
+    projectId
+  } = pkiSync;
+
+  const destinationName = PKI_SYNC_MAP[destination].name;
+
+  const { syncOption } = usePkiSyncOption(destination);
+
+  const [isIdCopied, setIsIdCopied] = useToggle(false);
+
+  const handleCopyId = useCallback(() => {
+    setIsIdCopied.on();
+    navigator.clipboard.writeText(id);
+
+    createNotification({
+      text: "PKI Sync ID copied to clipboard",
+      type: "info"
+    });
+
+    const timer = setTimeout(() => setIsIdCopied.off(), 2000);
+
+    // eslint-disable-next-line consistent-return
+    return () => clearTimeout(timer);
+  }, [isIdCopied]);
+
+  const failureMessage = useMemo(() => {
+    if (syncStatus === PkiSyncStatus.Failed) {
+      if (lastSyncMessage)
+        try {
+          return JSON.stringify(JSON.parse(lastSyncMessage), null, 2);
+        } catch {
+          return lastSyncMessage;
+        }
+
+      return "An Unknown Error Occurred.";
+    }
+    return null;
+  }, [syncStatus, lastSyncMessage]);
+
+  const destinationDetails = PKI_SYNC_MAP[destination];
+
+  const permissionSubject = subject(ProjectPermissionSub.PkiSyncs, {
+    subscriberId: subscriberId || ""
+  });
+
+  return (
+    <Tr
+      onClick={() => {
+        // console.log("PKI Sync navigation:", { syncId: id, projectId });
+        navigate({
+          to: ROUTE_PATHS.CertManager.PkiSyncDetailsByIDPage.path,
+          params: {
+            syncId: id,
+            projectId
+          }
+        });
+      }}
+      className={twMerge(
+        "group h-10 cursor-pointer transition-colors duration-100 hover:bg-mineshaft-700",
+        syncStatus === PkiSyncStatus.Failed && "bg-red/5 hover:bg-red/10"
+      )}
+      key={`sync-${id}`}
+    >
+      <Td>
+        <img
+          alt={`${destinationDetails.name} sync`}
+          src={`/images/integrations/${destinationDetails.image}`}
+          className="min-w-[1.75rem]"
+        />
+      </Td>
+      <Td className="!min-w-[8rem] max-w-0">
+        <div>
+          <div className="flex w-full items-center">
+            <p className="truncate">{name}</p>
+            {description && (
+              <Tooltip content={description}>
+                <FontAwesomeIcon
+                  icon={faInfoCircle}
+                  size="xs"
+                  className="ml-1 text-mineshaft-400"
+                />
+              </Tooltip>
+            )}
+          </div>
+          <p className="truncate text-xs leading-4 text-bunker-300">{destinationDetails.name}</p>
+        </div>
+      </Td>
+      {subscriberId ? (
+        <PkiSyncTableCell primaryText={pkiSync.subscriber?.name || subscriberId} secondaryText="PKI Subscriber" />
+      ) : (
+        <Td>
+          <Tooltip content="The PKI subscriber for this sync has been deleted. Configure a new source or remove this sync.">
+            <div className="w-min">
+              <Badge
+                className="flex h-5 w-min items-center gap-1.5 whitespace-nowrap"
+                variant="primary"
+              >
+                <FontAwesomeIcon icon={faTriangleExclamation} />
+                <span>Source Deleted</span>
+              </Badge>
+            </div>
+          </Tooltip>
+        </Td>
+      )}
+      <PkiSyncDestinationCol pkiSync={pkiSync} />
+      <Td>
+        <div className="flex items-center gap-1">
+          {syncStatus && (
+            <Tooltip
+              position="left"
+              className="max-w-sm"
+              content={
+                [PkiSyncStatus.Succeeded, PkiSyncStatus.Failed].includes(syncStatus) ? (
+                  <div className="flex flex-col gap-2 whitespace-normal py-1">
+                    {lastSyncedAt && (
+                      <div>
+                        <div
+                          className={`mb-2 flex self-start ${syncStatus === PkiSyncStatus.Failed ? "text-yellow" : "text-green"}`}
+                        >
+                          <FontAwesomeIcon
+                            icon={faCalendarCheck}
+                            className="ml-1 pr-1.5 pt-0.5 text-sm"
+                          />
+                          <div className="text-xs">Last Synced</div>
+                        </div>
+                        <div className="rounded bg-mineshaft-600 p-2 text-xs">
+                          {format(new Date(lastSyncedAt), "yyyy-MM-dd, hh:mm aaa")}
+                        </div>
+                      </div>
+                    )}
+                    {failureMessage && (
+                      <div>
+                        <div className="mb-2 flex self-start text-red">
+                          <FontAwesomeIcon icon={faXmark} className="ml-1 pr-1.5 pt-0.5 text-sm" />
+                          <div className="text-xs">Failure Reason</div>
+                        </div>
+                        <div className="break-words rounded bg-mineshaft-600 p-2 text-xs">
+                          {failureMessage}
+                        </div>
+                      </div>
+                    )}
+                  </div>
+                ) : undefined
+              }
+            >
+              <div>
+                <PkiSyncStatusBadge status={syncStatus} />
+              </div>
+            </Tooltip>
+          )}
+          {!isAutoSyncEnabled && (
+            <Tooltip
+              className="text-xs"
+              content="Auto-Sync is disabled. Certificate changes in the PKI subscriber will not be automatically synced to the destination."
+            >
+              <div>
+                <Badge className="flex h-5 w-min items-center gap-1.5 whitespace-nowrap bg-mineshaft-400/50 text-bunker-300">
+                  <FontAwesomeIcon icon={faBan} />
+                  {!syncStatus && "Auto-Sync Disabled"}
+                </Badge>
+              </div>
+            </Tooltip>
+          )}
+          {syncOption?.canImportCertificates && <PkiSyncImportStatusBadge mini pkiSync={pkiSync} />}
+          <PkiSyncRemoveStatusBadge mini pkiSync={pkiSync} />
+        </div>
+      </Td>
+      <Td>
+        <Tooltip className="max-w-sm text-center" content="Options">
+          <DropdownMenu>
+            <DropdownMenuTrigger asChild>
+              <IconButton
+                ariaLabel="Options"
+                colorSchema="secondary"
+                className="w-6"
+                variant="plain"
+              >
+                <FontAwesomeIcon icon={faEllipsisV} />
+              </IconButton>
+            </DropdownMenuTrigger>
+            <DropdownMenuContent sideOffset={2} align="end">
+              <DropdownMenuItem
+                icon={<FontAwesomeIcon icon={isIdCopied ? faCheck : faCopy} />}
+                onClick={(e) => {
+                  e.stopPropagation();
+                  handleCopyId();
+                }}
+              >
+                Copy Sync ID
+              </DropdownMenuItem>
+              <ProjectPermissionCan
+                I={ProjectPermissionPkiSyncActions.SyncCertificates}
+                a={permissionSubject}
+              >
+                {(isAllowed: boolean) => (
+                  <DropdownMenuItem
+                    icon={<FontAwesomeIcon icon={faRotate} />}
+                    onClick={(e) => {
+                      e.stopPropagation();
+                      onTriggerSyncCertificates(pkiSync);
+                    }}
+                    isDisabled={!isAllowed}
+                  >
+                    <Tooltip
+                      position="left"
+                      sideOffset={42}
+                      content={`Manually trigger a sync for this ${destinationName} destination.`}
+                    >
+                      <div className="flex h-full w-full items-center justify-between gap-1">
+                        <span> Trigger Sync</span>
+                        <FontAwesomeIcon
+                          className="text-bunker-300"
+                          size="sm"
+                          icon={faInfoCircle}
+                        />
+                      </div>
+                    </Tooltip>
+                  </DropdownMenuItem>
+                )}
+              </ProjectPermissionCan>
+              {syncOption?.canImportCertificates && (
+                <ProjectPermissionCan
+                  I={ProjectPermissionPkiSyncActions.ImportCertificates}
+                  a={permissionSubject}
+                >
+                  {(isAllowed: boolean) => (
+                    <DropdownMenuItem
+                      icon={<FontAwesomeIcon icon={faDownload} />}
+                      onClick={(e) => {
+                        e.stopPropagation();
+                        onTriggerImportCertificates(pkiSync);
+                      }}
+                      isDisabled={!isAllowed}
+                    >
+                      <Tooltip
+                        position="left"
+                        sideOffset={42}
+                        content={`Import certificates from this ${destinationName} destination into Infisical.`}
+                      >
+                        <div className="flex h-full w-full items-center justify-between gap-1">
+                          <span>Import Certificates</span>
+                          <FontAwesomeIcon
+                            className="text-bunker-300"
+                            size="sm"
+                            icon={faInfoCircle}
+                          />
+                        </div>
+                      </Tooltip>
+                    </DropdownMenuItem>
+                  )}
+                </ProjectPermissionCan>
+              )}
+              <ProjectPermissionCan
+                I={ProjectPermissionPkiSyncActions.RemoveCertificates}
+                a={permissionSubject}
+              >
+                {(isAllowed: boolean) => (
+                  <DropdownMenuItem
+                    icon={<FontAwesomeIcon icon={faEraser} />}
+                    onClick={(e) => {
+                      e.stopPropagation();
+                      onTriggerRemoveCertificates(pkiSync);
+                    }}
+                    isDisabled={!isAllowed}
+                  >
+                    <Tooltip
+                      position="left"
+                      sideOffset={42}
+                      content={`Remove certificates synced by Infisical from this ${destinationName} destination.`}
+                    >
+                      <div className="flex h-full w-full items-center justify-between gap-1">
+                        <span>Remove Certificates</span>
+                        <FontAwesomeIcon
+                          className="text-bunker-300"
+                          size="sm"
+                          icon={faInfoCircle}
+                        />
+                      </div>
+                    </Tooltip>
+                  </DropdownMenuItem>
+                )}
+              </ProjectPermissionCan>
+              <ProjectPermissionCan I={ProjectPermissionPkiSyncActions.Edit} a={permissionSubject}>
+                {(isAllowed: boolean) => (
+                  <DropdownMenuItem
+                    isDisabled={!isAllowed}
+                    icon={<FontAwesomeIcon icon={isAutoSyncEnabled ? faToggleOff : faToggleOn} />}
+                    onClick={(e) => {
+                      e.stopPropagation();
+                      onToggleEnable(pkiSync);
+                    }}
+                  >
+                    {isAutoSyncEnabled ? "Disable" : "Enable"} Auto-Sync
+                  </DropdownMenuItem>
+                )}
+              </ProjectPermissionCan>
+              <ProjectPermissionCan
+                I={ProjectPermissionPkiSyncActions.Delete}
+                a={permissionSubject}
+              >
+                {(isAllowed: boolean) => (
+                  <DropdownMenuItem
+                    isDisabled={!isAllowed}
+                    icon={<FontAwesomeIcon icon={faTrash} />}
+                    onClick={(e) => {
+                      e.stopPropagation();
+                      onDelete(pkiSync);
+                    }}
+                  >
+                    Delete Sync
+                  </DropdownMenuItem>
+                )}
+              </ProjectPermissionCan>
+            </DropdownMenuContent>
+          </DropdownMenu>
+        </Tooltip>
+      </Td>
+    </Tr>
+  );
+};

frontend/src/pages/cert-manager/IntegrationsListPage/components/PkiSyncsTab/PkiSyncTable/PkiSyncTableCell.tsx

@@ -0,0 +1,71 @@
+import { ReactNode } from "react";
+import { faInfoCircle } from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { twMerge } from "tailwind-merge";
+
+import { Td, Tooltip } from "@app/components/v2";
+
+export type PkiSyncTableCellProps = {
+  primaryText: string;
+  secondaryText?: string;
+  infoBadge?: "primary" | "secondary";
+  additionalTooltipContent?: ReactNode;
+  primaryClassName?: string;
+  secondaryClassName?: string;
+};
+
+export const PkiSyncTableCell = ({
+  primaryText,
+  secondaryText,
+  infoBadge,
+  additionalTooltipContent,
+  primaryClassName,
+  secondaryClassName
+}: PkiSyncTableCellProps) => {
+  return (
+    <Td className="!min-w-[8rem] max-w-0">
+      <Tooltip
+        side="left"
+        className="max-w-2xl break-words"
+        content={
+          <>
+            <p className="text-sm">{primaryText}</p>
+            {secondaryText && (
+              <p className={twMerge("text-xs leading-3 text-bunker-300", secondaryClassName)}>
+                {secondaryText}
+              </p>
+            )}
+            {additionalTooltipContent}
+          </>
+        }
+      >
+        <div>
+          <p className={twMerge("truncate text-sm", primaryClassName)}>
+            {primaryText}
+            {infoBadge === "primary" && (
+              <FontAwesomeIcon
+                size="xs"
+                icon={faInfoCircle}
+                className="ml-1 inline-block text-bunker-300"
+              />
+            )}
+          </p>
+          {secondaryText && (
+            <p
+              className={twMerge("truncate text-xs leading-4 text-bunker-300", secondaryClassName)}
+            >
+              {secondaryText}
+              {infoBadge === "secondary" && (
+                <FontAwesomeIcon
+                  size="xs"
+                  icon={faInfoCircle}
+                  className="ml-1 inline-block text-bunker-300"
+                />
+              )}
+            </p>
+          )}
+        </div>
+      </Tooltip>
+    </Td>
+  );
+};

frontend/src/pages/cert-manager/IntegrationsListPage/components/PkiSyncsTab/PkiSyncTable/PkiSyncsTable.tsx

@@ -0,0 +1,479 @@
+import { useMemo, useState } from "react";
+import {
+  faArrowDown,
+  faArrowUp,
+  faCheck,
+  faCheckCircle,
+  faFilter,
+  faMagnifyingGlass,
+  faRotate,
+  faSearch,
+  faWarning
+} from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { twMerge } from "tailwind-merge";
+
+import { createNotification } from "@app/components/notifications";
+import {
+  DeletePkiSyncModal,
+  PkiSyncImportCertificatesModal,
+  PkiSyncRemoveCertificatesModal
+} from "@app/components/pki-syncs";
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuLabel,
+  DropdownMenuTrigger,
+  EmptyState,
+  IconButton,
+  Input,
+  Pagination,
+  Table,
+  TableContainer,
+  TBody,
+  Th,
+  THead,
+  Tr
+} from "@app/components/v2";
+import { PKI_SYNC_MAP } from "@app/helpers/pkiSyncs";
+import {
+  getUserTablePreference,
+  PreferenceKey,
+  setUserTablePreference
+} from "@app/helpers/userTablePreferences";
+import { usePagination, usePopUp, useResetPageHelper } from "@app/hooks";
+import { OrderByDirection } from "@app/hooks/api/generic/types";
+import {
+  PkiSync,
+  PkiSyncStatus,
+  TPkiSync,
+  useTriggerPkiSyncSyncCertificates,
+  useUpdatePkiSync
+} from "@app/hooks/api/pkiSyncs";
+
+import { getPkiSyncDestinationColValues } from "./helpers";
+import { PkiSyncRow } from "./PkiSyncRow";
+
+enum PkiSyncsOrderBy {
+  Destination = "destination",
+  Source = "source",
+  Name = "name",
+  Status = "status"
+}
+
+type PkiSyncFilters = {
+  destinations: PkiSync[];
+  status: PkiSyncStatus[];
+};
+
+const getSyncStatusOrderValue = (syncStatus: PkiSyncStatus | null) => {
+  switch (syncStatus) {
+    case PkiSyncStatus.Failed:
+      return 0;
+    case PkiSyncStatus.Pending:
+    case PkiSyncStatus.Running:
+      return 1;
+    case PkiSyncStatus.Succeeded:
+      return 2;
+    default:
+      return 3;
+  }
+};
+
+type Props = {
+  pkiSyncs: TPkiSync[];
+};
+
+const STATUS_ICON_MAP = {
+  [PkiSyncStatus.Succeeded]: { icon: faCheck, className: "text-green", name: "Synced" },
+  [PkiSyncStatus.Failed]: { icon: faWarning, className: "text-red", name: "Not Synced" },
+  [PkiSyncStatus.Pending]: { icon: faRotate, className: "text-yellow", name: "Syncing" },
+  [PkiSyncStatus.Running]: { icon: faRotate, className: "text-yellow", name: "Syncing" }
+};
+
+export const PkiSyncsTable = ({ pkiSyncs }: Props) => {
+  const { popUp, handlePopUpOpen, handlePopUpToggle } = usePopUp([
+    "deleteSync",
+    "importCertificates",
+    "removeCertificates"
+  ] as const);
+  const triggerSync = useTriggerPkiSyncSyncCertificates();
+  const updateSync = useUpdatePkiSync();
+
+  const [filters, setFilters] = useState<PkiSyncFilters>({
+    destinations: [],
+    status: []
+  });
+
+  const {
+    search,
+    setSearch,
+    setPage,
+    page,
+    perPage,
+    setPerPage,
+    offset,
+    orderDirection,
+    toggleOrderDirection,
+    orderBy,
+    setOrderDirection,
+    setOrderBy
+  } = usePagination<PkiSyncsOrderBy>(PkiSyncsOrderBy.Name, {
+    initPerPage: getUserTablePreference("pkiSyncTable", PreferenceKey.PerPage, 20)
+  });
+
+  const handlePerPageChange = (newPerPage: number) => {
+    setPerPage(newPerPage);
+    setUserTablePreference("pkiSyncTable", PreferenceKey.PerPage, newPerPage);
+  };
+
+  const filteredPkiSyncs = useMemo(
+    () =>
+      pkiSyncs
+        .filter((pkiSync) => {
+          const { destination, name, syncStatus } = pkiSync;
+
+          if (filters.destinations.length && !filters.destinations.includes(destination))
+            return false;
+
+          if (filters.status.length && (!syncStatus || !filters.status.includes(syncStatus))) {
+            return false;
+          }
+
+          const searchValue = search.trim().toLowerCase();
+
+          const destinationValues = getPkiSyncDestinationColValues(pkiSync);
+
+          return (
+            (PKI_SYNC_MAP[destination]?.name || "Unknown Service")
+              .toLowerCase()
+              .includes(searchValue) ||
+            name.toLowerCase().includes(searchValue) ||
+            (pkiSync.appConnectionName &&
+              pkiSync.appConnectionName.toLowerCase().includes(searchValue)) ||
+            destinationValues.primaryText.toLowerCase().includes(searchValue) ||
+            destinationValues.secondaryText?.toLowerCase().includes(searchValue)
+          );
+        })
+        .sort((a, b) => {
+          const [syncOne, syncTwo] = orderDirection === OrderByDirection.ASC ? [a, b] : [b, a];
+
+          switch (orderBy) {
+            case PkiSyncsOrderBy.Source:
+              return (syncOne.subscriber?.name ?? syncOne.subscriberId ?? "")
+                .toLowerCase()
+                .localeCompare(
+                  syncTwo.subscriber?.name?.toLowerCase() ??
+                    syncTwo.subscriberId?.toLowerCase() ??
+                    ""
+                );
+            case PkiSyncsOrderBy.Destination:
+              return getPkiSyncDestinationColValues(syncOne)
+                .primaryText.toLowerCase()
+                .localeCompare(getPkiSyncDestinationColValues(syncTwo).primaryText.toLowerCase());
+            case PkiSyncsOrderBy.Status:
+              if (!syncOne.syncStatus && syncTwo.syncStatus) return 1;
+              if (syncOne.syncStatus && !syncTwo.syncStatus) return -1;
+              if (!syncOne.syncStatus && !syncTwo.syncStatus) return 0;
+
+              return (
+                getSyncStatusOrderValue(syncOne.syncStatus) -
+                getSyncStatusOrderValue(syncTwo.syncStatus)
+              );
+            case PkiSyncsOrderBy.Name:
+            default:
+              return syncOne.name.toLowerCase().localeCompare(syncTwo.name.toLowerCase());
+          }
+        }),
+    [pkiSyncs, orderDirection, search, orderBy, filters]
+  );
+
+  useResetPageHelper({
+    totalCount: filteredPkiSyncs.length,
+    offset,
+    setPage
+  });
+
+  const handleSort = (column: PkiSyncsOrderBy) => {
+    if (column === orderBy) {
+      toggleOrderDirection();
+      return;
+    }
+
+    setOrderBy(column);
+    setOrderDirection(OrderByDirection.ASC);
+  };
+
+  const getClassName = (col: PkiSyncsOrderBy) =>
+    twMerge("ml-2", orderBy === col ? "" : "opacity-30");
+
+  const getColSortIcon = (col: PkiSyncsOrderBy) =>
+    orderDirection === OrderByDirection.DESC && orderBy === col ? faArrowUp : faArrowDown;
+
+  const isTableFiltered = Boolean(filters.destinations.length || filters.status.length);
+
+  const handleDelete = (pkiSync: TPkiSync) => handlePopUpOpen("deleteSync", pkiSync);
+
+  const handleTriggerImportCertificates = (pkiSync: TPkiSync) =>
+    handlePopUpOpen("importCertificates", pkiSync);
+
+  const handleTriggerRemoveCertificates = (pkiSync: TPkiSync) =>
+    handlePopUpOpen("removeCertificates", pkiSync);
+
+  const handleToggleEnableSync = async (pkiSync: TPkiSync) => {
+    const destinationName = PKI_SYNC_MAP[pkiSync.destination].name;
+
+    const isAutoSyncEnabled = !pkiSync.isAutoSyncEnabled;
+
+    try {
+      await updateSync.mutateAsync({
+        syncId: pkiSync.id,
+        projectId: pkiSync.projectId,
+        destination: pkiSync.destination,
+        isAutoSyncEnabled
+      });
+
+      createNotification({
+        text: `Successfully ${isAutoSyncEnabled ? "enabled" : "disabled"} auto-sync for ${destinationName} Sync`,
+        type: "success"
+      });
+    } catch {
+      createNotification({
+        text: `Failed to ${isAutoSyncEnabled ? "enable" : "disable"} auto-sync for ${destinationName} Sync`,
+        type: "error"
+      });
+    }
+  };
+
+  const handleTriggerSync = async (pkiSync: TPkiSync) => {
+    const destinationName = PKI_SYNC_MAP[pkiSync.destination].name;
+
+    try {
+      await triggerSync.mutateAsync({
+        syncId: pkiSync.id,
+        destination: pkiSync.destination,
+        projectId: pkiSync.projectId
+      });
+
+      createNotification({
+        text: `Successfully triggered ${destinationName} Sync`,
+        type: "success"
+      });
+    } catch {
+      createNotification({
+        text: `Failed to trigger ${destinationName} Sync`,
+        type: "error"
+      });
+    }
+  };
+
+  return (
+    <div>
+      <div className="flex gap-2">
+        <Input
+          value={search}
+          onChange={(e) => setSearch(e.target.value)}
+          leftIcon={<FontAwesomeIcon icon={faMagnifyingGlass} />}
+          placeholder="Search PKI syncs..."
+          className="flex-1"
+        />
+        <DropdownMenu>
+          <DropdownMenuTrigger asChild>
+            <IconButton
+              ariaLabel="Filter PKI syncs"
+              variant="plain"
+              size="sm"
+              className={twMerge(
+                "flex h-10 w-11 items-center justify-center overflow-hidden border border-mineshaft-600 bg-mineshaft-800 p-0 transition-all hover:border-primary/60 hover:bg-primary/10",
+                isTableFiltered && "border-primary/50 text-primary"
+              )}
+            >
+              <FontAwesomeIcon icon={faFilter} />
+            </IconButton>
+          </DropdownMenuTrigger>
+          <DropdownMenuContent className="thin-scrollbar max-h-[70vh] overflow-y-auto" align="end">
+            <DropdownMenuLabel>Status</DropdownMenuLabel>
+            {[PkiSyncStatus.Running, PkiSyncStatus.Succeeded, PkiSyncStatus.Failed].map(
+              (status) => (
+                <DropdownMenuItem
+                  onClick={(e) => {
+                    e.preventDefault();
+                    setFilters((prev) => ({
+                      ...prev,
+                      status: prev.status.includes(status)
+                        ? prev.status.filter((s) => s !== status)
+                        : [...prev.status, status]
+                    }));
+                  }}
+                  key={status}
+                  icon={
+                    filters.status.includes(status) && (
+                      <FontAwesomeIcon className="text-primary" icon={faCheckCircle} />
+                    )
+                  }
+                  iconPos="right"
+                >
+                  <div className="flex items-center gap-2">
+                    <FontAwesomeIcon
+                      icon={STATUS_ICON_MAP[status].icon}
+                      className={STATUS_ICON_MAP[status].className}
+                    />
+                    <span className="capitalize">{STATUS_ICON_MAP[status].name}</span>
+                  </div>
+                </DropdownMenuItem>
+              )
+            )}
+            <DropdownMenuLabel>Service</DropdownMenuLabel>
+            {pkiSyncs.length ? (
+              [...new Set(pkiSyncs.map(({ destination }) => destination))].map((destination) => {
+                const { name, image } = PKI_SYNC_MAP[destination];
+
+                return (
+                  <DropdownMenuItem
+                    onClick={(e) => {
+                      e.preventDefault();
+                      setFilters((prev) => ({
+                        ...prev,
+                        destinations: prev.destinations.includes(destination)
+                          ? prev.destinations.filter((a) => a !== destination)
+                          : [...prev.destinations, destination]
+                      }));
+                    }}
+                    key={destination}
+                    icon={
+                      filters.destinations.includes(destination) && (
+                        <FontAwesomeIcon className="text-primary" icon={faCheckCircle} />
+                      )
+                    }
+                    iconPos="right"
+                  >
+                    <div className="flex items-center gap-2">
+                      <img
+                        alt={`${name} integration`}
+                        src={`/images/integrations/${image}`}
+                        className="h-4 w-4"
+                      />
+                      <span>{name}</span>
+                    </div>
+                  </DropdownMenuItem>
+                );
+              })
+            ) : (
+              <DropdownMenuItem isDisabled>No PKI Syncs Configured</DropdownMenuItem>
+            )}
+          </DropdownMenuContent>
+        </DropdownMenu>
+      </div>
+      <TableContainer className="mt-4">
+        <Table>
+          <THead>
+            <Tr>
+              <Th className="w-2" />
+              <Th className="w-1/4">
+                <div className="flex items-center">
+                  Name
+                  <IconButton
+                    variant="plain"
+                    className={getClassName(PkiSyncsOrderBy.Name)}
+                    ariaLabel="sort"
+                    onClick={() => handleSort(PkiSyncsOrderBy.Name)}
+                  >
+                    <FontAwesomeIcon icon={getColSortIcon(PkiSyncsOrderBy.Name)} />
+                  </IconButton>
+                </div>
+              </Th>
+              <Th className="w-1/3">
+                <div className="flex items-center">
+                  Source
+                  <IconButton
+                    variant="plain"
+                    className={getClassName(PkiSyncsOrderBy.Source)}
+                    ariaLabel="sort"
+                    onClick={() => handleSort(PkiSyncsOrderBy.Source)}
+                  >
+                    <FontAwesomeIcon icon={getColSortIcon(PkiSyncsOrderBy.Source)} />
+                  </IconButton>
+                </div>
+              </Th>
+              <Th className="w-1/3">
+                <div className="flex items-center">
+                  Destination
+                  <IconButton
+                    variant="plain"
+                    className={getClassName(PkiSyncsOrderBy.Destination)}
+                    ariaLabel="sort"
+                    onClick={() => handleSort(PkiSyncsOrderBy.Destination)}
+                  >
+                    <FontAwesomeIcon icon={getColSortIcon(PkiSyncsOrderBy.Destination)} />
+                  </IconButton>
+                </div>
+              </Th>
+              <Th className="min-w-[10.5rem]">
+                <div className="flex items-center">
+                  Status
+                  <IconButton
+                    variant="plain"
+                    className={getClassName(PkiSyncsOrderBy.Status)}
+                    ariaLabel="sort"
+                    onClick={() => handleSort(PkiSyncsOrderBy.Status)}
+                  >
+                    <FontAwesomeIcon icon={getColSortIcon(PkiSyncsOrderBy.Status)} />
+                  </IconButton>
+                </div>
+              </Th>
+              <Th className="w-5" />
+            </Tr>
+          </THead>
+          <TBody>
+            {filteredPkiSyncs.slice(offset, perPage * page).map((pkiSync) => (
+              <PkiSyncRow
+                key={pkiSync.id}
+                pkiSync={pkiSync}
+                onDelete={handleDelete}
+                onTriggerSyncCertificates={handleTriggerSync}
+                onTriggerImportCertificates={handleTriggerImportCertificates}
+                onTriggerRemoveCertificates={handleTriggerRemoveCertificates}
+                onToggleEnable={handleToggleEnableSync}
+              />
+            ))}
+          </TBody>
+        </Table>
+        {Boolean(filteredPkiSyncs.length) && (
+          <Pagination
+            count={filteredPkiSyncs.length}
+            page={page}
+            perPage={perPage}
+            onChangePage={setPage}
+            onChangePerPage={handlePerPageChange}
+          />
+        )}
+        {!filteredPkiSyncs?.length && (
+          <EmptyState
+            title={
+              pkiSyncs.length ? "No syncs match search..." : "This project has no syncs configured"
+            }
+            icon={pkiSyncs.length ? faSearch : faRotate}
+          />
+        )}
+      </TableContainer>
+      <DeletePkiSyncModal
+        onOpenChange={(isOpen) => handlePopUpToggle("deleteSync", isOpen)}
+        isOpen={popUp.deleteSync.isOpen}
+        pkiSync={popUp.deleteSync.data}
+      />
+      {popUp.importCertificates.data && (
+        <PkiSyncImportCertificatesModal
+          onOpenChange={(isOpen) => handlePopUpToggle("importCertificates", isOpen)}
+          isOpen={popUp.importCertificates.isOpen}
+          pkiSync={popUp.importCertificates.data}
+        />
+      )}
+      <PkiSyncRemoveCertificatesModal
+        onOpenChange={(isOpen) => handlePopUpToggle("removeCertificates", isOpen)}
+        isOpen={popUp.removeCertificates.isOpen}
+        pkiSync={popUp.removeCertificates.data}
+      />
+    </div>
+  );
+};

frontend/src/pages/cert-manager/IntegrationsListPage/components/PkiSyncsTab/PkiSyncTable/helpers.ts

@@ -0,0 +1,13 @@
+import { TPkiSync } from "@app/hooks/api/pkiSyncs";
+
+export const getPkiSyncDestinationColValues = (pkiSync: TPkiSync) => {
+  const { destination } = pkiSync;
+
+  switch (destination) {
+    default:
+      return {
+        primaryText: pkiSync.name,
+        secondaryText: pkiSync.appConnectionName || "Unknown Connection"
+      };
+  }
+};

frontend/src/pages/cert-manager/IntegrationsListPage/components/PkiSyncsTab/PkiSyncTable/index.ts

@@ -0,0 +1 @@
+export { PkiSyncsTable } from "./PkiSyncsTable";

frontend/src/pages/cert-manager/IntegrationsListPage/components/PkiSyncsTab/PkiSyncsTab.tsx

@@ -0,0 +1,113 @@
+import { useCallback, useEffect, useMemo } from "react";
+import { faArrowUpRightFromSquare, faBookOpen, faPlus } from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { useNavigate, useSearch } from "@tanstack/react-router";
+
+import { ProjectPermissionCan } from "@app/components/permissions";
+import { CreatePkiSyncModal } from "@app/components/pki-syncs";
+import { Button, Spinner } from "@app/components/v2";
+import { ROUTE_PATHS } from "@app/const/routes";
+import { ProjectPermissionSub, useProject } from "@app/context";
+import { ProjectPermissionPkiSyncActions } from "@app/context/ProjectPermissionContext/types";
+import { usePopUp } from "@app/hooks";
+import { useListPkiSyncs } from "@app/hooks/api/pkiSyncs";
+
+import { PkiSyncsTable } from "./PkiSyncTable";
+
+export const PkiSyncsTab = () => {
+  const { popUp, handlePopUpOpen, handlePopUpToggle } = usePopUp(["addSync"] as const);
+
+  const { addSync, ...search } = useSearch({
+    from: ROUTE_PATHS.CertManager.IntegrationsListPage.id
+  });
+
+  const navigate = useNavigate();
+
+  const { currentProject } = useProject();
+
+  const memoizedSearch = useMemo(() => search, [search]);
+
+  const navigateToBase = useCallback(() => {
+    navigate({
+      to: ROUTE_PATHS.CertManager.IntegrationsListPage.path,
+      params: {
+        projectId: currentProject?.id
+      },
+      search: memoizedSearch
+    });
+  }, [navigate, currentProject?.id, memoizedSearch]);
+
+  useEffect(() => {
+    if (!addSync) return;
+
+    handlePopUpOpen("addSync", addSync);
+    navigateToBase();
+  }, [addSync, handlePopUpOpen, navigateToBase]);
+
+  const { data: pkiSyncs = [], isPending: isPkiSyncsPending } = useListPkiSyncs(
+    currentProject?.id || "",
+    {
+      refetchInterval: 30000
+    }
+  );
+
+  if (isPkiSyncsPending)
+    return (
+      <div className="flex h-[60vh] flex-col items-center justify-center gap-2">
+        <Spinner />
+      </div>
+    );
+
+  return (
+    <>
+      <div className="w-full rounded-lg border border-mineshaft-600 bg-mineshaft-900 p-4">
+        <div className="mb-4 flex items-center justify-between">
+          <div>
+            <div className="flex items-start gap-1">
+              <p className="text-xl font-semibold text-mineshaft-100">Certificate Syncs</p>
+              <a
+                href="https://infisical.com/docs/integrations/pki-syncs/overview"
+                target="_blank"
+                rel="noopener noreferrer"
+              >
+                <div className="ml-1 mt-[0.32rem] inline-block rounded-md bg-yellow/20 px-1.5 text-sm text-yellow opacity-80 hover:opacity-100">
+                  <FontAwesomeIcon icon={faBookOpen} className="mr-1.5" />
+                  <span>Docs</span>
+                  <FontAwesomeIcon
+                    icon={faArrowUpRightFromSquare}
+                    className="mb-[0.07rem] ml-1.5 text-[10px]"
+                  />
+                </div>
+              </a>
+            </div>
+            <p className="text-sm text-bunker-300">
+              Use App Connections to sync certificates to third-party services.
+            </p>
+          </div>
+          <ProjectPermissionCan
+            I={ProjectPermissionPkiSyncActions.Create}
+            a={ProjectPermissionSub.PkiSyncs}
+          >
+            {(isAllowed) => (
+              <Button
+                colorSchema="secondary"
+                type="button"
+                leftIcon={<FontAwesomeIcon icon={faPlus} />}
+                onClick={() => handlePopUpOpen("addSync")}
+                isDisabled={!isAllowed}
+              >
+                Add Sync
+              </Button>
+            )}
+          </ProjectPermissionCan>
+        </div>
+        <PkiSyncsTable pkiSyncs={pkiSyncs} />
+      </div>
+      <CreatePkiSyncModal
+        selectSync={popUp.addSync.data}
+        isOpen={popUp.addSync.isOpen}
+        onOpenChange={(isOpen) => handlePopUpToggle("addSync", isOpen)}
+      />
+    </>
+  );
+};

frontend/src/pages/cert-manager/IntegrationsListPage/components/PkiSyncsTab/index.ts

@@ -0,0 +1 @@
+export { PkiSyncsTab } from "./PkiSyncsTab";

frontend/src/pages/cert-manager/IntegrationsListPage/components/index.ts

@@ -0,0 +1 @@
+export { PkiSyncsTab } from "./PkiSyncsTab";

frontend/src/pages/cert-manager/IntegrationsListPage/index.ts

@@ -0,0 +1 @@
+export { IntegrationsListPage } from "./IntegrationsListPage";

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

@@ -0,0 +1,30 @@
+import { createFileRoute } from "@tanstack/react-router";
+import { zodValidator } from "@tanstack/zod-adapter";
+import { z } from "zod";
+
+import { PkiSync } from "@app/hooks/api/pkiSyncs";
+import { IntegrationsListPageTabs } from "@app/types/integrations";
+
+import { IntegrationsListPage } from "./IntegrationsListPage";
+
+const IntegrationsListPageQuerySchema = z.object({
+  selectedTab: z.nativeEnum(IntegrationsListPageTabs).optional(),
+  addSync: z.nativeEnum(PkiSync).optional()
+});
+
+export const Route = createFileRoute(
+  "/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId/_cert-manager-layout/integrations/"
+)({
+  component: IntegrationsListPage,
+  validateSearch: zodValidator(IntegrationsListPageQuerySchema),
+  beforeLoad: ({ context }) => {
+    return {
+      breadcrumbs: [
+        ...context.breadcrumbs,
+        {
+          label: "Integrations"
+        }
+      ]
+    };
+  }
+});

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

@@ -16,7 +16,7 @@ import {
   Tooltip
 } from "@app/components/v2";
 import { ROUTE_PATHS } from "@app/const/routes";
-import { ProjectPermissionActions, ProjectPermissionSub, useWorkspace } from "@app/context";
+import { ProjectPermissionActions, ProjectPermissionSub, useProject } from "@app/context";
 import { useDeletePkiCollection, useGetPkiCollectionById } from "@app/hooks/api";
 import { PkiItemType } from "@app/hooks/api/pkiCollections/constants";
 import { usePopUp } from "@app/hooks/usePopUp";
@@ -30,8 +30,8 @@ export const PkiCollectionPage = () => {
     from: ROUTE_PATHS.CertManager.PkiCollectionDetailsByIDPage.id
   });
   const collectionId = params.collectionId as string;
-  const { currentWorkspace } = useWorkspace();
-  const projectId = currentWorkspace?.id || "";
+  const { currentProject } = useProject();
+  const projectId = currentProject?.id || "";
 
   const { data } = useGetPkiCollectionById(collectionId);
   const { mutateAsync: deletePkiCollection } = useDeletePkiCollection();

frontend/src/pages/cert-manager/PkiCollectionDetailsByIDPage/components/AddPkiCollectionItemModal.tsx

@@ -4,7 +4,7 @@ import { z } from "zod";
 
 import { createNotification } from "@app/components/notifications";
 import { Button, FormControl, Modal, ModalContent, Select, SelectItem } from "@app/components/v2";
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import {
   CaStatus,
   useAddItemToPkiCollection,
@@ -41,15 +41,15 @@ export const AddPkiCollectionItemModal = ({
   popUp,
   handlePopUpToggle
 }: Props) => {
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
 
   const { data: cas } = useListWorkspaceCas({
-    projectSlug: currentWorkspace?.slug || "",
+    projectId: currentProject?.id || "",
     status: CaStatus.ACTIVE
   });
 
   const { data } = useListWorkspaceCertificates({
-    projectSlug: currentWorkspace?.slug || "",
+    projectId: currentProject?.slug || "",
     offset: 0,
     limit: 25
   });

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

@@ -19,7 +19,7 @@ import { ROUTE_PATHS } from "@app/const/routes";
 import {
   ProjectPermissionPkiSubscriberActions,
   ProjectPermissionSub,
-  useWorkspace
+  useProject
 } from "@app/context";
 import { useDeletePkiSubscriber, useGetPkiSubscriber } from "@app/hooks/api";
 import { usePopUp } from "@app/hooks/usePopUp";
@@ -29,8 +29,8 @@ import { PkiSubscriberCertificatesSection, PkiSubscriberDetailsSection } from ".
 
 const Page = () => {
   const navigate = useNavigate();
-  const { currentWorkspace } = useWorkspace();
-  const projectId = currentWorkspace.id;
+  const { currentProject } = useProject();
+  const projectId = currentProject.id;
   const subscriberName = useParams({
     from: ROUTE_PATHS.CertManager.PkiSubscriberDetailsByIDPage.id,
     select: (el) => el.subscriberName

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

@@ -27,8 +27,8 @@ import {
 import {
   ProjectPermissionPkiSubscriberActions,
   ProjectPermissionSub,
-  useProjectPermission,
-  useWorkspace
+  useProject,
+  useProjectPermission
 } from "@app/context";
 import { useGetPkiSubscriberCertificates } from "@app/hooks/api";
 import { caSupportsCapability } from "@app/hooks/api/ca/constants";
@@ -45,8 +45,8 @@ type Props = {
 const PER_PAGE_INIT = 25;
 
 export const PkiSubscriberCertificatesTable = ({ subscriberName, handlePopUpOpen }: Props) => {
-  const { currentWorkspace } = useWorkspace();
-  const projectId = currentWorkspace.id;
+  const { currentProject } = useProject();
+  const projectId = currentProject.id;
   const { permission } = useProjectPermission();
   const [page, setPage] = useState(1);
   const [perPage, setPerPage] = useState(PER_PAGE_INIT);
@@ -64,7 +64,7 @@ export const PkiSubscriberCertificatesTable = ({ subscriberName, handlePopUpOpen
   );
 
   // Fetch CA data to determine capabilities
-  const { data: caData } = useListCasByProjectId(currentWorkspace.id);
+  const { data: caData } = useListCasByProjectId(currentProject.id);
 
   // Create mapping from caId to CA type for capability checking
   const caCapabilityMap = useMemo(() => {

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

@@ -16,8 +16,8 @@ import {
 import {
   ProjectPermissionPkiSubscriberActions,
   ProjectPermissionSub,
-  useProjectPermission,
-  useWorkspace
+  useProject,
+  useProjectPermission
 } from "@app/context";
 import { useTimedReset } from "@app/hooks";
 import {
@@ -44,8 +44,8 @@ type TCertificateDetails = {
 };
 
 export const PkiSubscriberDetailsSection = ({ subscriberName, handlePopUpOpen }: Props) => {
-  const { currentWorkspace } = useWorkspace();
-  const projectId = currentWorkspace.id;
+  const { currentProject } = useProject();
+  const projectId = currentProject.id;
   const { permission } = useProjectPermission();
   const [certificateDetails, setCertificateDetails] = useState<TCertificateDetails | null>(null);
   const [isModalOpen, setIsModalOpen] = useState(false);

frontend/src/pages/cert-manager/PkiSubscribersPage/components/PkiSubscriberModal.tsx

@@ -22,7 +22,7 @@ import {
   TabPanel,
   Tabs
 } from "@app/components/v2";
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import {
   CaType,
   useCreatePkiSubscriber,
@@ -158,8 +158,8 @@ const schema = z
 export type FormData = z.infer<typeof schema>;
 
 export const PkiSubscriberModal = ({ popUp, handlePopUpToggle }: Props) => {
-  const { currentWorkspace } = useWorkspace();
-  const projectId = currentWorkspace.id;
+  const { currentProject } = useProject();
+  const projectId = currentProject.id;
   const { data: subscribers } = useListWorkspacePkiSubscribers(projectId);
   const { data: cas } = useListCasByProjectId(projectId);
   const [tabValue, setTabValue] = useState<FormTab>(FormTab.Configuration);

frontend/src/pages/cert-manager/PkiSubscribersPage/components/PkiSubscriberSection.tsx

@@ -7,7 +7,7 @@ import { Button, DeleteActionModal } from "@app/components/v2";
 import {
   ProjectPermissionPkiSubscriberActions,
   ProjectPermissionSub,
-  useWorkspace
+  useProject
 } from "@app/context";
 import { useDeletePkiSubscriber, useUpdatePkiSubscriber } from "@app/hooks/api";
 import { PkiSubscriberStatus } from "@app/hooks/api/pkiSubscriber/types";
@@ -17,8 +17,8 @@ import { PkiSubscriberModal } from "./PkiSubscriberModal";
 import { PkiSubscribersTable } from "./PkiSubscribersTable";
 
 export const PkiSubscriberSection = () => {
-  const { currentWorkspace } = useWorkspace();
-  const projectId = currentWorkspace.id;
+  const { currentProject } = useProject();
+  const projectId = currentProject.id;
   const { mutateAsync: deletePkiSubscriber } = useDeletePkiSubscriber();
   const { mutateAsync: updatePkiSubscriber } = useUpdatePkiSubscriber();
 
@@ -55,7 +55,7 @@ export const PkiSubscriberSection = () => {
     status: PkiSubscriberStatus;
   }) => {
     try {
-      if (!currentWorkspace?.slug) return;
+      if (!currentProject?.slug) return;
 
       await updatePkiSubscriber({ subscriberName, projectId, status });
 

frontend/src/pages/cert-manager/PkiSubscribersPage/components/PkiSubscribersTable.tsx

@@ -30,7 +30,7 @@ import {
 import {
   ProjectPermissionPkiSubscriberActions,
   ProjectPermissionSub,
-  useWorkspace
+  useProject
 } from "@app/context";
 import { useListWorkspacePkiSubscribers } from "@app/hooks/api";
 import {
@@ -49,8 +49,8 @@ type Props = {
 
 export const PkiSubscribersTable = ({ handlePopUpOpen }: Props) => {
   const navigate = useNavigate();
-  const { currentWorkspace } = useWorkspace();
-  const { data, isPending } = useListWorkspacePkiSubscribers(currentWorkspace?.id || "");
+  const { currentProject } = useProject();
+  const { data, isPending } = useListWorkspacePkiSubscribers(currentProject?.id || "");
   return (
     <div>
       <TableContainer>
@@ -77,7 +77,7 @@ export const PkiSubscribersTable = ({ handlePopUpOpen }: Props) => {
                       navigate({
                         to: "/projects/cert-management/$projectId/subscribers/$subscriberName",
                         params: {
-                          projectId: currentWorkspace.id,
+                          projectId: currentProject.id,
                           subscriberName: subscriber.name
                         }
                       })

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

@@ -0,0 +1,146 @@
+import { Helmet } from "react-helmet";
+import { faBan, faChevronLeft } from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { useNavigate, useParams } from "@tanstack/react-router";
+
+import { ProjectPermissionCan } from "@app/components/permissions";
+import { EditPkiSyncModal } from "@app/components/pki-syncs";
+import { PkiSyncEditFields } from "@app/components/pki-syncs/types";
+import { Button, ContentLoader, EmptyState } from "@app/components/v2";
+import { ROUTE_PATHS } from "@app/const/routes";
+import { ProjectPermissionSub } from "@app/context";
+import { ProjectPermissionPkiSyncActions } from "@app/context/ProjectPermissionContext/types";
+import { PKI_SYNC_MAP } from "@app/helpers/pkiSyncs";
+import { usePopUp } from "@app/hooks";
+import { useGetPkiSync } from "@app/hooks/api/pkiSyncs";
+import { IntegrationsListPageTabs } from "@app/types/integrations";
+
+import {
+  PkiSyncActionTriggers,
+  PkiSyncAuditLogsSection,
+  PkiSyncDestinationSection,
+  PkiSyncDetailsSection,
+  PkiSyncOptionsSection,
+  PkiSyncSourceSection
+} from "./components";
+
+const PageContent = () => {
+  const navigate = useNavigate();
+  const { syncId, projectId } = useParams({
+    from: ROUTE_PATHS.CertManager.PkiSyncDetailsByIDPage.id
+  });
+
+  const { handlePopUpToggle, popUp, handlePopUpOpen } = usePopUp(["editSync"] as const);
+
+  const { data: pkiSync, isPending } = useGetPkiSync(
+    { syncId, projectId },
+    {
+      refetchInterval: 30000
+    }
+  );
+
+  if (isPending) {
+    return (
+      <div className="flex h-full w-full items-center justify-center">
+        <ContentLoader />
+      </div>
+    );
+  }
+
+  if (!pkiSync) {
+    return (
+      <div className="flex h-full w-full items-center justify-center px-20">
+        <EmptyState
+          className="max-w-2xl rounded-md text-center"
+          icon={faBan}
+          title={`Could not find PKI Sync with ID ${syncId}`}
+        />
+      </div>
+    );
+  }
+
+  const destinationDetails = PKI_SYNC_MAP[pkiSync.destination];
+
+  const handleEditDetails = () => handlePopUpOpen("editSync", PkiSyncEditFields.Details);
+  const handleEditSource = () => handlePopUpOpen("editSync", PkiSyncEditFields.Source);
+  const handleEditOptions = () => handlePopUpOpen("editSync", PkiSyncEditFields.Options);
+  const handleEditDestination = () => handlePopUpOpen("editSync", PkiSyncEditFields.Destination);
+
+  return (
+    <>
+      <div className="container mx-auto flex flex-col justify-between bg-bunker-800 font-inter text-white">
+        <div className="mx-auto mb-6 w-full max-w-7xl">
+          <Button
+            variant="link"
+            type="submit"
+            leftIcon={<FontAwesomeIcon icon={faChevronLeft} />}
+            onClick={() => {
+              navigate({
+                to: ROUTE_PATHS.CertManager.IntegrationsListPage.path,
+                params: {
+                  projectId
+                },
+                search: {
+                  selectedTab: IntegrationsListPageTabs.PkiSyncs
+                }
+              });
+            }}
+          >
+            PKI Syncs
+          </Button>
+          <div className="mb-6 flex w-full items-center gap-3">
+            <img
+              alt={`${destinationDetails.name} sync`}
+              src={`/images/integrations/${destinationDetails.image}`}
+              className="ml-1 mt-3 w-16"
+            />
+            <div>
+              <p className="text-3xl font-semibold text-white">{pkiSync.name}</p>
+              <p className="leading-3 text-bunker-300">{destinationDetails.name} PKI Sync</p>
+            </div>
+            <PkiSyncActionTriggers pkiSync={pkiSync} />
+          </div>
+          <div className="flex justify-center">
+            <div className="mr-4 flex w-72 flex-col gap-4">
+              <PkiSyncDetailsSection pkiSync={pkiSync} onEditDetails={handleEditDetails} />
+              <PkiSyncSourceSection pkiSync={pkiSync} onEditSource={handleEditSource} />
+              <PkiSyncOptionsSection pkiSync={pkiSync} onEditOptions={handleEditOptions} />
+            </div>
+            <div className="flex flex-1 flex-col gap-4">
+              <PkiSyncDestinationSection
+                pkiSync={pkiSync}
+                onEditDestination={handleEditDestination}
+              />
+              <PkiSyncAuditLogsSection pkiSync={pkiSync} />
+            </div>
+          </div>
+        </div>
+      </div>
+      <EditPkiSyncModal
+        isOpen={popUp.editSync.isOpen}
+        onOpenChange={(isOpen) => handlePopUpToggle("editSync", isOpen)}
+        fields={popUp.editSync.data}
+        pkiSync={pkiSync}
+      />
+    </>
+  );
+};
+
+export const PkiSyncDetailsByIDPage = () => {
+  return (
+    <>
+      <Helmet>
+        <title>PKI Sync | Infisical</title>
+        <link rel="icon" href="/infisical.ico" />
+      </Helmet>
+      <ProjectPermissionCan
+        renderGuardBanner
+        passThrough={false}
+        I={ProjectPermissionPkiSyncActions.Read}
+        a={ProjectPermissionSub.PkiSyncs}
+      >
+        <PageContent />
+      </ProjectPermissionCan>
+    </>
+  );
+};

frontend/src/pages/cert-manager/PkiSyncDetailsByIDPage/components/PkiSyncActionTriggers.tsx

@@ -0,0 +1,321 @@
+import { useCallback } from "react";
+import { subject } from "@casl/ability";
+import {
+  faBan,
+  faCheck,
+  faCopy,
+  faDownload,
+  faEllipsisV,
+  faEraser,
+  faInfoCircle,
+  faRotate,
+  faToggleOff,
+  faToggleOn,
+  faTrash
+} from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { useNavigate } from "@tanstack/react-router";
+
+import { createNotification } from "@app/components/notifications";
+import { ProjectPermissionCan } from "@app/components/permissions";
+import {
+  DeletePkiSyncModal,
+  PkiSyncImportCertificatesModal,
+  PkiSyncImportStatusBadge,
+  PkiSyncRemoveCertificatesModal,
+  PkiSyncRemoveStatusBadge
+} from "@app/components/pki-syncs";
+import {
+  Badge,
+  Button,
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+  IconButton,
+  Tooltip
+} from "@app/components/v2";
+import { ROUTE_PATHS } from "@app/const/routes";
+import { ProjectPermissionSub } from "@app/context";
+import { ProjectPermissionPkiSyncActions } from "@app/context/ProjectPermissionContext/types";
+import { PKI_SYNC_MAP } from "@app/helpers/pkiSyncs";
+import { usePopUp, useToggle } from "@app/hooks";
+import {
+  TPkiSync,
+  usePkiSyncOption,
+  useTriggerPkiSyncSyncCertificates,
+  useUpdatePkiSync
+} from "@app/hooks/api/pkiSyncs";
+import { IntegrationsListPageTabs } from "@app/types/integrations";
+
+type Props = {
+  pkiSync: TPkiSync;
+};
+
+export const PkiSyncActionTriggers = ({ pkiSync }: Props) => {
+  const { destination, subscriberId, projectId, id } = pkiSync;
+
+  const navigate = useNavigate();
+  const { popUp, handlePopUpOpen, handlePopUpToggle } = usePopUp([
+    "importCertificates",
+    "removeCertificates",
+    "deleteSync"
+  ] as const);
+
+  const [isIdCopied, setIsIdCopied] = useToggle(false);
+
+  // API mutations
+  const triggerSyncMutation = useTriggerPkiSyncSyncCertificates();
+  const updatePkiSyncMutation = useUpdatePkiSync();
+
+  const { syncOption } = usePkiSyncOption(destination);
+
+  const destinationName = PKI_SYNC_MAP[destination].name;
+
+  const handleCopyId = useCallback(() => {
+    setIsIdCopied.on();
+    navigator.clipboard.writeText(pkiSync.id);
+
+    createNotification({
+      text: "PKI Sync ID copied to clipboard",
+      type: "info"
+    });
+
+    const timer = setTimeout(() => setIsIdCopied.off(), 2000);
+    return () => clearTimeout(timer);
+  }, [pkiSync.id, setIsIdCopied]);
+
+  const handleTriggerSync = useCallback(async () => {
+    try {
+      await triggerSyncMutation.mutateAsync({
+        syncId: id,
+        destination,
+        projectId
+      });
+      createNotification({
+        text: "PKI sync job queued successfully",
+        type: "success"
+      });
+    } catch (error) {
+      console.error("Failed to trigger sync:", error);
+      createNotification({
+        text: "Failed to trigger PKI sync",
+        type: "error"
+      });
+    }
+  }, [triggerSyncMutation, id, destination, projectId]);
+
+  const handleToggleAutoSync = useCallback(async () => {
+    try {
+      await updatePkiSyncMutation.mutateAsync({
+        syncId: id,
+        projectId,
+        destination,
+        isAutoSyncEnabled: !pkiSync.isAutoSyncEnabled
+      });
+      createNotification({
+        text: `Auto-sync ${pkiSync.isAutoSyncEnabled ? "disabled" : "enabled"} successfully`,
+        type: "success"
+      });
+    } catch (error) {
+      console.error("Failed to toggle auto-sync:", error);
+      createNotification({
+        text: "Failed to toggle auto-sync",
+        type: "error"
+      });
+    }
+  }, [updatePkiSyncMutation, id, projectId, pkiSync.isAutoSyncEnabled]);
+
+  const permissionSubject = subject(ProjectPermissionSub.PkiSyncs, {
+    subscriberId: subscriberId || ""
+  });
+
+  return (
+    <>
+      <div className="ml-auto mt-4 flex flex-wrap items-center justify-end gap-2">
+        {syncOption?.canImportCertificates && <PkiSyncImportStatusBadge pkiSync={pkiSync} />}
+        <PkiSyncRemoveStatusBadge pkiSync={pkiSync} />
+        {pkiSync.isAutoSyncEnabled ? (
+          <Badge
+            variant="success"
+            className="flex h-5 w-min items-center gap-1.5 whitespace-nowrap"
+          >
+            <FontAwesomeIcon icon={faRotate} />
+            <span>Auto-Sync Enabled</span>
+          </Badge>
+        ) : (
+          <Tooltip
+            className="text-xs"
+            content="Auto-Sync is disabled. Certificate changes in the PKI subscriber will not be automatically synced to the destination."
+          >
+            <div>
+              <Badge className="flex h-5 w-min items-center gap-1.5 whitespace-nowrap bg-mineshaft-400/50 text-bunker-300">
+                <FontAwesomeIcon icon={faBan} />
+                <span>Auto-Sync Disabled</span>
+              </Badge>
+            </div>
+          </Tooltip>
+        )}
+        <div>
+          <ProjectPermissionCan
+            I={ProjectPermissionPkiSyncActions.SyncCertificates}
+            a={permissionSubject}
+          >
+            {(isAllowed: boolean) => (
+              <Button
+                variant="outline_bg"
+                leftIcon={<FontAwesomeIcon icon={faRotate} />}
+                className="h-9 rounded-r-none bg-mineshaft-500"
+                isDisabled={!isAllowed || triggerSyncMutation.isPending}
+                isLoading={triggerSyncMutation.isPending}
+                onClick={handleTriggerSync}
+              >
+                Trigger Sync
+              </Button>
+            )}
+          </ProjectPermissionCan>
+          <DropdownMenu>
+            <DropdownMenuTrigger asChild>
+              <IconButton
+                ariaLabel="add-folder-or-import"
+                variant="outline_bg"
+                className="h-9 w-10 rounded-l-none border-l-2 border-mineshaft border-l-mineshaft-700 bg-mineshaft-500"
+              >
+                <FontAwesomeIcon icon={faEllipsisV} />
+              </IconButton>
+            </DropdownMenuTrigger>
+            <DropdownMenuContent align="end">
+              <DropdownMenuItem
+                icon={<FontAwesomeIcon icon={isIdCopied ? faCheck : faCopy} />}
+                onClick={(e) => {
+                  e.stopPropagation();
+                  handleCopyId();
+                }}
+              >
+                Copy Sync ID
+              </DropdownMenuItem>
+
+              {syncOption?.canImportCertificates && (
+                <ProjectPermissionCan
+                  I={ProjectPermissionPkiSyncActions.ImportCertificates}
+                  a={permissionSubject}
+                >
+                  {(isAllowed: boolean) => (
+                    <DropdownMenuItem
+                      icon={<FontAwesomeIcon icon={faDownload} />}
+                      onClick={() => handlePopUpOpen("importCertificates")}
+                      isDisabled={!isAllowed}
+                    >
+                      <Tooltip
+                        position="left"
+                        sideOffset={42}
+                        content={`Import certificates from this ${destinationName} destination into Infisical.`}
+                      >
+                        <div className="flex h-full w-full items-center justify-between gap-1">
+                          <span>Import Certificates</span>
+                          <FontAwesomeIcon
+                            className="text-bunker-300"
+                            size="sm"
+                            icon={faInfoCircle}
+                          />
+                        </div>
+                      </Tooltip>
+                    </DropdownMenuItem>
+                  )}
+                </ProjectPermissionCan>
+              )}
+
+              <ProjectPermissionCan
+                I={ProjectPermissionPkiSyncActions.RemoveCertificates}
+                a={permissionSubject}
+              >
+                {(isAllowed: boolean) => (
+                  <DropdownMenuItem
+                    icon={<FontAwesomeIcon icon={faEraser} />}
+                    onClick={() => handlePopUpOpen("removeCertificates")}
+                    isDisabled={!isAllowed}
+                  >
+                    <Tooltip
+                      position="left"
+                      sideOffset={42}
+                      content={`Remove certificates synced by Infisical from this ${destinationName} destination.`}
+                    >
+                      <div className="flex h-full w-full items-center justify-between gap-1">
+                        <span>Remove Certificates</span>
+                        <FontAwesomeIcon
+                          className="text-bunker-300"
+                          size="sm"
+                          icon={faInfoCircle}
+                        />
+                      </div>
+                    </Tooltip>
+                  </DropdownMenuItem>
+                )}
+              </ProjectPermissionCan>
+
+              <ProjectPermissionCan I={ProjectPermissionPkiSyncActions.Edit} a={permissionSubject}>
+                {(isAllowed: boolean) => (
+                  <DropdownMenuItem
+                    isDisabled={!isAllowed || updatePkiSyncMutation.isPending}
+                    icon={
+                      <FontAwesomeIcon
+                        icon={pkiSync.isAutoSyncEnabled ? faToggleOff : faToggleOn}
+                      />
+                    }
+                    onClick={handleToggleAutoSync}
+                  >
+                    {pkiSync.isAutoSyncEnabled ? "Disable" : "Enable"} Auto-Sync
+                  </DropdownMenuItem>
+                )}
+              </ProjectPermissionCan>
+
+              <ProjectPermissionCan
+                I={ProjectPermissionPkiSyncActions.Delete}
+                a={permissionSubject}
+              >
+                {(isAllowed: boolean) => (
+                  <DropdownMenuItem
+                    isDisabled={!isAllowed}
+                    icon={<FontAwesomeIcon icon={faTrash} />}
+                    onClick={() => handlePopUpOpen("deleteSync")}
+                  >
+                    Delete Sync
+                  </DropdownMenuItem>
+                )}
+              </ProjectPermissionCan>
+            </DropdownMenuContent>
+          </DropdownMenu>
+        </div>
+      </div>
+
+      {syncOption?.canImportCertificates && (
+        <PkiSyncImportCertificatesModal
+          onOpenChange={(isOpen) => handlePopUpToggle("importCertificates", isOpen)}
+          isOpen={popUp.importCertificates.isOpen}
+          pkiSync={pkiSync}
+        />
+      )}
+      <PkiSyncRemoveCertificatesModal
+        onOpenChange={(isOpen) => handlePopUpToggle("removeCertificates", isOpen)}
+        isOpen={popUp.removeCertificates.isOpen}
+        pkiSync={pkiSync}
+      />
+      <DeletePkiSyncModal
+        onOpenChange={(isOpen) => handlePopUpToggle("deleteSync", isOpen)}
+        isOpen={popUp.deleteSync.isOpen}
+        pkiSync={pkiSync}
+        onComplete={() =>
+          navigate({
+            to: ROUTE_PATHS.CertManager.IntegrationsListPage.path,
+            params: {
+              projectId
+            },
+            search: {
+              selectedTab: IntegrationsListPageTabs.PkiSyncs
+            }
+          })
+        }
+      />
+    </>
+  );
+};

frontend/src/pages/cert-manager/PkiSyncDetailsByIDPage/components/PkiSyncAuditLogsSection.tsx

@@ -0,0 +1,78 @@
+import { faFingerprint } from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { Link } from "@tanstack/react-router";
+
+import { useProject, useSubscription } from "@app/context";
+import { EventType } from "@app/hooks/api/auditLogs/enums";
+import { TPkiSync } from "@app/hooks/api/pkiSyncs";
+import { LogsSection } from "@app/pages/organization/AuditLogsPage/components/LogsSection";
+
+const PKI_SYNC_EVENTS = [
+  EventType.PKI_SYNC_SYNC_CERTIFICATES,
+  EventType.PKI_SYNC_IMPORT_CERTIFICATES,
+  EventType.PKI_SYNC_REMOVE_CERTIFICATES
+];
+
+type Props = {
+  pkiSync: TPkiSync;
+};
+
+export const PkiSyncAuditLogsSection = ({ pkiSync }: Props) => {
+  const { subscription } = useSubscription();
+  const { currentProject } = useProject();
+
+  const auditLogsRetentionDays = subscription?.auditLogsRetentionDays ?? 30;
+
+  return (
+    <div className="flex max-h-full w-full flex-col gap-3 rounded-lg border border-mineshaft-600 bg-mineshaft-900 px-4 py-3">
+      <div className="flex items-center justify-between border-b border-mineshaft-400 pb-2">
+        <h3 className="font-semibold text-mineshaft-100">Sync Logs</h3>
+        {subscription.auditLogs && (
+          <p className="text-xs text-bunker-300">
+            Displaying audit logs from the last {Math.min(auditLogsRetentionDays, 60)} days
+          </p>
+        )}
+      </div>
+      {subscription.auditLogs ? (
+        <LogsSection
+          refetchInterval={4000}
+          showFilters={false}
+          project={currentProject}
+          presets={{
+            eventMetadata: { syncId: pkiSync.id },
+            startDate: new Date(
+              new Date().setDate(new Date().getDate() - Math.min(auditLogsRetentionDays, 60))
+            ),
+            eventType: PKI_SYNC_EVENTS
+          }}
+        />
+      ) : (
+        <div className="flex h-full items-center justify-center rounded-lg bg-mineshaft-800 text-sm text-mineshaft-200">
+          <div className="flex flex-col items-center gap-4 py-20">
+            <FontAwesomeIcon size="2x" icon={faFingerprint} />
+            <p>
+              Please{" "}
+              {subscription && subscription.slug !== null ? (
+                <Link to="/organization/billing" target="_blank" rel="noopener noreferrer">
+                  <span className="cursor-pointer underline transition-all hover:text-white">
+                    upgrade your subscription
+                  </span>
+                </Link>
+              ) : (
+                <a
+                  href="https://infisical.com/scheduledemo"
+                  target="_blank"
+                  rel="noopener noreferrer"
+                  className="cursor-pointer underline transition-all hover:text-white"
+                >
+                  upgrade your subscription
+                </a>
+              )}{" "}
+              to view sync logs.
+            </p>
+          </div>
+        </div>
+      )}
+    </div>
+  );
+};

frontend/src/pages/cert-manager/PkiSyncDetailsByIDPage/components/PkiSyncDestinationSection.tsx

@@ -0,0 +1,73 @@
+/* eslint-disable jsx-a11y/label-has-associated-control */
+import { ReactNode } from "react";
+import { subject } from "@casl/ability";
+import { faEdit } from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+
+import { ProjectPermissionCan } from "@app/components/permissions";
+import { IconButton } from "@app/components/v2";
+import { ProjectPermissionSub } from "@app/context";
+import { ProjectPermissionPkiSyncActions } from "@app/context/ProjectPermissionContext/types";
+import { PKI_SYNC_MAP } from "@app/helpers/pkiSyncs";
+import { PkiSync, TPkiSync } from "@app/hooks/api/pkiSyncs";
+
+import { AzureKeyVaultPkiSyncDestinationSection } from "./PkiSyncDestinationSection/index";
+
+const GenericFieldLabel = ({ label, children }: { label: string; children: React.ReactNode }) => (
+  <div>
+    <label className="text-sm text-bunker-300">{label}</label>
+    <div className="mt-1">{children}</div>
+  </div>
+);
+
+type Props = {
+  pkiSync: TPkiSync;
+  onEditDestination: VoidFunction;
+};
+
+export const PkiSyncDestinationSection = ({ pkiSync, onEditDestination }: Props) => {
+  const { destination, subscriberId } = pkiSync;
+
+  const destinationDetails = PKI_SYNC_MAP[destination];
+
+  let DestinationComponents: ReactNode;
+  switch (destination) {
+    case PkiSync.AzureKeyVault:
+      DestinationComponents = <AzureKeyVaultPkiSyncDestinationSection pkiSync={pkiSync} />;
+      break;
+    default:
+      // For future destinations, return null (no additional fields to show)
+      DestinationComponents = null;
+  }
+
+  const permissionSubject = subject(ProjectPermissionSub.PkiSyncs, {
+    subscriberId: subscriberId || ""
+  });
+
+  return (
+    <div className="flex w-full flex-col gap-3 rounded-lg border border-mineshaft-600 bg-mineshaft-900 px-4 py-3">
+      <div className="flex items-center justify-between border-b border-mineshaft-400 pb-2">
+        <h3 className="font-semibold text-mineshaft-100">Destination Configuration</h3>
+        <ProjectPermissionCan I={ProjectPermissionPkiSyncActions.Edit} a={permissionSubject}>
+          {(isAllowed) => (
+            <IconButton
+              variant="plain"
+              colorSchema="secondary"
+              isDisabled={!isAllowed}
+              ariaLabel="Edit destination"
+              onClick={onEditDestination}
+            >
+              <FontAwesomeIcon icon={faEdit} />
+            </IconButton>
+          )}
+        </ProjectPermissionCan>
+      </div>
+      <div className="flex w-full flex-wrap gap-8">
+        <GenericFieldLabel label={`${destinationDetails.name} Connection`}>
+          {pkiSync.appConnectionName || "Default Connection"}
+        </GenericFieldLabel>
+        {DestinationComponents}
+      </div>
+    </div>
+  );
+};

frontend/src/pages/cert-manager/PkiSyncDetailsByIDPage/components/PkiSyncDestinationSection/AzureKeyVaultPkiSyncDestinationSection.tsx

@@ -0,0 +1,21 @@
+/* eslint-disable jsx-a11y/label-has-associated-control */
+import { TAzureKeyVaultPkiSync } from "@app/hooks/api/pkiSyncs/types/azure-key-vault-sync";
+
+const GenericFieldLabel = ({ label, children }: { label: string; children: React.ReactNode }) => (
+  <div>
+    <label className="text-sm text-bunker-300">{label}</label>
+    <div className="mt-1">{children}</div>
+  </div>
+);
+
+type Props = {
+  pkiSync: TAzureKeyVaultPkiSync;
+};
+
+export const AzureKeyVaultPkiSyncDestinationSection = ({ pkiSync }: Props) => {
+  return (
+    <GenericFieldLabel label="Key Vault URL">
+      {pkiSync.destinationConfig.vaultBaseUrl}
+    </GenericFieldLabel>
+  );
+};

frontend/src/pages/cert-manager/PkiSyncDetailsByIDPage/components/PkiSyncDestinationSection/index.ts

@@ -0,0 +1 @@
+export { AzureKeyVaultPkiSyncDestinationSection } from "./AzureKeyVaultPkiSyncDestinationSection";

frontend/src/pages/cert-manager/PkiSyncDetailsByIDPage/components/PkiSyncDetailsSection.tsx

@@ -0,0 +1,101 @@
+/* eslint-disable jsx-a11y/label-has-associated-control */
+import { useMemo } from "react";
+import { subject } from "@casl/ability";
+import { faEdit } from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { format } from "date-fns";
+
+import { ProjectPermissionCan } from "@app/components/permissions";
+import { PkiSyncStatusBadge } from "@app/components/pki-syncs";
+import { IconButton } from "@app/components/v2";
+import { ProjectPermissionSub } from "@app/context";
+import { ProjectPermissionPkiSyncActions } from "@app/context/ProjectPermissionContext/types";
+import { PkiSyncStatus, TPkiSync } from "@app/hooks/api/pkiSyncs";
+
+const GenericFieldLabel = ({
+  label,
+  children,
+  labelClassName
+}: {
+  label: string;
+  children: React.ReactNode;
+  labelClassName?: string;
+}) => (
+  <div>
+    <label className={`text-sm text-bunker-300 ${labelClassName || ""}`}>{label}</label>
+    <div className="mt-1">{children}</div>
+  </div>
+);
+
+type Props = {
+  pkiSync: TPkiSync;
+  onEditDetails: VoidFunction;
+};
+
+export const PkiSyncDetailsSection = ({ pkiSync, onEditDetails }: Props) => {
+  const { syncStatus, lastSyncMessage, lastSyncedAt, name, description, subscriberId, subscriber } =
+    pkiSync;
+
+  const failureMessage = useMemo(() => {
+    if (syncStatus === PkiSyncStatus.Failed) {
+      if (lastSyncMessage)
+        try {
+          return JSON.stringify(JSON.parse(lastSyncMessage), null, 2);
+        } catch {
+          return lastSyncMessage;
+        }
+
+      return "An Unknown Error Occurred.";
+    }
+    return null;
+  }, [syncStatus, lastSyncMessage]);
+
+  const permissionSubject = subject(ProjectPermissionSub.PkiSyncs, {
+    subscriberId: subscriber?.id || subscriberId || ""
+  });
+
+  return (
+    <div className="flex w-full flex-col gap-3 rounded-lg border border-mineshaft-600 bg-mineshaft-900 px-4 py-3">
+      <div className="flex items-center justify-between border-b border-mineshaft-400 pb-2">
+        <h3 className="font-semibold text-mineshaft-100">Details</h3>
+        <ProjectPermissionCan I={ProjectPermissionPkiSyncActions.Edit} a={permissionSubject}>
+          {(isAllowed) => (
+            <IconButton
+              variant="plain"
+              colorSchema="secondary"
+              isDisabled={!isAllowed}
+              ariaLabel="Edit sync details"
+              onClick={onEditDetails}
+            >
+              <FontAwesomeIcon icon={faEdit} />
+            </IconButton>
+          )}
+        </ProjectPermissionCan>
+      </div>
+      <div>
+        <div className="space-y-3">
+          <GenericFieldLabel label="Name">{name}</GenericFieldLabel>
+          <GenericFieldLabel label="Description">{description || "None"}</GenericFieldLabel>
+          <GenericFieldLabel label="Source Subscriber">
+            {subscriber ? subscriber.name : "Subscriber deleted"}
+          </GenericFieldLabel>
+          {syncStatus && (
+            <GenericFieldLabel label="Status">
+              <PkiSyncStatusBadge status={syncStatus} />
+            </GenericFieldLabel>
+          )}
+          {lastSyncedAt && (
+            <GenericFieldLabel label="Last Synced">
+              {format(new Date(lastSyncedAt), "yyyy-MM-dd, h:mm aaa")}
+            </GenericFieldLabel>
+          )}
+          {syncStatus === PkiSyncStatus.Failed && failureMessage && (
+            <GenericFieldLabel labelClassName="text-red" label="Last Sync Error">
+              <p className="break-words rounded bg-mineshaft-600 p-2 text-xs">{failureMessage}</p>
+            </GenericFieldLabel>
+          )}
+        </div>
+      </div>
+    </div>
+  );
+};

frontend/src/pages/cert-manager/PkiSyncDetailsByIDPage/components/PkiSyncOptionsSection/PkiSyncOptionsSection.tsx

@@ -0,0 +1,64 @@
+import { subject } from "@casl/ability";
+import { faEdit } from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+
+import { ProjectPermissionCan } from "@app/components/permissions";
+import { GenericFieldLabel } from "@app/components/secret-syncs";
+import { Badge, IconButton } from "@app/components/v2";
+import { ProjectPermissionSub } from "@app/context";
+import { ProjectPermissionPkiSyncActions } from "@app/context/ProjectPermissionContext/types";
+import { TPkiSync } from "@app/hooks/api/pkiSyncs";
+
+type Props = {
+  pkiSync: TPkiSync;
+  onEditOptions: VoidFunction;
+};
+
+export const PkiSyncOptionsSection = ({ pkiSync, onEditOptions }: Props) => {
+  const {
+    syncOptions: { canRemoveCertificates }
+  } = pkiSync;
+
+  const permissionSubject = subject(ProjectPermissionSub.PkiSyncs, {
+    subscriberId: pkiSync.subscriberId || ""
+  });
+
+  return (
+    <div>
+      <div className="flex w-full flex-col gap-3 rounded-lg border border-mineshaft-600 bg-mineshaft-900 px-4 py-3">
+        <div className="flex items-center justify-between border-b border-mineshaft-400 pb-2">
+          <h3 className="font-semibold text-mineshaft-100">Sync Options</h3>
+          <ProjectPermissionCan I={ProjectPermissionPkiSyncActions.Edit} a={permissionSubject}>
+            {(isAllowed) => (
+              <IconButton
+                variant="plain"
+                colorSchema="secondary"
+                isDisabled={!isAllowed}
+                ariaLabel="Edit sync options"
+                onClick={onEditOptions}
+              >
+                <FontAwesomeIcon icon={faEdit} />
+              </IconButton>
+            )}
+          </ProjectPermissionCan>
+        </div>
+        <div>
+          <div className="space-y-3">
+            {/* Hidden for now - Import certificates functionality disabled
+            <GenericFieldLabel label="Certificate Import">
+              <Badge variant={canImportCertificates ? "success" : "danger"}>
+                {canImportCertificates ? "Enabled" : "Disabled"}
+              </Badge>
+            </GenericFieldLabel>
+            */}
+            <GenericFieldLabel label="Certificate Removal">
+              <Badge variant={canRemoveCertificates ? "success" : "danger"}>
+                {canRemoveCertificates ? "Enabled" : "Disabled"}
+              </Badge>
+            </GenericFieldLabel>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+};

frontend/src/pages/cert-manager/PkiSyncDetailsByIDPage/components/PkiSyncOptionsSection/index.ts

@@ -0,0 +1 @@
+export { PkiSyncOptionsSection } from "./PkiSyncOptionsSection";

frontend/src/pages/cert-manager/PkiSyncDetailsByIDPage/components/PkiSyncSourceSection.tsx

@@ -0,0 +1,75 @@
+/* eslint-disable jsx-a11y/label-has-associated-control */
+import { subject } from "@casl/ability";
+import { faEdit, faTriangleExclamation } from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+
+import { ProjectPermissionCan } from "@app/components/permissions";
+import { Badge, IconButton, Tooltip } from "@app/components/v2";
+import { ProjectPermissionSub } from "@app/context";
+import { ProjectPermissionPkiSyncActions } from "@app/context/ProjectPermissionContext/types";
+import { TPkiSync } from "@app/hooks/api/pkiSyncs";
+
+const GenericFieldLabel = ({ label, children }: { label: string; children: React.ReactNode }) => (
+  <div>
+    <label className="text-sm text-bunker-300">{label}</label>
+    <div className="mt-1">{children}</div>
+  </div>
+);
+
+type Props = {
+  pkiSync: TPkiSync;
+  onEditSource: VoidFunction;
+};
+
+export const PkiSyncSourceSection = ({ pkiSync, onEditSource }: Props) => {
+  const { subscriberId, subscriber } = pkiSync;
+
+  const permissionSubject = subject(ProjectPermissionSub.PkiSyncs, {
+    subscriberId: subscriberId || ""
+  });
+
+  return (
+    <div>
+      <div className="flex w-full flex-col gap-3 rounded-lg border border-mineshaft-600 bg-mineshaft-900 px-4 py-3">
+        <div className="flex items-center justify-between border-b border-mineshaft-400 pb-2">
+          <h3 className="font-semibold text-mineshaft-100">Source</h3>
+          <div>
+            {!subscriberId && (
+              <Tooltip content="The PKI subscriber for this sync has been deleted. Configure a new source or remove this sync.">
+                <div className="mr-1 inline-block w-min">
+                  <Badge
+                    className="flex h-5 w-min items-center gap-1.5 whitespace-nowrap"
+                    variant="primary"
+                  >
+                    <FontAwesomeIcon icon={faTriangleExclamation} />
+                    <span>Source Deleted</span>
+                  </Badge>
+                </div>
+              </Tooltip>
+            )}
+            <ProjectPermissionCan I={ProjectPermissionPkiSyncActions.Edit} a={permissionSubject}>
+              {(isAllowed) => (
+                <IconButton
+                  variant="plain"
+                  colorSchema="secondary"
+                  isDisabled={!isAllowed}
+                  ariaLabel="Edit sync source"
+                  onClick={onEditSource}
+                >
+                  <FontAwesomeIcon icon={faEdit} />
+                </IconButton>
+              )}
+            </ProjectPermissionCan>
+          </div>
+        </div>
+        <div>
+          <div className="space-y-3">
+            <GenericFieldLabel label="PKI Subscriber">
+              {subscriber ? subscriber.name : "Deleted"}
+            </GenericFieldLabel>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+};

frontend/src/pages/cert-manager/PkiSyncDetailsByIDPage/components/index.ts

@@ -0,0 +1,6 @@
+export { PkiSyncActionTriggers } from "./PkiSyncActionTriggers";
+export { PkiSyncAuditLogsSection } from "./PkiSyncAuditLogsSection";
+export { PkiSyncDestinationSection } from "./PkiSyncDestinationSection";
+export { PkiSyncDetailsSection } from "./PkiSyncDetailsSection";
+export { PkiSyncOptionsSection } from "./PkiSyncOptionsSection";
+export { PkiSyncSourceSection } from "./PkiSyncSourceSection";

frontend/src/pages/cert-manager/PkiSyncDetailsByIDPage/index.tsx

@@ -0,0 +1 @@
+export { PkiSyncDetailsByIDPage } from "./PkiSyncDetailsByIDPage";

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

@@ -0,0 +1,31 @@
+import { createFileRoute, linkOptions } from "@tanstack/react-router";
+
+import { IntegrationsListPageTabs } from "@app/types/integrations";
+
+import { PkiSyncDetailsByIDPage } from "./index";
+
+export const Route = createFileRoute(
+  "/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId/_cert-manager-layout/integrations/$syncId"
+)({
+  component: PkiSyncDetailsByIDPage,
+  beforeLoad: ({ context, params }) => {
+    return {
+      breadcrumbs: [
+        ...context.breadcrumbs,
+        {
+          label: "Integrations",
+          link: linkOptions({
+            to: "/projects/cert-management/$projectId/integrations",
+            params,
+            search: {
+              selectedTab: IntegrationsListPageTabs.PkiSyncs
+            }
+          })
+        },
+        {
+          label: "PKI Sync"
+        }
+      ]
+    };
+  }
+});

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

@@ -42,8 +42,8 @@ import {
 import {
   ProjectPermissionPkiTemplateActions,
   ProjectPermissionSub,
-  useSubscription,
-  useWorkspace
+  useProject,
+  useSubscription
 } from "@app/context";
 import { usePopUp } from "@app/hooks";
 import { useDeleteCertTemplateV2 } from "@app/hooks/api";
@@ -55,7 +55,7 @@ import { PkiTemplateForm } from "./components/PkiTemplateForm";
 const PER_PAGE_INIT = 25;
 export const PkiTemplateListPage = () => {
   const { t } = useTranslation();
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
   const [page, setPage] = useState(1);
   const [perPage, setPerPage] = useState(PER_PAGE_INIT);
   const { handlePopUpToggle, popUp, handlePopUpOpen, handlePopUpClose } = usePopUp([
@@ -68,7 +68,7 @@ export const PkiTemplateListPage = () => {
   const { subscription } = useSubscription();
 
   const { data, isPending } = useListCertificateTemplates({
-    projectId: currentWorkspace.id,
+    projectId: currentProject.id,
     offset: (page - 1) * perPage,
     limit: perPage
   });
@@ -78,7 +78,7 @@ export const PkiTemplateListPage = () => {
   const onRemovePkiSubscriberSubmit = async () => {
     try {
       const pkiTemplate = await deleteCertTemplate.mutateAsync({
-        projectId: currentWorkspace.id,
+        projectId: currentProject.id,
         templateName: popUp?.deleteTemplate?.data?.name
       });
 

frontend/src/pages/cert-manager/PkiTemplateListPage/components/PkiTemplateForm.tsx

@@ -18,7 +18,7 @@ import {
   Input,
   Tooltip
 } from "@app/components/v2";
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import {
   useCreateCertTemplateV2,
   useListCasByProjectId,
@@ -72,9 +72,9 @@ type Props = {
 };
 
 export const PkiTemplateForm = ({ certTemplate, handlePopUpToggle }: Props) => {
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
 
-  const { data: cas, isPending: isCaLoading } = useListCasByProjectId(currentWorkspace.id);
+  const { data: cas, isPending: isCaLoading } = useListCasByProjectId(currentProject.id);
 
   const { mutateAsync: createCertTemplate } = useCreateCertTemplateV2();
   const { mutateAsync: updateCertTemplate } = useUpdateCertTemplateV2();
@@ -124,7 +124,7 @@ export const PkiTemplateForm = ({ certTemplate, handlePopUpToggle }: Props) => {
     extendedKeyUsages,
     ca
   }: FormData) => {
-    if (!currentWorkspace?.id) {
+    if (!currentProject?.id) {
       return;
     }
 
@@ -132,7 +132,7 @@ export const PkiTemplateForm = ({ certTemplate, handlePopUpToggle }: Props) => {
       if (certTemplate) {
         await updateCertTemplate({
           templateName: certTemplate.name,
-          projectId: currentWorkspace.id,
+          projectId: currentProject.id,
           caName: ca.name,
           name,
           commonName,
@@ -152,7 +152,7 @@ export const PkiTemplateForm = ({ certTemplate, handlePopUpToggle }: Props) => {
         });
       } else {
         await createCertTemplate({
-          projectId: currentWorkspace.id,
+          projectId: currentProject.id,
           caName: ca.name,
           name,
           commonName,

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

@@ -1,9 +1,9 @@
 import { createFileRoute } from "@tanstack/react-router";
 
 import { BreadcrumbTypes } from "@app/components/v2";
-import { workspaceKeys } from "@app/hooks/api";
+import { projectKeys } from "@app/hooks/api";
+import { fetchProjectById } from "@app/hooks/api/projects/queries";
 import { fetchUserProjectPermissions, roleQueryKeys } from "@app/hooks/api/roles/queries";
-import { fetchWorkspaceById } from "@app/hooks/api/workspace/queries";
 import { PkiManagerLayout } from "@app/layouts/PkiManagerLayout";
 import { ProjectSelect } from "@app/layouts/ProjectLayout/components/ProjectSelect";
 
@@ -13,15 +13,15 @@ export const Route = createFileRoute(
   component: PkiManagerLayout,
   beforeLoad: async ({ params, context }) => {
     const project = await context.queryClient.ensureQueryData({
-      queryKey: workspaceKeys.getWorkspaceById(params.projectId),
-      queryFn: () => fetchWorkspaceById(params.projectId)
+      queryKey: projectKeys.getProjectById(params.projectId),
+      queryFn: () => fetchProjectById(params.projectId)
     });
 
     await context.queryClient.ensureQueryData({
       queryKey: roleQueryKeys.getUserProjectPermissions({
-        workspaceId: params.projectId
+        projectId: params.projectId
       }),
-      queryFn: () => fetchUserProjectPermissions({ workspaceId: params.projectId })
+      queryFn: () => fetchUserProjectPermissions({ projectId: params.projectId })
     });
 
     return {

frontend/src/pages/kms/KmipPage/components/KmipClientModal.tsx

@@ -13,7 +13,7 @@ import {
   ModalContent,
   TextArea
 } from "@app/components/v2";
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import { useCreateKmipClient, useUpdateKmipClient } from "@app/hooks/api/kmip";
 import { KmipPermission, TKmipClient } from "@app/hooks/api/kmip/types";
 
@@ -60,8 +60,8 @@ type FormProps = Pick<Props, "kmipClient"> & {
 const KmipClientForm = ({ onComplete, kmipClient }: FormProps) => {
   const createKmipClient = useCreateKmipClient();
   const updateKmipClient = useUpdateKmipClient();
-  const { currentWorkspace } = useWorkspace();
-  const projectId = currentWorkspace.id;
+  const { currentProject } = useProject();
+  const projectId = currentProject.id;
   const isUpdate = !!kmipClient;
 
   const {

frontend/src/pages/kms/KmipPage/components/KmipClientTable.tsx

@@ -39,9 +39,9 @@ import {
 import {
   ProjectPermissionKmipActions,
   ProjectPermissionSub,
+  useProject,
   useProjectPermission,
-  useSubscription,
-  useWorkspace
+  useSubscription
 } from "@app/context";
 import {
   getUserTablePreference,
@@ -59,9 +59,9 @@ import { KmipClientCertificateModal } from "./KmipClientCertificateModal";
 import { KmipClientModal } from "./KmipClientModal";
 
 export const KmipClientTable = () => {
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
 
-  const projectId = currentWorkspace?.id ?? "";
+  const projectId = currentProject?.id ?? "";
 
   const {
     offset,

frontend/src/pages/kms/OverviewPage/components/CmekModal.tsx

@@ -14,7 +14,7 @@ import {
   SelectItem,
   TextArea
 } from "@app/components/v2";
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import { keyUsageDefaultOption, kmsKeyUsageOptions } from "@app/helpers/kms";
 import {
   AllowedEncryptionKeyAlgorithms,
@@ -49,8 +49,8 @@ type FormProps = Pick<Props, "cmek"> & {
 const CmekForm = ({ onComplete, cmek }: FormProps) => {
   const createCmek = useCreateCmek();
   const updateCmek = useUpdateCmek();
-  const { currentWorkspace } = useWorkspace();
-  const projectId = currentWorkspace.id;
+  const { currentProject } = useProject();
+  const projectId = currentProject.id;
   const isUpdate = !!cmek;
 
   const {

frontend/src/pages/kms/OverviewPage/components/CmekTable.tsx

@@ -49,8 +49,8 @@ import {
   ProjectPermissionActions,
   ProjectPermissionCmekActions,
   ProjectPermissionSub,
-  useProjectPermission,
-  useWorkspace
+  useProject,
+  useProjectPermission
 } from "@app/context";
 import { kmsKeyUsageOptions } from "@app/helpers/kms";
 import {
@@ -87,10 +87,10 @@ const getStatusBadgeProps = (
 };
 
 export const CmekTable = () => {
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
   const { permission } = useProjectPermission();
 
-  const projectId = currentWorkspace?.id ?? "";
+  const projectId = currentProject?.id ?? "";
 
   const {
     offset,

frontend/src/pages/kms/layout.tsx

@@ -1,9 +1,9 @@
 import { createFileRoute } from "@tanstack/react-router";
 
 import { BreadcrumbTypes } from "@app/components/v2";
-import { workspaceKeys } from "@app/hooks/api";
+import { projectKeys } from "@app/hooks/api";
+import { fetchProjectById } from "@app/hooks/api/projects/queries";
 import { fetchUserProjectPermissions, roleQueryKeys } from "@app/hooks/api/roles/queries";
-import { fetchWorkspaceById } from "@app/hooks/api/workspace/queries";
 import { KmsLayout } from "@app/layouts/KmsLayout";
 import { ProjectSelect } from "@app/layouts/ProjectLayout/components/ProjectSelect";
 
@@ -13,15 +13,15 @@ export const Route = createFileRoute(
   component: KmsLayout,
   beforeLoad: async ({ params, context }) => {
     const project = await context.queryClient.ensureQueryData({
-      queryKey: workspaceKeys.getWorkspaceById(params.projectId),
-      queryFn: () => fetchWorkspaceById(params.projectId)
+      queryKey: projectKeys.getProjectById(params.projectId),
+      queryFn: () => fetchProjectById(params.projectId)
     });
 
     await context.queryClient.ensureQueryData({
       queryKey: roleQueryKeys.getUserProjectPermissions({
-        workspaceId: params.projectId
+        projectId: params.projectId
       }),
-      queryFn: () => fetchUserProjectPermissions({ workspaceId: params.projectId })
+      queryFn: () => fetchUserProjectPermissions({ projectId: params.projectId })
     });
 
     return {

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

@@ -3,6 +3,7 @@ import { Controller, useFieldArray, useForm } from "react-hook-form";
 import { faPlus, faQuestionCircle, faXmark } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { zodResolver } from "@hookform/resolvers/zod";
+import ms from "ms";
 import { z } from "zod";
 
 import { createNotification } from "@app/components/notifications";
@@ -25,6 +26,7 @@ import {
   OrgPermissionMachineIdentityAuthTemplateActions,
   OrgPermissionSubjects
 } from "@app/context/OrgPermissionContext/types";
+import { getObjectFromSeconds } from "@app/helpers/datetime";
 import {
   MachineIdentityAuthMethod,
   useAddIdentityLdapAuth,
@@ -35,6 +37,8 @@ import { IdentityTrustedIp } from "@app/hooks/api/identities/types";
 import { useGetAvailableTemplates } from "@app/hooks/api/identityAuthTemplates/queries";
 import { UsePopUpState } from "@app/hooks/usePopUp";
 
+import { LockoutTab } from "./lockout/LockoutTab";
+import { superRefineLockout } from "./lockout/super-refine";
 import { IdentityFormTab } from "./types";
 
 const schema = z
@@ -74,9 +78,28 @@ const schema = z
           ipAddress: z.string().max(50)
         })
       )
-      .min(1)
+      .min(1),
+
+    lockoutEnabled: z.boolean().default(true),
+    lockoutThreshold: z
+      .string()
+      .refine(
+        (value) => Number(value) <= 30 && Number(value) >= 1,
+        "Lockout threshold must be between 1 and 30"
+      ),
+    lockoutDurationValue: z.string(),
+    lockoutDurationUnit: z.enum(["s", "m", "h", "d"], {
+      invalid_type_error: "Please select a valid time unit"
+    }),
+    lockoutCounterResetValue: z.string(),
+    lockoutCounterResetUnit: z.enum(["s", "m", "h"], {
+      invalid_type_error: "Please select a valid time unit"
+    })
   })
+  .required()
   .superRefine((data, ctx) => {
+    superRefineLockout(data, ctx);
+
     // Validation based on scope
     if (data.scope === "template") {
       if (!data.templateId) {
@@ -178,12 +201,25 @@ export const IdentityLdapAuthForm = ({
       accessTokenTTL: "2592000",
       accessTokenMaxTTL: "2592000",
       accessTokenNumUsesLimit: "0",
-      accessTokenTrustedIps: [{ ipAddress: "0.0.0.0/0" }, { ipAddress: "::/0" }]
+      accessTokenTrustedIps: [{ ipAddress: "0.0.0.0/0" }, { ipAddress: "::/0" }],
+      lockoutEnabled: true,
+      lockoutThreshold: "3",
+      lockoutDurationValue: "5",
+      lockoutDurationUnit: "m",
+      lockoutCounterResetValue: "30",
+      lockoutCounterResetUnit: "s"
     }
   });
 
   const scope = watch("scope");
 
+  const lockoutEnabledWatch = watch("lockoutEnabled");
+  const lockoutThresholdWatch = watch("lockoutThreshold");
+  const lockoutDurationValueWatch = watch("lockoutDurationValue");
+  const lockoutDurationUnitWatch = watch("lockoutDurationUnit");
+  const lockoutCounterResetValueWatch = watch("lockoutCounterResetValue");
+  const lockoutCounterResetUnitWatch = watch("lockoutCounterResetUnit");
+
   const {
     fields: accessTokenTrustedIpsFields,
     append: appendAccessTokenTrustedIp,
@@ -210,6 +246,9 @@ export const IdentityLdapAuthForm = ({
     if (data) {
       const detectedScope = determineScope(data);
 
+      const lockoutDurationObj = getObjectFromSeconds(data.lockoutDurationSeconds);
+      const lockoutCounterResetObj = getObjectFromSeconds(data.lockoutCounterResetSeconds);
+
       reset({
         scope: detectedScope,
         templateId: data.templateId || "",
@@ -229,7 +268,13 @@ export const IdentityLdapAuthForm = ({
               ipAddress: `${ipAddress}${prefix !== undefined ? `/${prefix}` : ""}`
             };
           }
-        )
+        ),
+        lockoutEnabled: data.lockoutEnabled,
+        lockoutThreshold: String(data.lockoutThreshold),
+        lockoutDurationValue: String(lockoutDurationObj.value),
+        lockoutDurationUnit: lockoutDurationObj.unit as "s" | "m" | "h" | "d",
+        lockoutCounterResetValue: String(lockoutCounterResetObj.value),
+        lockoutCounterResetUnit: lockoutCounterResetObj.unit as "s" | "m" | "h"
       });
       return;
     }
@@ -247,7 +292,13 @@ export const IdentityLdapAuthForm = ({
       accessTokenTTL: "2592000",
       accessTokenMaxTTL: "2592000",
       accessTokenNumUsesLimit: "0",
-      accessTokenTrustedIps: [{ ipAddress: "0.0.0.0/0" }, { ipAddress: "::/0" }]
+      accessTokenTrustedIps: [{ ipAddress: "0.0.0.0/0" }, { ipAddress: "::/0" }],
+      lockoutEnabled: true,
+      lockoutThreshold: "3",
+      lockoutDurationValue: "5",
+      lockoutDurationUnit: "m",
+      lockoutCounterResetValue: "30",
+      lockoutCounterResetUnit: "s"
     });
   }, [data, reset]);
 
@@ -275,9 +326,19 @@ export const IdentityLdapAuthForm = ({
         accessTokenTTL,
         accessTokenMaxTTL,
         accessTokenNumUsesLimit,
-        accessTokenTrustedIps
+        accessTokenTrustedIps,
+        lockoutEnabled,
+        lockoutThreshold,
+        lockoutDurationValue,
+        lockoutDurationUnit,
+        lockoutCounterResetValue,
+        lockoutCounterResetUnit
       } = formData;
 
+      const lockoutDurationSeconds = ms(`${lockoutDurationValue}${lockoutDurationUnit}`) / 1000;
+      const lockoutCounterResetSeconds =
+        ms(`${lockoutCounterResetValue}${lockoutCounterResetUnit}`) / 1000;
+
       const basePayload = {
         organizationId: orgId,
         identityId,
@@ -287,7 +348,11 @@ export const IdentityLdapAuthForm = ({
         accessTokenTTL: Number(accessTokenTTL),
         accessTokenMaxTTL: Number(accessTokenMaxTTL),
         accessTokenNumUsesLimit: Number(accessTokenNumUsesLimit),
-        accessTokenTrustedIps
+        accessTokenTrustedIps,
+        lockoutEnabled,
+        lockoutThreshold: Number(lockoutThreshold),
+        lockoutDurationSeconds,
+        lockoutCounterResetSeconds
       };
 
       // Add scope-specific fields
@@ -327,7 +392,10 @@ export const IdentityLdapAuthForm = ({
   return (
     <form
       onSubmit={handleSubmit(onFormSubmit, (fields) => {
-        setTabValue(
+        const firstErrorField = Object.keys(fields)[0];
+        let tab = IdentityFormTab.Advanced;
+
+        if (
           [
             "scope",
             "templateId",
@@ -340,15 +408,29 @@ export const IdentityLdapAuthForm = ({
             "allowedFields",
             "accessTokenMaxTTL",
             "accessTokenNumUsesLimit"
-          ].includes(Object.keys(fields)[0])
-            ? IdentityFormTab.Configuration
-            : IdentityFormTab.Advanced
-        );
+          ].includes(firstErrorField)
+        ) {
+          tab = IdentityFormTab.Configuration;
+        } else if (
+          [
+            "lockoutEnabled",
+            "lockoutThreshold",
+            "lockoutDurationValue",
+            "lockoutDurationUnit",
+            "lockoutCounterResetValue",
+            "lockoutCounterResetUnit"
+          ].includes(firstErrorField)
+        ) {
+          tab = IdentityFormTab.Lockout;
+        }
+
+        setTabValue(tab);
       })}
     >
       <Tabs value={tabValue} onValueChange={(value) => setTabValue(value as IdentityFormTab)}>
         <TabList>
           <Tab value={IdentityFormTab.Configuration}>Configuration</Tab>
+          <Tab value={IdentityFormTab.Lockout}>Lockout</Tab>
           <Tab value={IdentityFormTab.Advanced}>Advanced</Tab>
         </TabList>
         <TabPanel value={IdentityFormTab.Configuration}>
@@ -691,6 +773,15 @@ export const IdentityLdapAuthForm = ({
             )}
           />
         </TabPanel>
+        <LockoutTab
+          control={control}
+          lockoutEnabled={lockoutEnabledWatch}
+          lockoutThreshold={lockoutThresholdWatch}
+          lockoutDurationValue={lockoutDurationValueWatch}
+          lockoutDurationUnit={lockoutDurationUnitWatch}
+          lockoutCounterResetValue={lockoutCounterResetValueWatch}
+          lockoutCounterResetUnit={lockoutCounterResetUnitWatch}
+        />
         <TabPanel value={IdentityFormTab.Advanced}>
           <Controller
             control={control}

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

@@ -42,7 +42,14 @@ const schema = z.object({
     message: "Access Token Max TTL cannot be greater than 315360000"
   }),
   accessTokenNumUsesLimit: z.string(),
-  oidcDiscoveryUrl: z.string().url().min(1),
+  oidcDiscoveryUrl: z
+    .string()
+    .url()
+    .min(1)
+    .refine(
+      (el) => !el.endsWith("/.well-known/openid-configuration"),
+      "Please remove /.well-known/openid-configuration."
+    ),
   caCert: z.string().trim().default(""),
   boundIssuer: z.string().min(1),
   boundAudiences: z.string().optional().default(""),

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

@@ -181,7 +181,7 @@ export const IdentitySection = withPermission(
                   type="submit"
                   leftIcon={<FontAwesomeIcon icon={faPlus} />}
                   onClick={() => {
-                    if (subscription && !subscription.kmip) {
+                    if (subscription && !subscription.machineIdentityAuthTemplates) {
                       handlePopUpOpen("upgradePlan");
                       return;
                     }

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

@@ -12,9 +12,6 @@ import {
   FormControl,
   IconButton,
   Input,
-  Select,
-  SelectItem,
-  Switch,
   Tab,
   TabList,
   TabPanel,
@@ -30,6 +27,8 @@ import {
 import { IdentityTrustedIp } from "@app/hooks/api/identities/types";
 import { UsePopUpState } from "@app/hooks/usePopUp";
 
+import { LockoutTab } from "./lockout/LockoutTab";
+import { superRefineLockout } from "./lockout/super-refine";
 import { IdentityFormTab } from "./types";
 
 const schema = z
@@ -83,61 +82,7 @@ const schema = z
     })
   })
   .required()
-  .superRefine((data, ctx) => {
-    const {
-      lockoutDurationValue,
-      lockoutCounterResetValue,
-      lockoutDurationUnit,
-      lockoutCounterResetUnit,
-      lockoutEnabled
-    } = data;
-
-    if (!lockoutEnabled) return;
-
-    let isAnyParseError = false;
-
-    const parsedLockoutDuration = parseInt(lockoutDurationValue, 10);
-    if (Number.isNaN(parsedLockoutDuration)) {
-      ctx.addIssue({
-        code: z.ZodIssueCode.custom,
-        message: "Lockout duration must be a number",
-        path: ["lockoutDurationValue"]
-      });
-      isAnyParseError = true;
-    }
-
-    const parsedLockoutCounterReset = parseInt(lockoutCounterResetValue, 10);
-    if (Number.isNaN(parsedLockoutCounterReset)) {
-      ctx.addIssue({
-        code: z.ZodIssueCode.custom,
-        message: "Lockout counter reset must be a number",
-        path: ["lockoutCounterResetValue"]
-      });
-      isAnyParseError = true;
-    }
-
-    if (isAnyParseError) return;
-
-    const lockoutDurationInSeconds = ms(`${parsedLockoutDuration}${lockoutDurationUnit}`) / 1000;
-    const lockoutCounterResetInSeconds =
-      ms(`${parsedLockoutCounterReset}${lockoutCounterResetUnit}`) / 1000;
-
-    if (lockoutDurationInSeconds > 86400 || lockoutDurationInSeconds < 30) {
-      ctx.addIssue({
-        code: z.ZodIssueCode.custom,
-        message: "Lockout duration must be between 30 seconds and 1 day",
-        path: ["lockoutDurationValue"]
-      });
-    }
-
-    if (lockoutCounterResetInSeconds > 3600 || lockoutCounterResetInSeconds < 5) {
-      ctx.addIssue({
-        code: z.ZodIssueCode.custom,
-        message: "Lockout counter reset must be between 5 seconds and 1 hour",
-        path: ["lockoutCounterResetValue"]
-      });
-    }
-  });
+  .superRefine(superRefineLockout);
 
 export type FormData = z.infer<typeof schema>;
 
@@ -432,187 +377,15 @@ export const IdentityUniversalAuthForm = ({
             )}
           />
         </TabPanel>
-        <TabPanel value={IdentityFormTab.Lockout}>
-          <div className="mb-3 flex flex-col">
-            <Controller
-              control={control}
-              name="lockoutEnabled"
-              defaultValue
-              render={({ field: { value, onChange }, fieldState: { error } }) => {
-                return (
-                  <FormControl
-                    helperText={`The lockout feature will prevent login attempts for ${lockoutDurationValueWatch}${lockoutDurationUnitWatch} after ${lockoutThresholdWatch} consecutive login failures. If ${lockoutCounterResetValueWatch}${lockoutCounterResetUnitWatch} pass after the most recent failure, the lockout counter resets.`}
-                    isError={Boolean(error)}
-                    errorText={error?.message}
-                  >
-                    <Switch
-                      className="ml-0 mr-3 bg-mineshaft-400/80 shadow-inner data-[state=checked]:bg-green/80"
-                      containerClassName="flex-row-reverse w-fit"
-                      id="lockout-enabled"
-                      thumbClassName="bg-mineshaft-800"
-                      onCheckedChange={onChange}
-                      isChecked={value}
-                    >
-                      Lockout
-                    </Switch>
-                  </FormControl>
-                );
-              }}
-            />
-            <div className="flex flex-col gap-2">
-              <Controller
-                control={control}
-                name="lockoutThreshold"
-                render={({ field, fieldState: { error } }) => {
-                  return (
-                    <FormControl
-                      className={`mb-0 flex-grow ${lockoutEnabledWatch ? "" : "opacity-70"}`}
-                      label="Lockout Threshold"
-                      isError={Boolean(error)}
-                      errorText={error?.message}
-                      tooltipText="The amount of times login must fail before locking the identity auth method"
-                    >
-                      <Input
-                        {...field}
-                        placeholder="Enter lockout threshold..."
-                        isDisabled={!lockoutEnabledWatch}
-                      />
-                    </FormControl>
-                  );
-                }}
-              />
-              <div className="flex items-end gap-2">
-                <Controller
-                  control={control}
-                  name="lockoutDurationValue"
-                  render={({ field, fieldState: { error } }) => {
-                    return (
-                      <FormControl
-                        className={`mb-0 flex-grow ${lockoutEnabledWatch ? "" : "opacity-70"}`}
-                        label="Lockout Duration"
-                        isError={Boolean(error)}
-                        errorText={error?.message}
-                        tooltipText="How long an identity auth method lockout lasts"
-                      >
-                        <Input
-                          {...field}
-                          placeholder="Enter lockout duration..."
-                          isDisabled={!lockoutEnabledWatch}
-                        />
-                      </FormControl>
-                    );
-                  }}
-                />
-                <Controller
-                  control={control}
-                  name="lockoutDurationUnit"
-                  render={({ field, fieldState: { error } }) => (
-                    <FormControl
-                      className={`mb-0 ${lockoutEnabledWatch ? "" : "opacity-70"}`}
-                      isError={Boolean(error)}
-                      errorText={error?.message}
-                    >
-                      <Select
-                        isDisabled={!lockoutEnabledWatch}
-                        value={field.value}
-                        className="min-w-32 pr-2"
-                        onValueChange={field.onChange}
-                        position="popper"
-                      >
-                        <SelectItem
-                          value="s"
-                          className="relative py-2 pl-6 pr-8 text-sm hover:bg-mineshaft-700"
-                        >
-                          <div className="ml-3 font-medium">Seconds</div>
-                        </SelectItem>
-                        <SelectItem
-                          value="m"
-                          className="relative py-2 pl-6 pr-8 text-sm hover:bg-mineshaft-700"
-                        >
-                          <div className="ml-3 font-medium">Minutes</div>
-                        </SelectItem>
-                        <SelectItem
-                          value="h"
-                          className="relative py-2 pl-6 pr-8 text-sm hover:bg-mineshaft-700"
-                        >
-                          <div className="ml-3 font-medium">Hours</div>
-                        </SelectItem>
-                        <SelectItem
-                          value="d"
-                          className="relative py-2 pl-6 pr-8 text-sm hover:bg-mineshaft-700"
-                        >
-                          <div className="ml-3 font-medium">Days</div>
-                        </SelectItem>
-                      </Select>
-                    </FormControl>
-                  )}
-                />
-              </div>
-              <div className="flex items-end gap-2">
-                <Controller
-                  control={control}
-                  name="lockoutCounterResetValue"
-                  render={({ field, fieldState: { error } }) => {
-                    return (
-                      <FormControl
-                        className={`mb-0 flex-grow ${lockoutEnabledWatch ? "" : "opacity-70"}`}
-                        label="Lockout Counter Reset"
-                        isError={Boolean(error)}
-                        errorText={error?.message}
-                        tooltipText="How long to wait from the most recent failed login until resetting the lockout counter"
-                      >
-                        <Input
-                          {...field}
-                          placeholder="Enter lockout counter reset..."
-                          isDisabled={!lockoutEnabledWatch}
-                        />
-                      </FormControl>
-                    );
-                  }}
-                />
-                <Controller
-                  control={control}
-                  name="lockoutCounterResetUnit"
-                  render={({ field, fieldState: { error } }) => (
-                    <FormControl
-                      className={`mb-0 ${lockoutEnabledWatch ? "" : "opacity-70"}`}
-                      isError={Boolean(error)}
-                      errorText={error?.message}
-                    >
-                      <Select
-                        isDisabled={!lockoutEnabledWatch}
-                        value={field.value}
-                        className="min-w-32 pr-2"
-                        onValueChange={field.onChange}
-                        position="popper"
-                      >
-                        <SelectItem
-                          value="s"
-                          className="relative py-2 pl-6 pr-8 text-sm hover:bg-mineshaft-700"
-                        >
-                          <div className="ml-3 font-medium">Seconds</div>
-                        </SelectItem>
-                        <SelectItem
-                          value="m"
-                          className="relative py-2 pl-6 pr-8 text-sm hover:bg-mineshaft-700"
-                        >
-                          <div className="ml-3 font-medium">Minutes</div>
-                        </SelectItem>
-                        <SelectItem
-                          value="h"
-                          className="relative py-2 pl-6 pr-8 text-sm hover:bg-mineshaft-700"
-                        >
-                          <div className="ml-3 font-medium">Hours</div>
-                        </SelectItem>
-                      </Select>
-                    </FormControl>
-                  )}
-                />
-              </div>
-            </div>
-          </div>
-        </TabPanel>
-
+        <LockoutTab
+          control={control}
+          lockoutEnabled={lockoutEnabledWatch}
+          lockoutThreshold={lockoutThresholdWatch}
+          lockoutDurationValue={lockoutDurationValueWatch}
+          lockoutDurationUnit={lockoutDurationUnitWatch}
+          lockoutCounterResetValue={lockoutCounterResetValueWatch}
+          lockoutCounterResetUnit={lockoutCounterResetUnitWatch}
+        />
         <TabPanel value={IdentityFormTab.Advanced}>
           {clientSecretTrustedIpsFields.map(({ id }, index) => (
             <div className="mb-3 flex items-end space-x-2" key={id}>

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

@@ -0,0 +1,205 @@
+import { Control, Controller } from "react-hook-form";
+
+import { FormControl, Input, Select, SelectItem, Switch, TabPanel } from "@app/components/v2";
+
+import { IdentityFormTab } from "../types";
+
+export const LockoutTab = ({
+  control,
+  lockoutEnabled,
+  lockoutThreshold,
+  lockoutDurationValue,
+  lockoutDurationUnit,
+  lockoutCounterResetValue,
+  lockoutCounterResetUnit
+}: {
+  control: Control<any>;
+  lockoutEnabled: boolean;
+  lockoutThreshold: string;
+  lockoutDurationValue: string;
+  lockoutDurationUnit: "s" | "m" | "h" | "d";
+  lockoutCounterResetValue: string;
+  lockoutCounterResetUnit: "s" | "m" | "h";
+}) => {
+  return (
+    <TabPanel value={IdentityFormTab.Lockout}>
+      <div className="mb-3 flex flex-col">
+        <Controller
+          control={control}
+          name="lockoutEnabled"
+          render={({ field: { value, onChange }, fieldState: { error } }) => {
+            return (
+              <FormControl
+                helperText={`The lockout feature will prevent login attempts for ${lockoutDurationValue}${lockoutDurationUnit} after ${lockoutThreshold} consecutive login failures. If ${lockoutCounterResetValue}${lockoutCounterResetUnit} pass after the most recent failure, the lockout counter resets.`}
+                isError={Boolean(error)}
+                errorText={error?.message}
+              >
+                <Switch
+                  className="ml-0 mr-3 bg-mineshaft-400/80 shadow-inner data-[state=checked]:bg-green/80"
+                  containerClassName="flex-row-reverse w-fit"
+                  id="lockout-enabled"
+                  thumbClassName="bg-mineshaft-800"
+                  onCheckedChange={onChange}
+                  isChecked={value}
+                >
+                  Lockout
+                </Switch>
+              </FormControl>
+            );
+          }}
+        />
+        <div className="flex flex-col gap-2">
+          <Controller
+            control={control}
+            name="lockoutThreshold"
+            render={({ field, fieldState: { error } }) => {
+              return (
+                <FormControl
+                  className={`mb-0 flex-grow ${lockoutEnabled ? "" : "opacity-70"}`}
+                  label="Lockout Threshold"
+                  isError={Boolean(error)}
+                  errorText={error?.message}
+                  tooltipText="The amount of times login must fail before locking the identity auth method"
+                >
+                  <Input
+                    {...field}
+                    placeholder="Enter lockout threshold..."
+                    isDisabled={!lockoutEnabled}
+                  />
+                </FormControl>
+              );
+            }}
+          />
+          <div className="flex items-end gap-2">
+            <Controller
+              control={control}
+              name="lockoutDurationValue"
+              render={({ field, fieldState: { error } }) => {
+                return (
+                  <FormControl
+                    className={`mb-0 flex-grow ${lockoutEnabled ? "" : "opacity-70"}`}
+                    label="Lockout Duration"
+                    isError={Boolean(error)}
+                    errorText={error?.message}
+                    tooltipText="How long an identity auth method lockout lasts"
+                  >
+                    <Input
+                      {...field}
+                      placeholder="Enter lockout duration..."
+                      isDisabled={!lockoutEnabled}
+                    />
+                  </FormControl>
+                );
+              }}
+            />
+            <Controller
+              control={control}
+              name="lockoutDurationUnit"
+              render={({ field, fieldState: { error } }) => (
+                <FormControl
+                  className={`mb-0 ${lockoutEnabled ? "" : "opacity-70"}`}
+                  isError={Boolean(error)}
+                  errorText={error?.message}
+                >
+                  <Select
+                    isDisabled={!lockoutEnabled}
+                    value={field.value}
+                    className="min-w-32 pr-2"
+                    onValueChange={field.onChange}
+                    position="popper"
+                  >
+                    <SelectItem
+                      value="s"
+                      className="relative py-2 pl-6 pr-8 text-sm hover:bg-mineshaft-700"
+                    >
+                      <div className="ml-3 font-medium">Seconds</div>
+                    </SelectItem>
+                    <SelectItem
+                      value="m"
+                      className="relative py-2 pl-6 pr-8 text-sm hover:bg-mineshaft-700"
+                    >
+                      <div className="ml-3 font-medium">Minutes</div>
+                    </SelectItem>
+                    <SelectItem
+                      value="h"
+                      className="relative py-2 pl-6 pr-8 text-sm hover:bg-mineshaft-700"
+                    >
+                      <div className="ml-3 font-medium">Hours</div>
+                    </SelectItem>
+                    <SelectItem
+                      value="d"
+                      className="relative py-2 pl-6 pr-8 text-sm hover:bg-mineshaft-700"
+                    >
+                      <div className="ml-3 font-medium">Days</div>
+                    </SelectItem>
+                  </Select>
+                </FormControl>
+              )}
+            />
+          </div>
+          <div className="flex items-end gap-2">
+            <Controller
+              control={control}
+              name="lockoutCounterResetValue"
+              render={({ field, fieldState: { error } }) => {
+                return (
+                  <FormControl
+                    className={`mb-0 flex-grow ${lockoutEnabled ? "" : "opacity-70"}`}
+                    label="Lockout Counter Reset"
+                    isError={Boolean(error)}
+                    errorText={error?.message}
+                    tooltipText="How long to wait from the most recent failed login until resetting the lockout counter"
+                  >
+                    <Input
+                      {...field}
+                      placeholder="Enter lockout counter reset..."
+                      isDisabled={!lockoutEnabled}
+                    />
+                  </FormControl>
+                );
+              }}
+            />
+            <Controller
+              control={control}
+              name="lockoutCounterResetUnit"
+              render={({ field, fieldState: { error } }) => (
+                <FormControl
+                  className={`mb-0 ${lockoutEnabled ? "" : "opacity-70"}`}
+                  isError={Boolean(error)}
+                  errorText={error?.message}
+                >
+                  <Select
+                    isDisabled={!lockoutEnabled}
+                    value={field.value}
+                    className="min-w-32 pr-2"
+                    onValueChange={field.onChange}
+                    position="popper"
+                  >
+                    <SelectItem
+                      value="s"
+                      className="relative py-2 pl-6 pr-8 text-sm hover:bg-mineshaft-700"
+                    >
+                      <div className="ml-3 font-medium">Seconds</div>
+                    </SelectItem>
+                    <SelectItem
+                      value="m"
+                      className="relative py-2 pl-6 pr-8 text-sm hover:bg-mineshaft-700"
+                    >
+                      <div className="ml-3 font-medium">Minutes</div>
+                    </SelectItem>
+                    <SelectItem
+                      value="h"
+                      className="relative py-2 pl-6 pr-8 text-sm hover:bg-mineshaft-700"
+                    >
+                      <div className="ml-3 font-medium">Hours</div>
+                    </SelectItem>
+                  </Select>
+                </FormControl>
+              )}
+            />
+          </div>
+        </div>
+      </div>
+    </TabPanel>
+  );
+};

frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/lockout/super-refine.ts

@@ -0,0 +1,67 @@
+import ms from "ms";
+import { z } from "zod";
+
+export function superRefineLockout(
+  data: {
+    lockoutDurationValue: string;
+    lockoutCounterResetValue: string;
+    lockoutDurationUnit: "s" | "m" | "h" | "d";
+    lockoutCounterResetUnit: "s" | "m" | "h";
+    lockoutEnabled: boolean;
+  },
+  ctx: z.RefinementCtx
+) {
+  const {
+    lockoutDurationValue,
+    lockoutCounterResetValue,
+    lockoutDurationUnit,
+    lockoutCounterResetUnit,
+    lockoutEnabled
+  } = data;
+
+  if (lockoutEnabled) {
+    let isAnyParseError = false;
+
+    const parsedLockoutDuration = parseInt(lockoutDurationValue, 10);
+    if (Number.isNaN(parsedLockoutDuration)) {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        message: "Lockout duration must be a number",
+        path: ["lockoutDurationValue"]
+      });
+      isAnyParseError = true;
+    }
+
+    const parsedLockoutCounterReset = parseInt(lockoutCounterResetValue, 10);
+    if (Number.isNaN(parsedLockoutCounterReset)) {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        message: "Lockout counter reset must be a number",
+        path: ["lockoutCounterResetValue"]
+      });
+      isAnyParseError = true;
+    }
+
+    if (!isAnyParseError) {
+      const lockoutDurationInSeconds = ms(`${parsedLockoutDuration}${lockoutDurationUnit}`) / 1000;
+      const lockoutCounterResetInSeconds =
+        ms(`${parsedLockoutCounterReset}${lockoutCounterResetUnit}`) / 1000;
+
+      if (lockoutDurationInSeconds > 86400 || lockoutDurationInSeconds < 30) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          message: "Lockout duration must be between 30 seconds and 1 day",
+          path: ["lockoutDurationValue"]
+        });
+      }
+
+      if (lockoutCounterResetInSeconds > 3600 || lockoutCounterResetInSeconds < 5) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          message: "Lockout counter reset must be between 5 seconds and 1 hour",
+          path: ["lockoutCounterResetValue"]
+        });
+      }
+    }
+  }
+}

frontend/src/pages/organization/AccessManagementPage/components/OrgMembersTab/components/OrgMembersSection/AddOrgMemberModal.tsx

@@ -21,10 +21,10 @@ import {
   useAddUsersToOrg,
   useFetchServerStatus,
   useGetOrgRoles,
-  useGetUserWorkspaces
+  useGetUserProjects
 } from "@app/hooks/api";
+import { ProjectType, ProjectVersion } from "@app/hooks/api/projects/types";
 import { ProjectMembershipRole } from "@app/hooks/api/roles/types";
-import { ProjectType, ProjectVersion } from "@app/hooks/api/workspace/types";
 import { UsePopUpState } from "@app/hooks/usePopUp";
 
 import { OrgInviteLink } from "./OrgInviteLink";
@@ -76,7 +76,7 @@ export const AddOrgMemberModal = ({
   const { data: organizationRoles } = useGetOrgRoles(currentOrg?.id ?? "");
   const { data: serverDetails } = useFetchServerStatus();
   const { mutateAsync: addUsersMutateAsync } = useAddUsersToOrg();
-  const { data: projects, isPending: isProjectsLoading } = useGetUserWorkspaces({
+  const { data: projects, isPending: isProjectsLoading } = useGetUserProjects({
     includeRoles: true
   });
 

frontend/src/pages/organization/AppConnections/AppConnectionsPage/AppConnectionsPage.tsx

@@ -1,24 +1,17 @@
 import { Helmet } from "react-helmet";
-import { faArrowUpRightFromSquare, faBookOpen, faPlus } from "@fortawesome/free-solid-svg-icons";
+import { faInfoCircle } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 
-import { OrgPermissionCan } from "@app/components/permissions";
-import { Button, PageHeader } from "@app/components/v2";
+import { PageHeader } from "@app/components/v2";
 import {
   OrgPermissionAppConnectionActions,
   OrgPermissionSubjects
 } from "@app/context/OrgPermissionContext/types";
 import { withPermission } from "@app/hoc";
-import { usePopUp } from "@app/hooks";
-import {
-  AddAppConnectionModal,
-  AppConnectionsTable
-} from "@app/pages/organization/AppConnections/AppConnectionsPage/components";
+import { AppConnectionsTable } from "@app/pages/organization/AppConnections/AppConnectionsPage/components";
 
 export const AppConnectionsPage = withPermission(
   () => {
-    const { popUp, handlePopUpOpen, handlePopUpToggle } = usePopUp(["addConnection"] as const);
-
     return (
       <div className="bg-bunker-800">
         <Helmet>
@@ -30,54 +23,18 @@ export const AppConnectionsPage = withPermission(
           <div className="w-full max-w-7xl">
             <PageHeader
               className="w-full"
-              title={
-                <div className="flex w-full items-center">
-                  <span>App Connections</span>
-                  <a
-                    className="-mt-1.5"
-                    href="https://infisical.com/docs/integrations/app-connections/overview"
-                    target="_blank"
-                    rel="noopener noreferrer"
-                  >
-                    <div className="ml-2 inline-block rounded-md bg-yellow/20 px-1.5 text-sm font-normal text-yellow opacity-80 hover:opacity-100">
-                      <FontAwesomeIcon icon={faBookOpen} className="mr-1.5" />
-                      <span>Docs</span>
-                      <FontAwesomeIcon
-                        icon={faArrowUpRightFromSquare}
-                        className="mb-[0.07rem] ml-1.5 text-[10px]"
-                      />
-                    </div>
-                  </a>
-                  <OrgPermissionCan
-                    I={OrgPermissionAppConnectionActions.Create}
-                    a={OrgPermissionSubjects.AppConnections}
-                  >
-                    {(isAllowed) => (
-                      <Button
-                        colorSchema="secondary"
-                        type="submit"
-                        leftIcon={<FontAwesomeIcon icon={faPlus} />}
-                        onClick={() => {
-                          handlePopUpOpen("addConnection");
-                        }}
-                        isDisabled={!isAllowed}
-                        className="ml-auto"
-                      >
-                        Add Connection
-                      </Button>
-                    )}
-                  </OrgPermissionCan>
-                </div>
-              }
-              description="Create and configure connections with third-party apps for re-use across Infisical projects"
+              title="App Connections"
+              description="Manage organization App Connections"
             />
-            <div className="mb-6 rounded-lg border border-mineshaft-600 bg-mineshaft-900 p-4">
-              <AppConnectionsTable />
-              <AddAppConnectionModal
-                isOpen={popUp.addConnection.isOpen}
-                onOpenChange={(isOpen) => handlePopUpToggle("addConnection", isOpen)}
-              />
+            <div className="mb-4 flex w-full flex-col rounded-md border border-blue-500/50 bg-blue-500/30 px-4 py-2 text-sm text-blue-200">
+              <div className="flex items-center">
+                <FontAwesomeIcon icon={faInfoCircle} className="mb-0.5 mr-2 text-sm" />
+                <span className="text-sm text-blue-200">
+                  App connections can also be created and managed independently in projects now.
+                </span>
+              </div>
             </div>
+            <AppConnectionsTable />
           </div>
         </div>
       </div>

frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AddAppConnectionModal.tsx

@@ -3,6 +3,7 @@ import { useState } from "react";
 import { Modal, ModalContent } from "@app/components/v2";
 import { TAppConnection } from "@app/hooks/api/appConnections";
 import { AppConnection } from "@app/hooks/api/appConnections/enums";
+import { ProjectType } from "@app/hooks/api/projects/types";
 
 import { AppConnectionForm } from "./AppConnectionForm";
 import { AppConnectionsSelect } from "./AppConnectionList";
@@ -10,29 +11,44 @@ import { AppConnectionsSelect } from "./AppConnectionList";
 type Props = {
   isOpen: boolean;
   onOpenChange: (isOpen: boolean) => void;
+  projectId?: string;
+  projectType?: ProjectType;
+  app?: AppConnection;
+  onComplete?: (appConnection: TAppConnection) => void;
 };
 
 type ContentProps = {
   onComplete: (appConnection: TAppConnection) => void;
+  projectId?: string;
+  projectType?: ProjectType;
+  app?: AppConnection;
 };
 
-const Content = ({ onComplete }: ContentProps) => {
+const Content = ({ onComplete, projectId, projectType, app }: ContentProps) => {
   const [selectedApp, setSelectedApp] = useState<AppConnection | null>(null);
 
-  if (selectedApp) {
+  if (app ?? selectedApp) {
     return (
       <AppConnectionForm
         onComplete={onComplete}
-        onBack={() => setSelectedApp(null)}
-        app={selectedApp}
+        onBack={app ? undefined : () => setSelectedApp(null)}
+        app={(app ?? selectedApp)!}
+        projectId={projectId}
       />
     );
   }
 
-  return <AppConnectionsSelect onSelect={setSelectedApp} />;
+  return <AppConnectionsSelect onSelect={setSelectedApp} projectType={projectType} />;
 };
 
-export const AddAppConnectionModal = ({ isOpen, onOpenChange }: Props) => {
+export const AddAppConnectionModal = ({
+  isOpen,
+  onOpenChange,
+  projectId,
+  projectType,
+  app,
+  onComplete
+}: Props) => {
   return (
     <Modal isOpen={isOpen} onOpenChange={onOpenChange}>
       <ModalContent
@@ -40,7 +56,15 @@ export const AddAppConnectionModal = ({ isOpen, onOpenChange }: Props) => {
         title="Add Connection"
         subTitle="Select a third-party app to connect to."
       >
-        <Content onComplete={() => onOpenChange(false)} />
+        <Content
+          projectId={projectId}
+          projectType={projectType}
+          app={app}
+          onComplete={(appConnection) => {
+            if (onComplete) onComplete(appConnection);
+            onOpenChange(false);
+          }}
+        />
       </ModalContent>
     </Modal>
   );

frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionForm/AppConnectionForm.tsx

@@ -52,12 +52,15 @@ type FormProps = {
   onComplete: (appConnection: TAppConnection) => void;
 } & ({ appConnection: TAppConnection } | { app: AppConnection });
 
-type CreateFormProps = FormProps & { app: AppConnection };
+type CreateFormProps = FormProps & {
+  app: AppConnection;
+  projectId?: string;
+};
 type UpdateFormProps = FormProps & {
   appConnection: TAppConnection;
 };
 
-const CreateForm = ({ app, onComplete }: CreateFormProps) => {
+const CreateForm = ({ app, onComplete, projectId }: CreateFormProps) => {
   const createAppConnection = useCreateAppConnection();
   const { name: appName } = APP_CONNECTION_MAP[app];
 
@@ -68,7 +71,10 @@ const CreateForm = ({ app, onComplete }: CreateFormProps) => {
     >
   ) => {
     try {
-      const connection = await createAppConnection.mutateAsync(formData);
+      const connection = await createAppConnection.mutateAsync({
+        ...formData,
+        projectId
+      });
       createNotification({
         text: `Successfully added ${appName} Connection`,
         type: "success"
@@ -88,15 +94,15 @@ const CreateForm = ({ app, onComplete }: CreateFormProps) => {
     case AppConnection.AWS:
       return <AwsConnectionForm onSubmit={onSubmit} />;
     case AppConnection.GitHub:
-      return <GitHubConnectionForm />;
+      return <GitHubConnectionForm projectId={projectId} />;
     case AppConnection.GitHubRadar:
-      return <GitHubRadarConnectionForm />;
+      return <GitHubRadarConnectionForm projectId={projectId} />;
     case AppConnection.GCP:
       return <GcpConnectionForm onSubmit={onSubmit} />;
     case AppConnection.AzureKeyVault:
-      return <AzureKeyVaultConnectionForm onSubmit={onSubmit} />;
+      return <AzureKeyVaultConnectionForm onSubmit={onSubmit} projectId={projectId} />;
     case AppConnection.AzureAppConfiguration:
-      return <AzureAppConfigurationConnectionForm onSubmit={onSubmit} />;
+      return <AzureAppConfigurationConnectionForm onSubmit={onSubmit} projectId={projectId} />;
     case AppConnection.AzureADCS:
       return <AzureADCSConnectionForm onSubmit={onSubmit} />;
     case AppConnection.Databricks:
@@ -118,9 +124,9 @@ const CreateForm = ({ app, onComplete }: CreateFormProps) => {
     case AppConnection.Camunda:
       return <CamundaConnectionForm onSubmit={onSubmit} />;
     case AppConnection.AzureClientSecrets:
-      return <AzureClientSecretsConnectionForm onSubmit={onSubmit} />;
+      return <AzureClientSecretsConnectionForm onSubmit={onSubmit} projectId={projectId} />;
     case AppConnection.AzureDevOps:
-      return <AzureDevOpsConnectionForm onSubmit={onSubmit} />;
+      return <AzureDevOpsConnectionForm onSubmit={onSubmit} projectId={projectId} />;
     case AppConnection.Windmill:
       return <WindmillConnectionForm onSubmit={onSubmit} />;
     case AppConnection.Auth0:
@@ -136,13 +142,13 @@ const CreateForm = ({ app, onComplete }: CreateFormProps) => {
     case AppConnection.OnePass:
       return <OnePassConnectionForm onSubmit={onSubmit} />;
     case AppConnection.Heroku:
-      return <HerokuConnectionForm onSubmit={onSubmit} />;
+      return <HerokuConnectionForm onSubmit={onSubmit} projectId={projectId} />;
     case AppConnection.Render:
       return <RenderConnectionForm onSubmit={onSubmit} />;
     case AppConnection.Flyio:
       return <FlyioConnectionForm onSubmit={onSubmit} />;
     case AppConnection.GitLab:
-      return <GitLabConnectionForm onSubmit={onSubmit} />;
+      return <GitLabConnectionForm onSubmit={onSubmit} projectId={projectId} />;
     case AppConnection.Cloudflare:
       return <CloudflareConnectionForm onSubmit={onSubmit} />;
     case AppConnection.Bitbucket:
@@ -200,16 +206,33 @@ const UpdateForm = ({ appConnection, onComplete }: UpdateFormProps) => {
     case AppConnection.AWS:
       return <AwsConnectionForm appConnection={appConnection} onSubmit={onSubmit} />;
     case AppConnection.GitHub:
-      return <GitHubConnectionForm appConnection={appConnection} />;
+      return (
+        <GitHubConnectionForm appConnection={appConnection} projectId={appConnection.projectId} />
+      );
     case AppConnection.GitHubRadar:
-      return <GitHubRadarConnectionForm appConnection={appConnection} />;
+      return (
+        <GitHubRadarConnectionForm
+          appConnection={appConnection}
+          projectId={appConnection.projectId}
+        />
+      );
     case AppConnection.GCP:
       return <GcpConnectionForm appConnection={appConnection} onSubmit={onSubmit} />;
     case AppConnection.AzureKeyVault:
-      return <AzureKeyVaultConnectionForm appConnection={appConnection} onSubmit={onSubmit} />;
+      return (
+        <AzureKeyVaultConnectionForm
+          appConnection={appConnection}
+          onSubmit={onSubmit}
+          projectId={appConnection.projectId}
+        />
+      );
     case AppConnection.AzureAppConfiguration:
       return (
-        <AzureAppConfigurationConnectionForm appConnection={appConnection} onSubmit={onSubmit} />
+        <AzureAppConfigurationConnectionForm
+          appConnection={appConnection}
+          onSubmit={onSubmit}
+          projectId={appConnection.projectId}
+        />
       );
     case AppConnection.AzureADCS:
       return <AzureADCSConnectionForm appConnection={appConnection} onSubmit={onSubmit} />;
@@ -232,9 +255,21 @@ const UpdateForm = ({ appConnection, onComplete }: UpdateFormProps) => {
     case AppConnection.Camunda:
       return <CamundaConnectionForm onSubmit={onSubmit} appConnection={appConnection} />;
     case AppConnection.AzureClientSecrets:
-      return <AzureClientSecretsConnectionForm appConnection={appConnection} onSubmit={onSubmit} />;
+      return (
+        <AzureClientSecretsConnectionForm
+          appConnection={appConnection}
+          onSubmit={onSubmit}
+          projectId={appConnection.projectId}
+        />
+      );
     case AppConnection.AzureDevOps:
-      return <AzureDevOpsConnectionForm appConnection={appConnection} onSubmit={onSubmit} />;
+      return (
+        <AzureDevOpsConnectionForm
+          appConnection={appConnection}
+          onSubmit={onSubmit}
+          projectId={appConnection.projectId}
+        />
+      );
     case AppConnection.Windmill:
       return <WindmillConnectionForm onSubmit={onSubmit} appConnection={appConnection} />;
     case AppConnection.Auth0:
@@ -250,13 +285,25 @@ const UpdateForm = ({ appConnection, onComplete }: UpdateFormProps) => {
     case AppConnection.OnePass:
       return <OnePassConnectionForm onSubmit={onSubmit} appConnection={appConnection} />;
     case AppConnection.Heroku:
-      return <HerokuConnectionForm onSubmit={onSubmit} appConnection={appConnection} />;
+      return (
+        <HerokuConnectionForm
+          onSubmit={onSubmit}
+          appConnection={appConnection}
+          projectId={appConnection.projectId}
+        />
+      );
     case AppConnection.Render:
       return <RenderConnectionForm onSubmit={onSubmit} appConnection={appConnection} />;
     case AppConnection.Flyio:
       return <FlyioConnectionForm onSubmit={onSubmit} appConnection={appConnection} />;
     case AppConnection.GitLab:
-      return <GitLabConnectionForm onSubmit={onSubmit} appConnection={appConnection} />;
+      return (
+        <GitLabConnectionForm
+          onSubmit={onSubmit}
+          appConnection={appConnection}
+          projectId={appConnection.projectId}
+        />
+      );
     case AppConnection.Cloudflare:
       return <CloudflareConnectionForm onSubmit={onSubmit} appConnection={appConnection} />;
     case AppConnection.Bitbucket:
@@ -278,12 +325,12 @@ const UpdateForm = ({ appConnection, onComplete }: UpdateFormProps) => {
   }
 };
 
-type Props = { onBack?: () => void } & Pick<FormProps, "onComplete"> &
+type Props = { onBack?: () => void; projectId?: string } & Pick<FormProps, "onComplete"> &
   (
     | { app: AppConnection; appConnection?: undefined }
     | { app?: undefined; appConnection: TAppConnection }
   );
-export const AppConnectionForm = ({ onBack, ...props }: Props) => {
+export const AppConnectionForm = ({ onBack, projectId, ...props }: Props) => {
   const { app, appConnection } = props;
 
   return (
@@ -296,7 +343,7 @@ export const AppConnectionForm = ({ onBack, ...props }: Props) => {
       {appConnection ? (
         <UpdateForm {...props} appConnection={appConnection} />
       ) : (
-        <CreateForm {...props} app={app} />
+        <CreateForm {...props} app={app} projectId={projectId} />
       )}
     </div>
   );

frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionForm/AzureAppConfigurationConnectionForm.tsx

@@ -6,7 +6,11 @@ import { zodResolver } from "@hookform/resolvers/zod";
 import { z } from "zod";
 
 import { Button, FormControl, Input, ModalClose, Select, SelectItem } from "@app/components/v2";
-import { APP_CONNECTION_MAP, getAppConnectionMethodDetails } from "@app/helpers/appConnections";
+import {
+  APP_CONNECTION_MAP,
+  getAppConnectionMethodDetails,
+  useGetAppConnectionOauthReturnUrl
+} from "@app/helpers/appConnections";
 import { isInfisicalCloud } from "@app/helpers/platform";
 import {
   AzureAppConfigurationConnectionMethod,
@@ -15,6 +19,7 @@ import {
 } from "@app/hooks/api/appConnections";
 import { AppConnection } from "@app/hooks/api/appConnections/enums";
 
+import { AzureAppConfigurationFormData } from "../../../OauthCallbackPage/OauthCallbackPage.types";
 import {
   genericAppConnectionFieldsSchema,
   GenericAppConnectionsFields
@@ -25,6 +30,7 @@ type ClientSecretForm = z.infer<typeof clientSecretSchema>;
 type Props = {
   appConnection?: TAzureAppConfigurationConnection;
   onSubmit: (formData: ClientSecretForm) => Promise<void>;
+  projectId: string | undefined | null;
 };
 
 const baseSchema = genericAppConnectionFieldsSchema.extend({
@@ -96,7 +102,11 @@ const getDefaultValues = (appConnection?: TAzureAppConfigurationConnection): Par
   return base;
 };
 
-export const AzureAppConfigurationConnectionForm = ({ appConnection, onSubmit }: Props) => {
+export const AzureAppConfigurationConnectionForm = ({
+  appConnection,
+  onSubmit,
+  projectId
+}: Props) => {
   const isUpdate = Boolean(appConnection);
   const [isRedirecting, setIsRedirecting] = useState(false);
 
@@ -110,6 +120,8 @@ export const AzureAppConfigurationConnectionForm = ({ appConnection, onSubmit }:
     defaultValues: getDefaultValues(appConnection)
   });
 
+  const returnUrl = useGetAppConnectionOauthReturnUrl();
+
   const {
     handleSubmit,
     control,
@@ -128,7 +140,12 @@ export const AzureAppConfigurationConnectionForm = ({ appConnection, onSubmit }:
         localStorage.setItem("latestCSRFToken", state);
         localStorage.setItem(
           "azureAppConfigurationConnectionFormData",
-          JSON.stringify({ ...formData, connectionId: appConnection?.id })
+          JSON.stringify({
+            ...formData,
+            connectionId: appConnection?.id,
+            projectId,
+            returnUrl
+          } as AzureAppConfigurationFormData)
         );
         window.location.assign(
           `https://login.microsoftonline.com/${formData.tenantId || "common"}/oauth2/v2.0/authorize?client_id=${oauthClientId}&response_type=code&redirect_uri=${window.location.origin}/organization/app-connections/azure/oauth/callback&response_mode=query&scope=https://azconfig.io/.default%20openid%20offline_access&state=${state}<:>azure-app-configuration`

frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionForm/AzureClientSecretsConnectionForm.tsx

@@ -7,7 +7,11 @@ import { zodResolver } from "@hookform/resolvers/zod";
 import { z } from "zod";
 
 import { Button, FormControl, Input, ModalClose, Select, SelectItem } from "@app/components/v2";
-import { APP_CONNECTION_MAP, getAppConnectionMethodDetails } from "@app/helpers/appConnections";
+import {
+  APP_CONNECTION_MAP,
+  getAppConnectionMethodDetails,
+  useGetAppConnectionOauthReturnUrl
+} from "@app/helpers/appConnections";
 import { isInfisicalCloud } from "@app/helpers/platform";
 import {
   AzureClientSecretsConnectionMethod,
@@ -16,6 +20,7 @@ import {
 } from "@app/hooks/api/appConnections";
 import { AppConnection } from "@app/hooks/api/appConnections/enums";
 
+import { AzureClientSecretsFormData } from "../../../OauthCallbackPage/OauthCallbackPage.types";
 import {
   genericAppConnectionFieldsSchema,
   GenericAppConnectionsFields
@@ -26,6 +31,7 @@ type ClientSecretForm = z.infer<typeof clientSecretSchema>;
 type Props = {
   appConnection?: TAzureClientSecretsConnection;
   onSubmit: (formData: ClientSecretForm) => Promise<void>;
+  projectId: string | undefined | null;
 };
 
 const baseSchema = genericAppConnectionFieldsSchema.extend({
@@ -97,7 +103,7 @@ const getDefaultValues = (appConnection?: TAzureClientSecretsConnection): Partia
   return base;
 };
 
-export const AzureClientSecretsConnectionForm = ({ appConnection, onSubmit }: Props) => {
+export const AzureClientSecretsConnectionForm = ({ appConnection, onSubmit, projectId }: Props) => {
   const isUpdate = Boolean(appConnection);
   const [isRedirecting, setIsRedirecting] = useState(false);
 
@@ -111,6 +117,8 @@ export const AzureClientSecretsConnectionForm = ({ appConnection, onSubmit }: Pr
     defaultValues: getDefaultValues(appConnection)
   });
 
+  const returnUrl = useGetAppConnectionOauthReturnUrl();
+
   const {
     handleSubmit,
     control,
@@ -129,7 +137,12 @@ export const AzureClientSecretsConnectionForm = ({ appConnection, onSubmit }: Pr
         localStorage.setItem("latestCSRFToken", state);
         localStorage.setItem(
           "azureClientSecretsConnectionFormData",
-          JSON.stringify({ ...formData, connectionId: appConnection?.id })
+          JSON.stringify({
+            ...formData,
+            connectionId: appConnection?.id,
+            projectId,
+            returnUrl
+          } as AzureClientSecretsFormData)
         );
         window.location.assign(
           `https://login.microsoftonline.com/${formData.tenantId || "common"}/oauth2/v2.0/authorize?client_id=${oauthClientId}&response_type=code&redirect_uri=${window.location.origin}/organization/app-connections/azure/oauth/callback&response_mode=query&scope=https://graph.microsoft.com/.default%20openid%20offline_access&state=${state}<:>azure-client-secrets`

frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionForm/AzureDevOpsConnectionForm.tsx

@@ -7,7 +7,11 @@ import { zodResolver } from "@hookform/resolvers/zod";
 import { z } from "zod";
 
 import { Button, FormControl, Input, ModalClose, Select, SelectItem } from "@app/components/v2";
-import { APP_CONNECTION_MAP, getAppConnectionMethodDetails } from "@app/helpers/appConnections";
+import {
+  APP_CONNECTION_MAP,
+  getAppConnectionMethodDetails,
+  useGetAppConnectionOauthReturnUrl
+} from "@app/helpers/appConnections";
 import { isInfisicalCloud } from "@app/helpers/platform";
 import {
   AzureDevOpsConnectionMethod,
@@ -16,6 +20,7 @@ import {
 } from "@app/hooks/api/appConnections";
 import { AppConnection } from "@app/hooks/api/appConnections/enums";
 
+import { AzureDevOpsFormData } from "../../../OauthCallbackPage/OauthCallbackPage.types";
 import {
   genericAppConnectionFieldsSchema,
   GenericAppConnectionsFields
@@ -65,6 +70,7 @@ type OnSubmitForm = z.infer<typeof accessTokenSchema> | z.infer<typeof clientSec
 type Props = {
   appConnection?: TAzureDevOpsConnection;
   onSubmit: (formData: OnSubmitForm) => Promise<void>;
+  projectId: string | undefined | null;
 };
 
 const getDefaultValues = (appConnection?: TAzureDevOpsConnection): Partial<FormData> => {
@@ -132,7 +138,7 @@ const getDefaultValues = (appConnection?: TAzureDevOpsConnection): Partial<FormD
   return base;
 };
 
-export const AzureDevOpsConnectionForm = ({ appConnection, onSubmit }: Props) => {
+export const AzureDevOpsConnectionForm = ({ appConnection, onSubmit, projectId }: Props) => {
   const isUpdate = Boolean(appConnection);
   const [isRedirecting, setIsRedirecting] = useState(false);
 
@@ -146,6 +152,8 @@ export const AzureDevOpsConnectionForm = ({ appConnection, onSubmit }: Props) =>
     defaultValues: getDefaultValues(appConnection)
   });
 
+  const returnUrl = useGetAppConnectionOauthReturnUrl();
+
   const {
     handleSubmit,
     control,
@@ -164,7 +172,12 @@ export const AzureDevOpsConnectionForm = ({ appConnection, onSubmit }: Props) =>
         localStorage.setItem("latestCSRFToken", state);
         localStorage.setItem(
           "azureDevOpsConnectionFormData",
-          JSON.stringify({ ...formData, connectionId: appConnection?.id })
+          JSON.stringify({
+            ...formData,
+            connectionId: appConnection?.id,
+            projectId,
+            returnUrl
+          } as AzureDevOpsFormData)
         );
 
         window.location.assign(

frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionForm/AzureKeyVaultConnectionForm.tsx

@@ -6,7 +6,11 @@ import { zodResolver } from "@hookform/resolvers/zod";
 import { z } from "zod";
 
 import { Button, FormControl, Input, ModalClose, Select, SelectItem } from "@app/components/v2";
-import { APP_CONNECTION_MAP, getAppConnectionMethodDetails } from "@app/helpers/appConnections";
+import {
+  APP_CONNECTION_MAP,
+  getAppConnectionMethodDetails,
+  useGetAppConnectionOauthReturnUrl
+} from "@app/helpers/appConnections";
 import { isInfisicalCloud } from "@app/helpers/platform";
 import { useGetAppConnectionOption } from "@app/hooks/api/appConnections";
 import { AppConnection } from "@app/hooks/api/appConnections/enums";
@@ -15,6 +19,7 @@ import {
   TAzureKeyVaultConnection
 } from "@app/hooks/api/appConnections/types/azure-key-vault-connection";
 
+import { AzureKeyVaultFormData } from "../../../OauthCallbackPage/OauthCallbackPage.types";
 import {
   genericAppConnectionFieldsSchema,
   GenericAppConnectionsFields
@@ -25,6 +30,7 @@ type ClientSecretForm = z.infer<typeof clientSecretSchema>;
 type Props = {
   appConnection?: TAzureKeyVaultConnection;
   onSubmit: (formData: ClientSecretForm) => Promise<void>;
+  projectId: string | undefined | null;
 };
 
 const baseSchema = genericAppConnectionFieldsSchema.extend({
@@ -96,7 +102,7 @@ const getDefaultValues = (appConnection?: TAzureKeyVaultConnection): Partial<For
   return base;
 };
 
-export const AzureKeyVaultConnectionForm = ({ appConnection, onSubmit }: Props) => {
+export const AzureKeyVaultConnectionForm = ({ appConnection, onSubmit, projectId }: Props) => {
   const isUpdate = Boolean(appConnection);
   const [isRedirecting, setIsRedirecting] = useState(false);
 
@@ -110,6 +116,8 @@ export const AzureKeyVaultConnectionForm = ({ appConnection, onSubmit }: Props)
     defaultValues: getDefaultValues(appConnection)
   });
 
+  const returnUrl = useGetAppConnectionOauthReturnUrl();
+
   const {
     handleSubmit,
     control,
@@ -129,7 +137,12 @@ export const AzureKeyVaultConnectionForm = ({ appConnection, onSubmit }: Props)
         localStorage.setItem("latestCSRFToken", state);
         localStorage.setItem(
           "azureKeyVaultConnectionFormData",
-          JSON.stringify({ ...formData, connectionId: appConnection?.id })
+          JSON.stringify({
+            ...formData,
+            connectionId: appConnection?.id,
+            projectId,
+            returnUrl
+          } as AzureKeyVaultFormData)
         );
         window.location.assign(
           `https://login.microsoftonline.com/${formData.tenantId || "common"}/oauth2/v2.0/authorize?client_id=${oauthClientId}&response_type=code&redirect_uri=${window.location.origin}/organization/app-connections/azure/oauth/callback&response_mode=query&scope=https://vault.azure.net/.default%20openid%20offline_access&state=${state}<:>azure-key-vault`

frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionForm/GitHubConnectionForm.tsx

@@ -25,7 +25,11 @@ import {
   OrgGatewayPermissionActions,
   OrgPermissionSubjects
 } from "@app/context/OrgPermissionContext/types";
-import { APP_CONNECTION_MAP, getAppConnectionMethodDetails } from "@app/helpers/appConnections";
+import {
+  APP_CONNECTION_MAP,
+  getAppConnectionMethodDetails,
+  useGetAppConnectionOauthReturnUrl
+} from "@app/helpers/appConnections";
 import { isInfisicalCloud } from "@app/helpers/platform";
 import { gatewaysQueryKeys } from "@app/hooks/api";
 import {
@@ -35,6 +39,7 @@ import {
 } from "@app/hooks/api/appConnections";
 import { AppConnection } from "@app/hooks/api/appConnections/enums";
 
+import { GitHubFormData } from "../../../OauthCallbackPage/OauthCallbackPage.types";
 import {
   genericAppConnectionFieldsSchema,
   GenericAppConnectionsFields
@@ -42,6 +47,7 @@ import {
 
 type Props = {
   appConnection?: TGitHubConnection;
+  projectId: string | undefined | null;
 };
 
 const formSchema = genericAppConnectionFieldsSchema.extend({
@@ -63,7 +69,7 @@ const formSchema = genericAppConnectionFieldsSchema.extend({
 
 type FormData = z.infer<typeof formSchema>;
 
-export const GitHubConnectionForm = ({ appConnection }: Props) => {
+export const GitHubConnectionForm = ({ appConnection, projectId }: Props) => {
   const isUpdate = Boolean(appConnection);
   const [isRedirecting, setIsRedirecting] = useState(false);
 
@@ -98,13 +104,21 @@ export const GitHubConnectionForm = ({ appConnection }: Props) => {
   const selectedMethod = watch("method");
   const instanceType = watch("credentials.instanceType");
 
+  const returnUrl = useGetAppConnectionOauthReturnUrl();
+
   const onSubmit = (formData: FormData) => {
     setIsRedirecting(true);
     const state = crypto.randomBytes(16).toString("hex");
     localStorage.setItem("latestCSRFToken", state);
     localStorage.setItem(
       "githubConnectionFormData",
-      JSON.stringify({ ...formData, connectionId: appConnection?.id })
+      JSON.stringify({
+        ...formData,
+        credentials: formData.credentials as TGitHubConnection["credentials"],
+        connectionId: appConnection?.id,
+        projectId,
+        returnUrl
+      } as GitHubFormData)
     );
 
     const githubHost =

frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionForm/GitHubRadarConnectionForm.tsx

@@ -6,7 +6,11 @@ import { zodResolver } from "@hookform/resolvers/zod";
 import { z } from "zod";
 
 import { Button, FormControl, ModalClose, Select, SelectItem } from "@app/components/v2";
-import { APP_CONNECTION_MAP, getAppConnectionMethodDetails } from "@app/helpers/appConnections";
+import {
+  APP_CONNECTION_MAP,
+  getAppConnectionMethodDetails,
+  useGetAppConnectionOauthReturnUrl
+} from "@app/helpers/appConnections";
 import { isInfisicalCloud } from "@app/helpers/platform";
 import {
   GitHubRadarConnectionMethod,
@@ -15,6 +19,7 @@ import {
 } from "@app/hooks/api/appConnections";
 import { AppConnection } from "@app/hooks/api/appConnections/enums";
 
+import { GitHubRadarFormData } from "../../../OauthCallbackPage/OauthCallbackPage.types";
 import {
   genericAppConnectionFieldsSchema,
   GenericAppConnectionsFields
@@ -22,6 +27,7 @@ import {
 
 type Props = {
   appConnection?: TGitHubRadarConnection;
+  projectId: string | undefined | null;
 };
 
 const formSchema = genericAppConnectionFieldsSchema.extend({
@@ -31,7 +37,7 @@ const formSchema = genericAppConnectionFieldsSchema.extend({
 
 type FormData = z.infer<typeof formSchema>;
 
-export const GitHubRadarConnectionForm = ({ appConnection }: Props) => {
+export const GitHubRadarConnectionForm = ({ appConnection, projectId }: Props) => {
   const isUpdate = Boolean(appConnection);
   const [isRedirecting, setIsRedirecting] = useState(false);
 
@@ -48,6 +54,8 @@ export const GitHubRadarConnectionForm = ({ appConnection }: Props) => {
     }
   });
 
+  const returnUrl = useGetAppConnectionOauthReturnUrl();
+
   const {
     handleSubmit,
     control,
@@ -63,7 +71,12 @@ export const GitHubRadarConnectionForm = ({ appConnection }: Props) => {
     localStorage.setItem("latestCSRFToken", state);
     localStorage.setItem(
       "githubRadarConnectionFormData",
-      JSON.stringify({ ...formData, connectionId: appConnection?.id })
+      JSON.stringify({
+        ...formData,
+        connectionId: appConnection?.id,
+        projectId,
+        returnUrl
+      } as GitHubRadarFormData)
     );
 
     switch (formData.method) {

frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionForm/GitLabConnectionForm.tsx

@@ -16,7 +16,11 @@ import {
   Select,
   SelectItem
 } from "@app/components/v2";
-import { APP_CONNECTION_MAP, getAppConnectionMethodDetails } from "@app/helpers/appConnections";
+import {
+  APP_CONNECTION_MAP,
+  getAppConnectionMethodDetails,
+  useGetAppConnectionOauthReturnUrl
+} from "@app/helpers/appConnections";
 import { isInfisicalCloud } from "@app/helpers/platform";
 import { useGetAppConnectionOption } from "@app/hooks/api/appConnections";
 import { AppConnection } from "@app/hooks/api/appConnections/enums";
@@ -26,6 +30,7 @@ import {
   TGitLabConnection
 } from "@app/hooks/api/appConnections/types/gitlab-connection";
 
+import { GitLabFormData } from "../../../OauthCallbackPage/OauthCallbackPage.types";
 import {
   genericAppConnectionFieldsSchema,
   GenericAppConnectionsFields
@@ -34,6 +39,7 @@ import {
 type Props = {
   appConnection?: TGitLabConnection;
   onSubmit: (formData: FormData) => Promise<void>;
+  projectId: string | undefined | null;
 };
 
 const formSchema = z.discriminatedUnion("method", [
@@ -72,7 +78,7 @@ const formSchema = z.discriminatedUnion("method", [
 
 type FormData = z.infer<typeof formSchema>;
 
-export const GitLabConnectionForm = ({ appConnection, onSubmit: formSubmit }: Props) => {
+export const GitLabConnectionForm = ({ appConnection, onSubmit: formSubmit, projectId }: Props) => {
   const isUpdate = Boolean(appConnection);
   const [isRedirecting, setIsRedirecting] = useState(false);
 
@@ -98,6 +104,8 @@ export const GitLabConnectionForm = ({ appConnection, onSubmit: formSubmit }: Pr
           } as FormData))
   });
 
+  const returnUrl = useGetAppConnectionOauthReturnUrl();
+
   const {
     handleSubmit,
     control,
@@ -132,8 +140,10 @@ export const GitLabConnectionForm = ({ appConnection, onSubmit: formSubmit }: Pr
             JSON.stringify({
               ...formData,
               connectionId: appConnection?.id,
-              isUpdate
-            })
+              isUpdate,
+              projectId,
+              returnUrl
+            } as GitLabFormData)
           );
 
           // Redirect to Gitlab OAuth

frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionForm/HerokuAppConnectionForm.tsx

@@ -15,7 +15,11 @@ import {
   Select,
   SelectItem
 } from "@app/components/v2";
-import { APP_CONNECTION_MAP, getAppConnectionMethodDetails } from "@app/helpers/appConnections";
+import {
+  APP_CONNECTION_MAP,
+  getAppConnectionMethodDetails,
+  useGetAppConnectionOauthReturnUrl
+} from "@app/helpers/appConnections";
 import { isInfisicalCloud } from "@app/helpers/platform";
 import { useGetAppConnectionOption } from "@app/hooks/api/appConnections";
 import { AppConnection } from "@app/hooks/api/appConnections/enums";
@@ -32,6 +36,7 @@ import {
 type Props = {
   appConnection?: THerokuConnection;
   onSubmit: (formData: FormData) => Promise<void>;
+  projectId: string | undefined | null;
 };
 
 const formSchema = z.discriminatedUnion("method", [
@@ -53,10 +58,12 @@ const formSchema = z.discriminatedUnion("method", [
 
 type FormData = z.infer<typeof formSchema>;
 
-export const HerokuConnectionForm = ({ appConnection, onSubmit: formSubmit }: Props) => {
+export const HerokuConnectionForm = ({ appConnection, onSubmit: formSubmit, projectId }: Props) => {
   const isUpdate = Boolean(appConnection);
   const [isRedirecting, setIsRedirecting] = useState(false);
 
+  const returnUrl = useGetAppConnectionOauthReturnUrl();
+
   const {
     option: { oauthClientId },
     isLoading
@@ -110,7 +117,8 @@ export const HerokuConnectionForm = ({ appConnection, onSubmit: formSubmit }: Pr
             JSON.stringify({
               ...formData,
               connectionId: appConnection?.id,
-              isUpdate
+              returnUrl,
+              projectId
             })
           );
 

frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionList.tsx

@@ -9,14 +9,16 @@ import { APP_CONNECTION_MAP } from "@app/helpers/appConnections";
 import { usePagination, usePopUp, useResetPageHelper } from "@app/hooks";
 import { useAppConnectionOptions } from "@app/hooks/api/appConnections";
 import { AppConnection } from "@app/hooks/api/appConnections/enums";
+import { ProjectType } from "@app/hooks/api/projects/types";
 
 type Props = {
   onSelect: (app: AppConnection) => void;
+  projectType?: ProjectType;
 };
 
-export const AppConnectionsSelect = ({ onSelect }: Props) => {
+export const AppConnectionsSelect = ({ onSelect, projectType }: Props) => {
   const { subscription } = useSubscription();
-  const { isPending, data: appConnectionOptions } = useAppConnectionOptions();
+  const { isPending, data: appConnectionOptions } = useAppConnectionOptions(projectType);
 
   const { popUp, handlePopUpOpen, handlePopUpToggle } = usePopUp(["upgradePlan"] as const);
 

frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionRow.tsx

@@ -1,19 +1,23 @@
 import { useCallback } from "react";
+import { subject } from "@casl/ability";
 import {
   faAsterisk,
+  faBuilding,
   faCheck,
   faCopy,
   faEdit,
   faEllipsisV,
   faInfoCircle,
   faServer,
+  faTable,
   faTrash
 } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { Link } from "@tanstack/react-router";
 import { twMerge } from "tailwind-merge";
 
 import { createNotification } from "@app/components/notifications";
-import { OrgPermissionCan } from "@app/components/permissions";
+import { VariablePermissionCan } from "@app/components/permissions";
 import {
   Badge,
   DropdownMenu,
@@ -25,9 +29,11 @@ import {
   Tooltip,
   Tr
 } from "@app/components/v2";
-import { OrgPermissionSubjects } from "@app/context";
+import { OrgPermissionSubjects, ProjectPermissionSub } from "@app/context";
 import { OrgPermissionAppConnectionActions } from "@app/context/OrgPermissionContext/types";
+import { ProjectPermissionAppConnectionActions } from "@app/context/ProjectPermissionContext/types";
 import { APP_CONNECTION_MAP, getAppConnectionMethodDetails } from "@app/helpers/appConnections";
+import { getProjectBaseURL } from "@app/helpers/project";
 import { useToggle } from "@app/hooks";
 import { TAppConnection } from "@app/hooks/api/appConnections";
 
@@ -36,15 +42,18 @@ type Props = {
   onDelete: (appConnection: TAppConnection) => void;
   onEditCredentials: (appConnection: TAppConnection) => void;
   onEditDetails: (appConnection: TAppConnection) => void;
+  isProjectView: boolean;
 };
 
 export const AppConnectionRow = ({
   appConnection,
   onDelete,
   onEditCredentials,
-  onEditDetails
+  onEditDetails,
+  isProjectView
 }: Props) => {
-  const { id, name, method, app, description, isPlatformManagedCredentials } = appConnection;
+  const { id, name, method, app, description, isPlatformManagedCredentials, project } =
+    appConnection;
 
   const [isIdCopied, setIsIdCopied] = useToggle(false);
 
@@ -111,7 +120,38 @@ export const AppConnectionRow = ({
           {methodDetails.name}
         </p>
       </Td>
-
+      {!isProjectView && (
+        <Td className="!min-w-[8rem] max-w-0">
+          {project ? (
+            <Link
+              // @ts-expect-error app-connections aren't in kms/ssh
+              to={`${getProjectBaseURL(project.type)}/app-connections`}
+              params={{
+                projectId: project.id
+              }}
+              className="underline"
+            >
+              <p className="truncate">
+                <FontAwesomeIcon
+                  size="sm"
+                  className="mr-1.5 text-mineshaft-300/75"
+                  icon={faTable}
+                />
+                {project.name}
+              </p>
+            </Link>
+          ) : (
+            <p className="truncate">
+              <FontAwesomeIcon
+                size="sm"
+                className="mr-1.5 text-mineshaft-300/75"
+                icon={faBuilding}
+              />
+              Organization
+            </p>
+          )}
+        </Td>
+      )}
       <Td>
         <div className="flex items-center justify-end gap-2">
           {isPlatformManagedCredentials && (
@@ -143,48 +183,91 @@ export const AppConnectionRow = ({
                 >
                   Copy Connection ID
                 </DropdownMenuItem>
-                <OrgPermissionCan
-                  I={OrgPermissionAppConnectionActions.Edit}
-                  a={OrgPermissionSubjects.AppConnections}
-                >
-                  {(isAllowed: boolean) => (
-                    <DropdownMenuItem
-                      isDisabled={!isAllowed}
-                      icon={<FontAwesomeIcon icon={faEdit} />}
-                      onClick={() => onEditDetails(appConnection)}
+                {(isProjectView || !project) && (
+                  <>
+                    <VariablePermissionCan
+                      type={isProjectView ? "project" : "org"}
+                      I={
+                        isProjectView
+                          ? ProjectPermissionAppConnectionActions.Edit
+                          : OrgPermissionAppConnectionActions.Edit
+                      }
+                      a={
+                        isProjectView
+                          ? subject(ProjectPermissionSub.AppConnections, {
+                              connectionId: id
+                            })
+                          : subject(OrgPermissionSubjects.AppConnections, {
+                              connectionId: id
+                            })
+                      }
                     >
-                      Edit Details
-                    </DropdownMenuItem>
-                  )}
-                </OrgPermissionCan>
-                <OrgPermissionCan
-                  I={OrgPermissionAppConnectionActions.Edit}
-                  a={OrgPermissionSubjects.AppConnections}
-                >
-                  {(isAllowed: boolean) => (
-                    <DropdownMenuItem
-                      isDisabled={!isAllowed}
-                      icon={<FontAwesomeIcon icon={faAsterisk} />}
-                      onClick={() => onEditCredentials(appConnection)}
+                      {(isAllowed: boolean) => (
+                        <DropdownMenuItem
+                          isDisabled={!isAllowed}
+                          icon={<FontAwesomeIcon icon={faEdit} />}
+                          onClick={() => onEditDetails(appConnection)}
+                        >
+                          Edit Details
+                        </DropdownMenuItem>
+                      )}
+                    </VariablePermissionCan>
+                    <VariablePermissionCan
+                      type={isProjectView ? "project" : "org"}
+                      I={
+                        isProjectView
+                          ? ProjectPermissionAppConnectionActions.Edit
+                          : OrgPermissionAppConnectionActions.Edit
+                      }
+                      a={
+                        isProjectView
+                          ? subject(ProjectPermissionSub.AppConnections, {
+                              connectionId: id
+                            })
+                          : subject(OrgPermissionSubjects.AppConnections, {
+                              connectionId: id
+                            })
+                      }
                     >
-                      {isPlatformManagedCredentials ? "View" : "Edit"} Credentials
-                    </DropdownMenuItem>
-                  )}
-                </OrgPermissionCan>
-                <OrgPermissionCan
-                  I={OrgPermissionAppConnectionActions.Delete}
-                  a={OrgPermissionSubjects.AppConnections}
-                >
-                  {(isAllowed: boolean) => (
-                    <DropdownMenuItem
-                      isDisabled={!isAllowed}
-                      icon={<FontAwesomeIcon icon={faTrash} />}
-                      onClick={() => onDelete(appConnection)}
+                      {(isAllowed: boolean) => (
+                        <DropdownMenuItem
+                          isDisabled={!isAllowed}
+                          icon={<FontAwesomeIcon icon={faAsterisk} />}
+                          onClick={() => onEditCredentials(appConnection)}
+                        >
+                          {isPlatformManagedCredentials ? "View" : "Edit"} Credentials
+                        </DropdownMenuItem>
+                      )}
+                    </VariablePermissionCan>
+                    <VariablePermissionCan
+                      type={isProjectView ? "project" : "org"}
+                      I={
+                        isProjectView
+                          ? ProjectPermissionAppConnectionActions.Delete
+                          : OrgPermissionAppConnectionActions.Delete
+                      }
+                      a={
+                        isProjectView
+                          ? subject(ProjectPermissionSub.AppConnections, {
+                              connectionId: id
+                            })
+                          : subject(OrgPermissionSubjects.AppConnections, {
+                              connectionId: id
+                            })
+                      }
                     >
-                      Delete Connection
-                    </DropdownMenuItem>
-                  )}
-                </OrgPermissionCan>
+                      {(isAllowed: boolean) => (
+                        <DropdownMenuItem
+                          isDisabled={!isAllowed}
+                          icon={<FontAwesomeIcon icon={faTrash} />}
+                          onClick={() => onDelete(appConnection)}
+                        >
+                          Delete Connection
+                        </DropdownMenuItem>
+                      )}
+                    </VariablePermissionCan>
+                  </>
+                )}
               </DropdownMenuContent>
             </DropdownMenu>
           </Tooltip>

frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionsTable.tsx

@@ -2,16 +2,21 @@ import { useMemo, useState } from "react";
 import {
   faArrowDown,
   faArrowUp,
+  faArrowUpRightFromSquare,
+  faBookOpen,
   faCheckCircle,
   faFilter,
   faMagnifyingGlass,
   faPlug,
+  faPlus,
   faSearch
 } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { twMerge } from "tailwind-merge";
 
+import { VariablePermissionCan } from "@app/components/permissions";
 import {
+  Button,
   DropdownMenu,
   DropdownMenuContent,
   DropdownMenuItem,
@@ -29,6 +34,9 @@ import {
   THead,
   Tr
 } from "@app/components/v2";
+import { OrgPermissionSubjects, ProjectPermissionSub } from "@app/context";
+import { OrgPermissionAppConnectionActions } from "@app/context/OrgPermissionContext/types";
+import { ProjectPermissionAppConnectionActions } from "@app/context/ProjectPermissionContext/types";
 import { APP_CONNECTION_MAP, getAppConnectionMethodDetails } from "@app/helpers/appConnections";
 import {
   getUserTablePreference,
@@ -39,7 +47,9 @@ import { usePagination, usePopUp, useResetPageHelper } from "@app/hooks";
 import { TAppConnection, useListAppConnections } from "@app/hooks/api/appConnections";
 import { AppConnection } from "@app/hooks/api/appConnections/enums";
 import { OrderByDirection } from "@app/hooks/api/generic/types";
+import { ProjectType } from "@app/hooks/api/projects/types";
 
+import { AddAppConnectionModal } from "./AddAppConnectionModal";
 import { AppConnectionRow } from "./AppConnectionRow";
 import { DeleteAppConnectionModal } from "./DeleteAppConnectionModal";
 import { EditAppConnectionCredentialsModal } from "./EditAppConnectionCredentialsModal";
@@ -48,22 +58,45 @@ import { EditAppConnectionDetailsModal } from "./EditAppConnectionDetailsModal";
 enum AppConnectionsOrderBy {
   App = "app",
   Name = "name",
-  Method = "method"
+  Method = "method",
+  ManagedBy = "managed-by"
 }
 
 type AppConnectionFilters = {
   apps: AppConnection[];
 };
 
-export const AppConnectionsTable = () => {
-  const { isPending, data: appConnections = [] } = useListAppConnections();
+enum View {
+  All = "all",
+  Scope = "scope"
+}
+
+const APP_CONNECTION_VIEW_STORAGE_KEY = "app-connection-view";
+
+type Props = {
+  projectId?: string;
+  projectType?: ProjectType;
+};
+
+export const AppConnectionsTable = ({ projectId, projectType }: Props) => {
+  const isProjectView = Boolean(projectId);
+  const { isPending, data: appConnections = [] } = useListAppConnections(projectId);
 
   const { popUp, handlePopUpOpen, handlePopUpToggle } = usePopUp([
+    "addConnection",
     "deleteConnection",
     "editCredentials",
     "editDetails"
   ] as const);
 
+  const [view, setView] = useState<View>(() => {
+    const storedView = localStorage.getItem(APP_CONNECTION_VIEW_STORAGE_KEY) as View | null;
+
+    if (storedView && Object.values(View).includes(storedView)) return storedView;
+
+    return View.Scope;
+  });
+
   const [filters, setFilters] = useState<AppConnectionFilters>({
     apps: []
   });
@@ -96,6 +129,10 @@ export const AppConnectionsTable = () => {
         .filter((appConnection) => {
           const { app, method, name } = appConnection;
 
+          if (view === View.Scope && !isProjectView && appConnection.projectId) {
+            return false;
+          }
+
           if (filters.apps.length && !filters.apps.includes(app)) return false;
 
           const searchValue = search.trim().toLowerCase();
@@ -121,6 +158,13 @@ export const AppConnectionsTable = () => {
                 .localeCompare(
                   getAppConnectionMethodDetails(connectionTwo.method).name.toLowerCase()
                 );
+            case AppConnectionsOrderBy.ManagedBy:
+              if (!connectionOne.project) return 1;
+              if (!connectionTwo.project) return -1;
+
+              return connectionOne.project.name
+                .toLowerCase()
+                .localeCompare(connectionTwo.project.name.toLowerCase());
             case AppConnectionsOrderBy.App:
             default:
               return APP_CONNECTION_MAP[connectionOne.app].name
@@ -128,7 +172,7 @@ export const AppConnectionsTable = () => {
                 .localeCompare(APP_CONNECTION_MAP[connectionTwo.app].name.toLowerCase());
           }
         }),
-    [appConnections, orderDirection, search, orderBy, filters]
+    [appConnections, orderDirection, search, orderBy, filters, view]
   );
 
   useResetPageHelper({
@@ -165,8 +209,87 @@ export const AppConnectionsTable = () => {
     handlePopUpOpen("editDetails", appConnection);
 
   return (
-    <div>
+    <div className="rounded-lg border border-mineshaft-600 bg-mineshaft-900 p-4">
+      <div className="mb-4 flex items-center justify-between">
+        <div>
+          <div className="flex items-center gap-1">
+            <p className="text-xl font-semibold text-mineshaft-100">App Connections</p>
+            <a
+              href="https://infisical.com/docs/integrations/app-connections/overview"
+              target="_blank"
+              rel="noopener noreferrer"
+            >
+              <div className="ml-1 mt-[0.12rem] inline-block rounded-md bg-yellow/20 px-1.5 text-sm text-yellow opacity-80 hover:opacity-100">
+                <FontAwesomeIcon icon={faBookOpen} className="mr-1.5" />
+                <span>Docs</span>
+                <FontAwesomeIcon
+                  icon={faArrowUpRightFromSquare}
+                  className="mb-[0.07rem] ml-1.5 text-[10px]"
+                />
+              </div>
+            </a>
+          </div>
+          <p className="text-sm text-bunker-300">
+            Create and configure connections with third-party apps for re-use across your project
+            {isProjectView ? "" : "s"}.
+          </p>
+        </div>
+        <VariablePermissionCan
+          type={isProjectView ? "project" : "org"}
+          I={
+            isProjectView
+              ? ProjectPermissionAppConnectionActions.Create
+              : OrgPermissionAppConnectionActions.Create
+          }
+          a={
+            isProjectView
+              ? ProjectPermissionSub.AppConnections
+              : OrgPermissionSubjects.AppConnections
+          }
+        >
+          {(isAllowed) => (
+            <Button
+              colorSchema="secondary"
+              leftIcon={<FontAwesomeIcon icon={faPlus} />}
+              onClick={() => handlePopUpOpen("addConnection")}
+              isDisabled={!isAllowed}
+            >
+              Add Connection
+            </Button>
+          )}
+        </VariablePermissionCan>
+      </div>
       <div className="flex gap-2">
+        {!isProjectView && (
+          <div className="flex gap-x-0.5 rounded-md border border-mineshaft-600 bg-mineshaft-800 p-1">
+            <Button
+              variant="outline_bg"
+              onClick={() => {
+                setView(View.Scope);
+                localStorage.setItem(APP_CONNECTION_VIEW_STORAGE_KEY, View.Scope);
+              }}
+              size="xs"
+              className={`${
+                view === View.Scope ? "bg-mineshaft-500" : "bg-transparent"
+              } min-w-[5rem] rounded border-none hover:bg-mineshaft-600`}
+            >
+              Organization
+            </Button>
+            <Button
+              variant="outline_bg"
+              onClick={() => {
+                setView(View.All);
+                localStorage.setItem(APP_CONNECTION_VIEW_STORAGE_KEY, View.All);
+              }}
+              size="xs"
+              className={`${
+                view === View.All ? "bg-mineshaft-500" : "bg-transparent"
+              } min-w-[5rem] rounded border-none hover:bg-mineshaft-600`}
+            >
+              All
+            </Button>
+          </div>
+        )}
         <Input
           value={search}
           onChange={(e) => setSearch(e.target.value)}
@@ -188,38 +311,46 @@ export const AppConnectionsTable = () => {
               <FontAwesomeIcon icon={faFilter} />
             </IconButton>
           </DropdownMenuTrigger>
-          <DropdownMenuContent className="thin-scrollbar max-h-[70vh] overflow-y-auto" align="end">
+          <DropdownMenuContent
+            sideOffset={2}
+            className="thin-scrollbar max-h-[70vh] overflow-y-auto"
+            align="end"
+          >
             <DropdownMenuLabel>Filter by Apps</DropdownMenuLabel>
             {appConnections.length ? (
-              [...new Set(appConnections.map(({ app }) => app))].map((app) => (
-                <DropdownMenuItem
-                  onClick={(e) => {
-                    e.preventDefault();
-                    setFilters((prev) => ({
-                      ...prev,
-                      apps: prev.apps.includes(app)
-                        ? prev.apps.filter((a) => a !== app)
-                        : [...prev.apps, app]
-                    }));
-                  }}
-                  key={app}
-                  icon={
-                    filters.apps.includes(app) && (
-                      <FontAwesomeIcon className="text-primary" icon={faCheckCircle} />
-                    )
-                  }
-                  iconPos="right"
-                >
-                  <div className="flex items-center gap-2">
-                    <img
-                      alt={`${APP_CONNECTION_MAP[app].name} integration`}
-                      src={`/images/integrations/${APP_CONNECTION_MAP[app].image}`}
-                      className="h-4 w-4"
-                    />
-                    <span>{APP_CONNECTION_MAP[app].name}</span>
-                  </div>
-                </DropdownMenuItem>
-              ))
+              [...new Set(appConnections.map(({ app }) => app))]
+                .sort((a, b) => {
+                  return a.toLowerCase().localeCompare(b.toLowerCase());
+                })
+                .map((app) => (
+                  <DropdownMenuItem
+                    onClick={(e) => {
+                      e.preventDefault();
+                      setFilters((prev) => ({
+                        ...prev,
+                        apps: prev.apps.includes(app)
+                          ? prev.apps.filter((a) => a !== app)
+                          : [...prev.apps, app]
+                      }));
+                    }}
+                    key={app}
+                    icon={
+                      filters.apps.includes(app) && (
+                        <FontAwesomeIcon className="text-primary" icon={faCheckCircle} />
+                      )
+                    }
+                    iconPos="right"
+                  >
+                    <div className="flex items-center gap-2">
+                      <img
+                        alt={`${APP_CONNECTION_MAP[app].name} integration`}
+                        src={`/images/integrations/${APP_CONNECTION_MAP[app].image}`}
+                        className="h-4 w-4"
+                      />
+                      <span>{APP_CONNECTION_MAP[app].name}</span>
+                    </div>
+                  </DropdownMenuItem>
+                ))
             ) : (
               <DropdownMenuItem isDisabled>No Connections Configured</DropdownMenuItem>
             )}
@@ -269,7 +400,21 @@ export const AppConnectionsTable = () => {
                   </IconButton>
                 </div>
               </Th>
-
+              {!isProjectView && (
+                <Th>
+                  <div className="flex items-center">
+                    Managed By
+                    <IconButton
+                      variant="plain"
+                      className={getClassName(AppConnectionsOrderBy.ManagedBy)}
+                      ariaLabel="sort"
+                      onClick={() => handleSort(AppConnectionsOrderBy.ManagedBy)}
+                    >
+                      <FontAwesomeIcon icon={getColSortIcon(AppConnectionsOrderBy.ManagedBy)} />
+                    </IconButton>
+                  </div>
+                </Th>
+              )}
               <Th className="w-5" />
             </Tr>
           </THead>
@@ -284,6 +429,7 @@ export const AppConnectionsTable = () => {
                 onDelete={handleDelete}
                 onEditCredentials={handleEditCredentials}
                 onEditDetails={handleEditDetails}
+                isProjectView={isProjectView}
               />
             ))}
           </TBody>
@@ -323,6 +469,12 @@ export const AppConnectionsTable = () => {
         onOpenChange={(isOpen) => handlePopUpToggle("editDetails", isOpen)}
         appConnection={popUp.editDetails.data}
       />
+      <AddAppConnectionModal
+        isOpen={popUp.addConnection.isOpen}
+        onOpenChange={(isOpen) => handlePopUpToggle("addConnection", isOpen)}
+        projectId={projectId}
+        projectType={projectType}
+      />
     </div>
   );
 };

frontend/src/pages/organization/AppConnections/OauthCallbackPage/OauthCallbackPage.tsx

@@ -12,73 +12,15 @@ import {
   AzureKeyVaultConnectionMethod,
   GitHubConnectionMethod,
   GitLabConnectionMethod,
-  TAzureAppConfigurationConnection,
-  TAzureClientSecretsConnection,
-  TAzureDevOpsConnection,
-  TAzureKeyVaultConnection,
-  TGitHubConnection,
-  TGitHubRadarConnection,
-  TGitLabConnection,
+  HerokuConnectionMethod,
+  TAppConnection,
   useCreateAppConnection,
   useUpdateAppConnection
 } from "@app/hooks/api/appConnections";
 import { AppConnection } from "@app/hooks/api/appConnections/enums";
+import { IntegrationsListPageTabs } from "@app/types/integrations";
 
-type BaseFormData = {
-  returnUrl?: string;
-  connectionId?: string;
-  isUpdate?: boolean;
-};
-
-type GithubFormData = BaseFormData &
-  Pick<TGitHubConnection, "name" | "method" | "description" | "gatewayId" | "credentials">;
-
-type GithubRadarFormData = BaseFormData &
-  Pick<TGitHubRadarConnection, "name" | "method" | "description">;
-
-type GitLabFormData = BaseFormData &
-  Pick<TGitLabConnection, "name" | "method" | "description" | "credentials">;
-
-type AzureKeyVaultFormData = BaseFormData &
-  Pick<TAzureKeyVaultConnection, "name" | "method" | "description"> &
-  Pick<TAzureKeyVaultConnection["credentials"], "tenantId">;
-
-type AzureAppConfigurationFormData = BaseFormData &
-  Pick<TAzureAppConfigurationConnection, "name" | "method" | "description"> &
-  Pick<TAzureAppConfigurationConnection["credentials"], "tenantId">;
-
-type AzureClientSecretsFormData = BaseFormData &
-  Pick<TAzureClientSecretsConnection, "name" | "method" | "description"> &
-  Pick<TAzureClientSecretsConnection["credentials"], "tenantId">;
-
-type OAuthCredentials = Extract<
-  TAzureDevOpsConnection,
-  { method: AzureDevOpsConnectionMethod.OAuth }
->["credentials"];
-type AccessTokenCredentials = Extract<
-  TAzureDevOpsConnection,
-  { method: AzureDevOpsConnectionMethod.AccessToken }
->["credentials"];
-
-type AzureDevOpsFormData = BaseFormData &
-  Pick<TAzureDevOpsConnection, "name" | "method" | "description"> &
-  (Pick<OAuthCredentials, "tenantId" | "orgName"> | Pick<AccessTokenCredentials, "orgName">);
-
-type FormDataMap = {
-  [AppConnection.GitHub]: GithubFormData & { app: AppConnection.GitHub };
-  [AppConnection.GitHubRadar]: GithubRadarFormData & { app: AppConnection.GitHubRadar };
-  [AppConnection.GitLab]: GitLabFormData & { app: AppConnection.GitLab };
-  [AppConnection.AzureKeyVault]: AzureKeyVaultFormData & { app: AppConnection.AzureKeyVault };
-  [AppConnection.AzureAppConfiguration]: AzureAppConfigurationFormData & {
-    app: AppConnection.AzureAppConfiguration;
-  };
-  [AppConnection.AzureClientSecrets]: AzureClientSecretsFormData & {
-    app: AppConnection.AzureClientSecrets;
-  };
-  [AppConnection.AzureDevOps]: AzureDevOpsFormData & {
-    app: AppConnection.AzureDevOps;
-  };
-};
+import { FormDataMap } from "./OauthCallbackPage.types";
 
 const formDataStorageFieldMap: Partial<Record<AppConnection, string>> = {
   [AppConnection.GitHub]: "githubConnectionFormData",
@@ -87,7 +29,8 @@ const formDataStorageFieldMap: Partial<Record<AppConnection, string>> = {
   [AppConnection.AzureKeyVault]: "azureKeyVaultConnectionFormData",
   [AppConnection.AzureAppConfiguration]: "azureAppConfigurationConnectionFormData",
   [AppConnection.AzureClientSecrets]: "azureClientSecretsConnectionFormData",
-  [AppConnection.AzureDevOps]: "azureDevOpsConnectionFormData"
+  [AppConnection.AzureDevOps]: "azureDevOpsConnectionFormData",
+  [AppConnection.Heroku]: "herokuConnectionFormData"
 };
 
 export const OAuthCallbackPage = () => {
@@ -142,17 +85,20 @@ export const OAuthCallbackPage = () => {
     }
   };
 
-  const handleGitlab = useCallback(async () => {
+  const handleGitLab = useCallback(async () => {
     const formData = getFormData(AppConnection.GitLab);
     if (formData === null) return null;
 
     clearState(AppConnection.GitLab);
 
-    const { connectionId, name, description, returnUrl, isUpdate, credentials } = formData;
+    const { connectionId, name, description, returnUrl, isUpdate, projectId, credentials } =
+      formData;
+
+    let connection: TAppConnection;
 
     try {
       if (isUpdate && connectionId) {
-        await updateAppConnection.mutateAsync({
+        connection = await updateAppConnection.mutateAsync({
           app: AppConnection.GitLab,
           connectionId,
           credentials: {
@@ -161,10 +107,11 @@ export const OAuthCallbackPage = () => {
           }
         });
       } else {
-        await createAppConnection.mutateAsync({
+        connection = await createAppConnection.mutateAsync({
           app: AppConnection.GitLab,
           name,
           description,
+          projectId,
           method: GitLabConnectionMethod.OAuth,
           credentials: {
             code: code as string,
@@ -173,14 +120,12 @@ export const OAuthCallbackPage = () => {
         });
       }
 
-      navigate({
-        to: returnUrl ?? "/organization/app-connections"
-      });
-
       return {
         connectionId,
         returnUrl,
-        appConnectionName: formData.app
+        appConnectionName: formData.app,
+        projectId,
+        connection
       };
     } catch (err: any) {
       createNotification({
@@ -189,7 +134,10 @@ export const OAuthCallbackPage = () => {
         type: "error"
       });
       navigate({
-        to: returnUrl ?? "/organization/app-connections"
+        to: returnUrl,
+        params: {
+          projectId
+        }
       });
       return null;
     }
@@ -201,11 +149,13 @@ export const OAuthCallbackPage = () => {
 
     clearState(AppConnection.AzureKeyVault);
 
-    const { connectionId, name, description, returnUrl } = formData;
+    const { connectionId, name, description, returnUrl, projectId } = formData;
+
+    let connection: TAppConnection;
 
     try {
       if (connectionId) {
-        await updateAppConnection.mutateAsync({
+        connection = await updateAppConnection.mutateAsync({
           app: AppConnection.AzureKeyVault,
           connectionId,
           credentials: {
@@ -214,10 +164,11 @@ export const OAuthCallbackPage = () => {
           }
         });
       } else {
-        await createAppConnection.mutateAsync({
+        connection = await createAppConnection.mutateAsync({
           app: AppConnection.AzureKeyVault,
           name,
           description,
+          projectId,
           method: AzureKeyVaultConnectionMethod.OAuth,
           credentials: {
             tenantId: formData.tenantId,
@@ -232,14 +183,20 @@ export const OAuthCallbackPage = () => {
         type: "error"
       });
       navigate({
-        to: returnUrl ?? "/organization/app-connections"
+        to: returnUrl,
+        params: {
+          projectId
+        }
       });
+      return null;
     }
 
     return {
       connectionId,
       returnUrl,
-      appConnectionName: formData.app
+      appConnectionName: formData.app,
+      projectId,
+      connection
     };
   }, []);
 
@@ -249,11 +206,13 @@ export const OAuthCallbackPage = () => {
 
     clearState(AppConnection.AzureAppConfiguration);
 
-    const { connectionId, name, description, returnUrl } = formData;
+    const { connectionId, name, description, returnUrl, projectId } = formData;
+
+    let connection: TAppConnection;
 
     try {
       if (connectionId) {
-        await updateAppConnection.mutateAsync({
+        connection = await updateAppConnection.mutateAsync({
           app: AppConnection.AzureAppConfiguration,
           connectionId,
           credentials: {
@@ -262,10 +221,11 @@ export const OAuthCallbackPage = () => {
           }
         });
       } else {
-        await createAppConnection.mutateAsync({
+        connection = await createAppConnection.mutateAsync({
           app: AppConnection.AzureAppConfiguration,
           name,
           description,
+          projectId,
           method: AzureAppConfigurationConnectionMethod.OAuth,
           credentials: {
             code: code as string,
@@ -280,14 +240,20 @@ export const OAuthCallbackPage = () => {
         type: "error"
       });
       navigate({
-        to: returnUrl ?? "/organization/app-connections"
+        to: returnUrl,
+        params: {
+          projectId
+        }
       });
+      return null;
     }
 
     return {
       connectionId,
       returnUrl,
-      appConnectionName: formData.app
+      appConnectionName: formData.app,
+      projectId,
+      connection
     };
   }, []);
 
@@ -297,11 +263,13 @@ export const OAuthCallbackPage = () => {
 
     clearState(AppConnection.AzureClientSecrets);
 
-    const { connectionId, name, description, returnUrl } = formData;
+    const { connectionId, name, description, returnUrl, projectId } = formData;
+
+    let connection: TAppConnection;
 
     try {
       if (connectionId) {
-        await updateAppConnection.mutateAsync({
+        connection = await updateAppConnection.mutateAsync({
           app: AppConnection.AzureClientSecrets,
           connectionId,
           credentials: {
@@ -310,11 +278,12 @@ export const OAuthCallbackPage = () => {
           }
         });
       } else {
-        await createAppConnection.mutateAsync({
+        connection = await createAppConnection.mutateAsync({
           app: AppConnection.AzureClientSecrets,
           name,
           description,
           method: AzureClientSecretsConnectionMethod.OAuth,
+          projectId,
           credentials: {
             code: code as string,
             tenantId: formData.tenantId
@@ -328,14 +297,20 @@ export const OAuthCallbackPage = () => {
         type: "error"
       });
       navigate({
-        to: returnUrl ?? "/organization/app-connections"
+        to: returnUrl,
+        params: {
+          projectId
+        }
       });
+      return null;
     }
 
     return {
       connectionId,
       returnUrl,
-      appConnectionName: formData.app
+      appConnectionName: formData.app,
+      projectId,
+      connection
     };
   }, []);
 
@@ -345,7 +320,9 @@ export const OAuthCallbackPage = () => {
 
     clearState(AppConnection.AzureDevOps);
 
-    const { connectionId, name, description, returnUrl } = formData;
+    const { connectionId, name, description, returnUrl, projectId } = formData;
+
+    let connection: TAppConnection;
 
     try {
       if (!("tenantId" in formData)) {
@@ -353,7 +330,7 @@ export const OAuthCallbackPage = () => {
       }
 
       if (connectionId) {
-        await updateAppConnection.mutateAsync({
+        connection = await updateAppConnection.mutateAsync({
           app: AppConnection.AzureDevOps,
           connectionId,
           credentials: {
@@ -363,11 +340,12 @@ export const OAuthCallbackPage = () => {
           }
         });
       } else {
-        await createAppConnection.mutateAsync({
+        connection = await createAppConnection.mutateAsync({
           app: AppConnection.AzureDevOps,
           name,
           description,
           method: AzureDevOpsConnectionMethod.OAuth,
+          projectId,
           credentials: {
             code: code as string,
             tenantId: formData.tenantId as string,
@@ -382,28 +360,37 @@ export const OAuthCallbackPage = () => {
         type: "error"
       });
       navigate({
-        to: returnUrl ?? "/organization/app-connections"
+        to: returnUrl,
+        params: {
+          projectId
+        }
       });
+      return null;
     }
 
     return {
       connectionId,
       returnUrl,
-      appConnectionName: formData.app
+      appConnectionName: formData.app,
+      projectId,
+      connection
     };
   }, []);
 
-  const handleGithub = useCallback(async () => {
+  const handleGitHub = useCallback(async () => {
     const formData = getFormData(AppConnection.GitHub);
     if (formData === null) return null;
 
     clearState(AppConnection.GitHub);
 
-    const { connectionId, name, description, returnUrl, gatewayId, credentials } = formData;
+    const { connectionId, name, description, returnUrl, gatewayId, credentials, projectId } =
+      formData;
+
+    let connection: TAppConnection;
 
     try {
       if (connectionId) {
-        await updateAppConnection.mutateAsync({
+        connection = await updateAppConnection.mutateAsync({
           app: AppConnection.GitHub,
           ...(installationId
             ? {
@@ -427,10 +414,11 @@ export const OAuthCallbackPage = () => {
               })
         });
       } else {
-        await createAppConnection.mutateAsync({
+        connection = await createAppConnection.mutateAsync({
           app: AppConnection.GitHub,
           name,
           description,
+          projectId,
           ...(installationId
             ? {
                 method: GitHubConnectionMethod.App,
@@ -460,28 +448,36 @@ export const OAuthCallbackPage = () => {
         type: "error"
       });
       navigate({
-        to: returnUrl ?? "/organization/app-connections"
+        to: returnUrl,
+        params: {
+          projectId
+        }
       });
+      return null;
     }
 
     return {
       connectionId,
       returnUrl,
-      appConnectionName: formData.app
+      appConnectionName: formData.app,
+      projectId,
+      connection
     };
   }, []);
 
-  const handleGithubRadar = useCallback(async () => {
+  const handleGitHubRadar = useCallback(async () => {
     const formData = getFormData(AppConnection.GitHubRadar);
     if (formData === null) return null;
 
     clearState(AppConnection.GitHubRadar);
 
-    const { connectionId, name, description, returnUrl } = formData;
+    const { connectionId, name, description, returnUrl, projectId } = formData;
+
+    let connection: TAppConnection;
 
     try {
       if (connectionId) {
-        await updateAppConnection.mutateAsync({
+        connection = await updateAppConnection.mutateAsync({
           app: AppConnection.GitHubRadar,
           connectionId,
           credentials: {
@@ -490,11 +486,12 @@ export const OAuthCallbackPage = () => {
           }
         });
       } else {
-        await createAppConnection.mutateAsync({
+        connection = await createAppConnection.mutateAsync({
           app: AppConnection.GitHubRadar,
           name,
           description,
           method: GitHubConnectionMethod.App,
+          projectId,
           credentials: {
             code: code as string,
             installationId: installationId as string
@@ -508,14 +505,75 @@ export const OAuthCallbackPage = () => {
         type: "error"
       });
       navigate({
-        to: returnUrl ?? "/organization/app-connections"
+        to: returnUrl,
+        params: {
+          projectId
+        }
       });
+      return null;
     }
 
     return {
       connectionId,
       returnUrl,
-      appConnectionName: formData.app
+      appConnectionName: formData.app,
+      projectId,
+      connection
+    };
+  }, []);
+
+  const handleHeroku = useCallback(async () => {
+    const formData = getFormData(AppConnection.Heroku);
+    if (formData === null) return null;
+
+    clearState(AppConnection.Heroku);
+
+    const { connectionId, name, description, returnUrl, projectId } = formData;
+
+    let connection: TAppConnection;
+
+    try {
+      if (connectionId) {
+        connection = await updateAppConnection.mutateAsync({
+          app: AppConnection.Heroku,
+          connectionId,
+          credentials: {
+            code: code as string
+          }
+        });
+      } else {
+        connection = await createAppConnection.mutateAsync({
+          app: AppConnection.Heroku,
+          name,
+          description,
+          method: HerokuConnectionMethod.OAuth,
+          projectId,
+          credentials: {
+            code: code as string
+          }
+        });
+      }
+    } catch (e: any) {
+      createNotification({
+        title: `Failed to ${connectionId ? "update" : "add"} Heroku Connection`,
+        text: e.message,
+        type: "error"
+      });
+      navigate({
+        to: returnUrl,
+        params: {
+          projectId
+        }
+      });
+      return null;
+    }
+
+    return {
+      connectionId,
+      returnUrl,
+      appConnectionName: formData.app,
+      projectId,
+      connection
     };
   }, []);
 
@@ -530,15 +588,20 @@ export const OAuthCallbackPage = () => {
     if (!isReady) return;
 
     (async () => {
-      let data: { connectionId?: string; returnUrl?: string; appConnectionName?: string } | null =
-        null;
+      let data: {
+        returnUrl: string;
+        appConnectionName: string;
+        connectionId?: string;
+        projectId?: string;
+        connection: TAppConnection;
+      } | null = null;
 
       if (appConnection === AppConnection.GitHub) {
-        data = await handleGithub();
+        data = await handleGitHub();
       } else if (appConnection === AppConnection.GitHubRadar) {
-        data = await handleGithubRadar();
+        data = await handleGitHubRadar();
       } else if (appConnection === AppConnection.GitLab) {
-        data = await handleGitlab();
+        data = await handleGitLab();
       } else if (appConnection === AppConnection.AzureKeyVault) {
         data = await handleAzureKeyVault();
       } else if (appConnection === AppConnection.AzureAppConfiguration) {
@@ -547,6 +610,8 @@ export const OAuthCallbackPage = () => {
         data = await handleAzureClientSecrets();
       } else if (appConnection === AppConnection.AzureDevOps) {
         data = await handleAzureDevOps();
+      } else if (appConnection === AppConnection.Heroku) {
+        data = await handleHeroku();
       }
 
       if (data) {
@@ -554,16 +619,26 @@ export const OAuthCallbackPage = () => {
           text: `Successfully ${data.connectionId ? "updated" : "added"} ${data.appConnectionName ? APP_CONNECTION_MAP[data.appConnectionName as AppConnection].name : ""} Connection`,
           type: "success"
         });
-      } else {
-        createNotification({
-          text: "Failed to add connection",
-          type: "error"
+
+        await navigate({
+          to: data.returnUrl,
+          params: {
+            projectId: data.projectId ?? undefined
+          },
+          // scott: if it's not an app connection page we need to pass connection details as it's an inline creation
+          search: data.returnUrl.includes("app-connections")
+            ? undefined
+            : {
+                connectionId: data.connection.id,
+                connectionName: data.connection.name,
+                ...(data.returnUrl.includes("integrations")
+                  ? {
+                      selectedTab: IntegrationsListPageTabs.SecretSyncs
+                    }
+                  : {})
+              }
         });
       }
-
-      await navigate({
-        to: data?.returnUrl ?? "/organization/app-connections"
-      });
     })();
   }, [isReady]);
 

frontend/src/pages/organization/AppConnections/OauthCallbackPage/OauthCallbackPage.types.ts

@@ -0,0 +1,75 @@
+import {
+  AzureDevOpsConnectionMethod,
+  TAzureAppConfigurationConnection,
+  TAzureClientSecretsConnection,
+  TAzureDevOpsConnection,
+  TAzureKeyVaultConnection,
+  TGitHubConnection,
+  TGitHubRadarConnection,
+  TGitLabConnection,
+  THerokuConnection
+} from "@app/hooks/api/appConnections";
+import { AppConnection } from "@app/hooks/api/appConnections/enums";
+
+type BaseFormData = {
+  returnUrl: string;
+  connectionId?: string;
+  isUpdate?: boolean;
+  projectId: string;
+};
+
+export type GitHubFormData = BaseFormData &
+  Pick<TGitHubConnection, "name" | "method" | "description" | "gatewayId" | "credentials">;
+
+export type GitHubRadarFormData = BaseFormData &
+  Pick<TGitHubRadarConnection, "name" | "method" | "description">;
+
+export type GitLabFormData = BaseFormData &
+  Pick<TGitLabConnection, "name" | "method" | "description" | "credentials">;
+
+export type AzureKeyVaultFormData = BaseFormData &
+  Pick<TAzureKeyVaultConnection, "name" | "method" | "description"> &
+  Pick<TAzureKeyVaultConnection["credentials"], "tenantId">;
+
+export type AzureAppConfigurationFormData = BaseFormData &
+  Pick<TAzureAppConfigurationConnection, "name" | "method" | "description"> &
+  Pick<TAzureAppConfigurationConnection["credentials"], "tenantId">;
+
+export type AzureClientSecretsFormData = BaseFormData &
+  Pick<TAzureClientSecretsConnection, "name" | "method" | "description"> &
+  Pick<TAzureClientSecretsConnection["credentials"], "tenantId">;
+
+type OAuthCredentials = Extract<
+  TAzureDevOpsConnection,
+  { method: AzureDevOpsConnectionMethod.OAuth }
+>["credentials"];
+type AccessTokenCredentials = Extract<
+  TAzureDevOpsConnection,
+  { method: AzureDevOpsConnectionMethod.AccessToken }
+>["credentials"];
+
+export type AzureDevOpsFormData = BaseFormData &
+  Pick<TAzureDevOpsConnection, "name" | "method" | "description"> &
+  (Pick<OAuthCredentials, "tenantId" | "orgName"> | Pick<AccessTokenCredentials, "orgName">);
+
+export type HerokuFormData = BaseFormData &
+  Pick<THerokuConnection, "name" | "method" | "description">;
+
+export type FormDataMap = {
+  [AppConnection.GitHub]: GitHubFormData & { app: AppConnection.GitHub };
+  [AppConnection.GitHubRadar]: GitHubRadarFormData & { app: AppConnection.GitHubRadar };
+  [AppConnection.GitLab]: GitLabFormData & { app: AppConnection.GitLab };
+  [AppConnection.AzureKeyVault]: AzureKeyVaultFormData & { app: AppConnection.AzureKeyVault };
+  [AppConnection.AzureAppConfiguration]: AzureAppConfigurationFormData & {
+    app: AppConnection.AzureAppConfiguration;
+  };
+  [AppConnection.AzureClientSecrets]: AzureClientSecretsFormData & {
+    app: AppConnection.AzureClientSecrets;
+  };
+  [AppConnection.AzureDevOps]: AzureDevOpsFormData & {
+    app: AppConnection.AzureDevOps;
+  };
+  [AppConnection.Heroku]: HerokuFormData & {
+    app: AppConnection.Heroku;
+  };
+};

frontend/src/pages/organization/AuditLogsPage/components/LogsFilter.tsx

@@ -21,7 +21,7 @@ import {
   SelectItem
 } from "@app/components/v2";
 import { useOrganization } from "@app/context";
-import { useGetUserWorkspaces } from "@app/hooks/api";
+import { useGetUserProjects } from "@app/hooks/api";
 import {
   eventToNameMap,
   secretEvents,
@@ -29,7 +29,7 @@ import {
 } from "@app/hooks/api/auditLogs/constants";
 import { EventType } from "@app/hooks/api/auditLogs/enums";
 import { UserAgentType } from "@app/hooks/api/auth/types";
-import { Workspace } from "@app/hooks/api/workspace/types";
+import { Project } from "@app/hooks/api/projects/types";
 
 import { LogFilterItem } from "./LogFilterItem";
 import { auditLogFilterFormSchema, Presets, TAuditLogFilterFormData } from "./types";
@@ -44,7 +44,7 @@ type Props = {
   presets?: Presets;
   setFilter: (data: TAuditLogFilterFormData) => void;
   filter: TAuditLogFilterFormData;
-  project?: Workspace;
+  project?: Project;
 };
 
 const getActiveFilterCount = (filter: TAuditLogFilterFormData) => {
@@ -72,7 +72,7 @@ const getActiveFilterCount = (filter: TAuditLogFilterFormData) => {
 };
 
 export const LogsFilter = ({ presets, setFilter, filter, project }: Props) => {
-  const { data: workspaces = [] } = useGetUserWorkspaces();
+  const { data: workspaces = [] } = useGetUserProjects();
   const { currentOrg } = useOrganization();
 
   const workspacesInOrg = workspaces.filter((ws) => ws.orgId === currentOrg?.id);

frontend/src/pages/organization/AuditLogsPage/components/LogsSection.tsx

@@ -13,7 +13,7 @@ import {
 } from "@app/context";
 import { Timezone } from "@app/helpers/datetime";
 import { withPermission, withProjectPermission } from "@app/hoc";
-import { Workspace } from "@app/hooks/api/workspace/types";
+import { Project } from "@app/hooks/api/projects/types";
 import { usePopUp } from "@app/hooks/usePopUp";
 
 import { LogsDateFilter } from "./LogsDateFilter";
@@ -31,7 +31,7 @@ type Props = {
   refetchInterval?: number;
   showFilters?: boolean;
   pageView?: boolean;
-  project?: Workspace;
+  project?: Project;
 };
 
 const LogsSectionComponent = ({

frontend/src/pages/organization/AuditLogsPage/components/types.tsx

@@ -1,7 +1,7 @@
 import { z } from "zod";
 
 import { ActorType, EventType, UserAgentType } from "@app/hooks/api/auditLogs/enums";
-import { ProjectType } from "@app/hooks/api/workspace/types";
+import { ProjectType } from "@app/hooks/api/projects/types";
 
 export enum AuditLogDateFilterType {
   Relative = "relative",

frontend/src/pages/organization/Gateways/GatewayListPage/GatewayListPage.tsx

@@ -1,267 +0,0 @@
-import { useState } from "react";
-import { Helmet } from "react-helmet";
-import {
-  faArrowUpRightFromSquare,
-  faBookOpen,
-  faCopy,
-  faEdit,
-  faEllipsisV,
-  faInfoCircle,
-  faMagnifyingGlass,
-  faPlug,
-  faSearch,
-  faTrash
-} from "@fortawesome/free-solid-svg-icons";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { useQuery } from "@tanstack/react-query";
-import { formatRelative } from "date-fns";
-
-import { createNotification } from "@app/components/notifications";
-import { OrgPermissionCan } from "@app/components/permissions";
-import {
-  DeleteActionModal,
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuTrigger,
-  EmptyState,
-  IconButton,
-  Input,
-  Modal,
-  ModalContent,
-  PageHeader,
-  Table,
-  TableContainer,
-  TableSkeleton,
-  TBody,
-  Td,
-  Th,
-  THead,
-  Tooltip,
-  Tr
-} from "@app/components/v2";
-import {
-  OrgGatewayPermissionActions,
-  OrgPermissionAppConnectionActions,
-  OrgPermissionSubjects
-} from "@app/context/OrgPermissionContext/types";
-import { withPermission } from "@app/hoc";
-import { usePopUp } from "@app/hooks";
-import { gatewaysQueryKeys, useDeleteGatewayById } from "@app/hooks/api/gateways";
-import { useDeleteGatewayV2ById } from "@app/hooks/api/gateways-v2";
-
-import { EditGatewayDetailsModal } from "./components/EditGatewayDetailsModal";
-
-export const GatewayListPage = withPermission(
-  () => {
-    const [search, setSearch] = useState("");
-    const { data: gateways, isPending: isGatewaysLoading } = useQuery(gatewaysQueryKeys.list());
-
-    const { popUp, handlePopUpOpen, handlePopUpToggle } = usePopUp([
-      "deleteGateway",
-      "editDetails"
-    ] as const);
-
-    const deleteGatewayById = useDeleteGatewayById();
-    const deleteGatewayV2ById = useDeleteGatewayV2ById();
-
-    const handleDeleteGateway = async () => {
-      const data = popUp.deleteGateway.data as { id: string; isV1: boolean };
-      if (data.isV1) {
-        await deleteGatewayById.mutateAsync(data.id);
-      } else {
-        await deleteGatewayV2ById.mutateAsync(data.id);
-      }
-
-      handlePopUpToggle("deleteGateway");
-      createNotification({
-        type: "success",
-        text: "Successfully deleted gateway"
-      });
-    };
-
-    const filteredGateway = gateways?.filter((el) =>
-      el.name.toLowerCase().includes(search.toLowerCase())
-    );
-
-    return (
-      <div className="bg-bunker-800">
-        <Helmet>
-          <title>Infisical | Gateways</title>
-          <meta property="og:image" content="/images/message.png" />
-        </Helmet>
-        <div className="flex w-full justify-center bg-bunker-800 text-white">
-          <div className="w-full max-w-7xl">
-            <PageHeader
-              className="w-full"
-              title={
-                <div className="flex w-full items-center">
-                  <span>Gateways</span>
-                  <a
-                    className="-mt-1.5"
-                    href="https://infisical.com/docs/documentation/platform/gateways/overview"
-                    target="_blank"
-                    rel="noopener noreferrer"
-                  >
-                    <div className="ml-2 inline-block rounded-md bg-yellow/20 px-1.5 text-sm font-normal text-yellow opacity-80 hover:opacity-100">
-                      <FontAwesomeIcon icon={faBookOpen} className="mr-1.5" />
-                      <span>Docs</span>
-                      <FontAwesomeIcon
-                        icon={faArrowUpRightFromSquare}
-                        className="mb-[0.07rem] ml-1.5 text-[10px]"
-                      />
-                    </div>
-                  </a>
-                </div>
-              }
-              description="Create and configure gateway to access private network resources from Infisical"
-            />
-            <div className="mb-6 rounded-lg border border-mineshaft-600 bg-mineshaft-900 p-4">
-              <div>
-                <div className="flex gap-2">
-                  <Input
-                    value={search}
-                    onChange={(e) => setSearch(e.target.value)}
-                    leftIcon={<FontAwesomeIcon icon={faMagnifyingGlass} />}
-                    placeholder="Search gateway..."
-                    className="flex-1"
-                  />
-                </div>
-                <TableContainer className="mt-4">
-                  <Table>
-                    <THead>
-                      <Tr>
-                        <Th className="w-1/3">Name</Th>
-                        <Th>Identity</Th>
-                        <Th>
-                          Health Check
-                          <Tooltip
-                            asChild={false}
-                            className="normal-case"
-                            content="The last known healthcheck. Triggers every 1 hour."
-                          >
-                            <FontAwesomeIcon icon={faInfoCircle} className="ml-2" />
-                          </Tooltip>
-                        </Th>
-                        <Th className="w-5" />
-                      </Tr>
-                    </THead>
-                    <TBody>
-                      {isGatewaysLoading && (
-                        <TableSkeleton innerKey="gateway-table" columns={4} key="gateway-table" />
-                      )}
-                      {filteredGateway?.map((el) => (
-                        <Tr key={el.id}>
-                          <Td>
-                            <div className="flex items-center gap-2">
-                              <span>{el.name}</span>
-                              <span className="rounded bg-mineshaft-700 px-1.5 py-0.5 text-xs text-mineshaft-400">
-                                Gateway v{el.isV1 ? "1" : "2"}
-                              </span>
-                            </div>
-                          </Td>
-                          <Td>{el.identity.name}</Td>
-                          <Td>
-                            {el.heartbeat
-                              ? formatRelative(new Date(el.heartbeat), new Date())
-                              : "-"}
-                          </Td>
-                          <Td className="w-5">
-                            <Tooltip className="max-w-sm text-center" content="Options">
-                              <DropdownMenu>
-                                <DropdownMenuTrigger asChild>
-                                  <IconButton
-                                    ariaLabel="Options"
-                                    colorSchema="secondary"
-                                    className="w-6"
-                                    variant="plain"
-                                  >
-                                    <FontAwesomeIcon icon={faEllipsisV} />
-                                  </IconButton>
-                                </DropdownMenuTrigger>
-                                <DropdownMenuContent align="end">
-                                  <DropdownMenuItem
-                                    icon={<FontAwesomeIcon icon={faCopy} />}
-                                    onClick={() => navigator.clipboard.writeText(el.id)}
-                                  >
-                                    Copy ID
-                                  </DropdownMenuItem>
-                                  {el.isV1 && (
-                                    <OrgPermissionCan
-                                      I={OrgGatewayPermissionActions.EditGateways}
-                                      a={OrgPermissionSubjects.Gateway}
-                                    >
-                                      {(isAllowed: boolean) => (
-                                        <DropdownMenuItem
-                                          isDisabled={!isAllowed}
-                                          icon={<FontAwesomeIcon icon={faEdit} />}
-                                          onClick={() => handlePopUpOpen("editDetails", el)}
-                                        >
-                                          Edit Details
-                                        </DropdownMenuItem>
-                                      )}
-                                    </OrgPermissionCan>
-                                  )}
-                                  <OrgPermissionCan
-                                    I={OrgPermissionAppConnectionActions.Delete}
-                                    a={OrgPermissionSubjects.AppConnections}
-                                  >
-                                    {(isAllowed: boolean) => (
-                                      <DropdownMenuItem
-                                        isDisabled={!isAllowed}
-                                        icon={<FontAwesomeIcon icon={faTrash} />}
-                                        className="text-red"
-                                        onClick={() => handlePopUpOpen("deleteGateway", el)}
-                                      >
-                                        Delete Gateway
-                                      </DropdownMenuItem>
-                                    )}
-                                  </OrgPermissionCan>
-                                </DropdownMenuContent>
-                              </DropdownMenu>
-                            </Tooltip>
-                          </Td>
-                        </Tr>
-                      ))}
-                    </TBody>
-                  </Table>
-                  <Modal
-                    isOpen={popUp.editDetails.isOpen}
-                    onOpenChange={(isOpen) => handlePopUpToggle("editDetails", isOpen)}
-                  >
-                    <ModalContent title="Edit Gateway">
-                      <EditGatewayDetailsModal
-                        gatewayDetails={popUp.editDetails.data}
-                        onClose={() => handlePopUpToggle("editDetails")}
-                      />
-                    </ModalContent>
-                  </Modal>
-                  {!isGatewaysLoading && !filteredGateway?.length && (
-                    <EmptyState
-                      title={
-                        gateways?.length
-                          ? "No Gateways match search..."
-                          : "No Gateways have been configured"
-                      }
-                      icon={gateways?.length ? faSearch : faPlug}
-                    />
-                  )}
-                  <DeleteActionModal
-                    isOpen={popUp.deleteGateway.isOpen}
-                    title={`Are you sure you want to delete gateway ${
-                      (popUp?.deleteGateway?.data as { name: string })?.name || ""
-                    }?`}
-                    onChange={(isOpen) => handlePopUpToggle("deleteGateway", isOpen)}
-                    deleteKey="confirm"
-                    onDeleteApproved={() => handleDeleteGateway()}
-                  />
-                </TableContainer>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    );
-  },
-  { action: OrgGatewayPermissionActions.ListGateways, subject: OrgPermissionSubjects.Gateway }
-);

frontend/src/pages/organization/Gateways/GatewayListPage/route.tsx

@@ -1,16 +0,0 @@
-import { createFileRoute } from "@tanstack/react-router";
-
-import { GatewayListPage } from "./GatewayListPage";
-
-export const Route = createFileRoute(
-  "/_authenticate/_inject-org-details/_org-layout/organization/gateways/"
-)({
-  component: GatewayListPage,
-  context: () => ({
-    breadcrumbs: [
-      {
-        label: "Gateways"
-      }
-    ]
-  })
-});

frontend/src/pages/organization/IdentityDetailsByIDPage/components/IdentityProjectsSection/IdentityAddToProjectModal.tsx

@@ -17,7 +17,7 @@ import {
   useAddIdentityToWorkspace,
   useGetIdentityProjectMemberships,
   useGetProjectRoles,
-  useGetUserWorkspaces,
+  useGetUserProjects,
   useGetWorkspaceById
 } from "@app/hooks/api";
 import { UsePopUpState } from "@app/hooks/usePopUp";
@@ -44,7 +44,7 @@ type Props = {
 
 const Content = ({ identityId, handlePopUpToggle }: Omit<Props, "popUp">) => {
   const { currentOrg } = useOrganization();
-  const { data: workspaces = [] } = useGetUserWorkspaces();
+  const { data: workspaces = [] } = useGetUserProjects();
   const { mutateAsync: addIdentityToWorkspace } = useAddIdentityToWorkspace();
 
   const {
@@ -77,7 +77,7 @@ const Content = ({ identityId, handlePopUpToggle }: Omit<Props, "popUp">) => {
   const onFormSubmit = async ({ project: selectedProject, role }: FormData) => {
     try {
       await addIdentityToWorkspace({
-        workspaceId: selectedProject.id,
+        projectId: selectedProject.id,
         identityId,
         role: role.slug || undefined
       });

frontend/src/pages/organization/IdentityDetailsByIDPage/components/IdentityProjectsSection/IdentityProjectRow.tsx

@@ -8,7 +8,7 @@ import { createNotification } from "@app/components/notifications";
 import { IconButton, Td, Tooltip, Tr } from "@app/components/v2";
 import { getProjectBaseURL } from "@app/helpers/project";
 import { formatProjectRoleName } from "@app/helpers/roles";
-import { useGetUserWorkspaces } from "@app/hooks/api";
+import { useGetUserProjects } from "@app/hooks/api";
 import { IdentityMembership } from "@app/hooks/api/identities/types";
 import { UsePopUpState } from "@app/hooks/usePopUp";
 
@@ -31,7 +31,7 @@ export const IdentityProjectRow = ({
   membership: { id, createdAt, identity, project, roles },
   handlePopUpOpen
 }: Props) => {
-  const { data: workspaces } = useGetUserWorkspaces();
+  const { data: workspaces } = useGetUserProjects();
   const navigate = useNavigate();
 
   const isAccessible = useMemo(() => {

frontend/src/pages/organization/IdentityDetailsByIDPage/components/IdentityProjectsSection/IdentityProjectsSection.tsx

@@ -25,7 +25,7 @@ export const IdentityProjectsSection = ({ identityId }: Props) => {
     try {
       await deleteMutateAsync({
         identityId: id,
-        workspaceId: projectId
+        projectId
       });
 
       createNotification({

frontend/src/pages/organization/IdentityDetailsByIDPage/components/ViewIdentityAuthModal/IdentityAuthLockoutFields.tsx

@@ -0,0 +1,81 @@
+import { useState } from "react";
+import { UseMutationResult } from "@tanstack/react-query";
+import ms from "ms";
+
+import { createNotification } from "@app/components/notifications";
+import { OrgPermissionCan } from "@app/components/permissions";
+import { Button } from "@app/components/v2";
+import { OrgPermissionIdentityActions, OrgPermissionSubjects } from "@app/context";
+
+import { IdentityAuthFieldDisplay } from "./IdentityAuthFieldDisplay";
+
+export const LockoutFields = ({
+  clearLockoutsResult,
+  lockedOut,
+  identityId,
+  data,
+  onResetAllLockouts
+}: {
+  clearLockoutsResult: UseMutationResult<number, object, { identityId: string }, unknown>;
+  lockedOut: boolean;
+  identityId: string;
+  data: {
+    lockoutEnabled: boolean;
+    lockoutThreshold: number;
+    lockoutDurationSeconds: number;
+    lockoutCounterResetSeconds: number;
+  };
+  onResetAllLockouts: () => void;
+}) => {
+  const { mutateAsync, isPending } = clearLockoutsResult;
+
+  const [lockedOutState, setLockedOutState] = useState(lockedOut);
+
+  async function clearLockouts() {
+    try {
+      const deleted = await mutateAsync({ identityId });
+      createNotification({
+        text: `Successfully cleared ${deleted} lockout${deleted === 1 ? "" : "s"}`,
+        type: "success"
+      });
+      setLockedOutState(false);
+      onResetAllLockouts();
+    } catch (error) {
+      console.error(error);
+      createNotification({
+        text: "Failed to clear lockouts. Please try again.",
+        type: "error"
+      });
+    }
+  }
+
+  return (
+    <>
+      <div className="col-span-2 mt-3 flex justify-between border-b border-mineshaft-500 pb-2">
+        <span className="text-bunker-300">Lockout Options</span>
+        <OrgPermissionCan I={OrgPermissionIdentityActions.Edit} a={OrgPermissionSubjects.Identity}>
+          {(isAllowed) => (
+            <Button
+              isDisabled={!isAllowed || !lockedOutState || isPending}
+              size="xs"
+              onClick={() => clearLockouts()}
+              isLoading={isPending}
+              colorSchema="secondary"
+            >
+              Reset All Lockouts
+            </Button>
+          )}
+        </OrgPermissionCan>
+      </div>
+      <IdentityAuthFieldDisplay label="Lockout Threshold">
+        {data.lockoutThreshold}
+      </IdentityAuthFieldDisplay>
+      <IdentityAuthFieldDisplay label="Lockout Duration">
+        {ms(data.lockoutDurationSeconds * 1000, { long: true })}
+      </IdentityAuthFieldDisplay>
+      <IdentityAuthFieldDisplay label="Lockout Counter Reset">
+        {ms(data.lockoutCounterResetSeconds * 1000, { long: true })}
+      </IdentityAuthFieldDisplay>
+    </>
+  );
+};

frontend/src/pages/organization/IdentityDetailsByIDPage/components/ViewIdentityAuthModal/ViewIdentityLdapAuthContent.tsx

@@ -2,11 +2,12 @@ import { faBan, faEye } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 
 import { Badge, EmptyState, Spinner, Tooltip } from "@app/components/v2";
-import { useGetIdentityLdapAuth } from "@app/hooks/api";
+import { useClearIdentityLdapAuthLockouts, useGetIdentityLdapAuth } from "@app/hooks/api";
 import { IdentityLdapAuthForm } from "@app/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentityLdapAuthForm";
 import { ViewIdentityContentWrapper } from "@app/pages/organization/IdentityDetailsByIDPage/components/ViewIdentityAuthModal/ViewIdentityContentWrapper";
 
 import { IdentityAuthFieldDisplay } from "./IdentityAuthFieldDisplay";
+import { LockoutFields } from "./IdentityAuthLockoutFields";
 import { ViewAuthMethodProps } from "./types";
 
 export const ViewIdentityLdapAuthContent = ({
@@ -14,9 +15,12 @@ export const ViewIdentityLdapAuthContent = ({
   handlePopUpToggle,
   handlePopUpOpen,
   onDelete,
-  popUp
+  popUp,
+  lockedOut,
+  onResetAllLockouts
 }: ViewAuthMethodProps) => {
   const { data, isPending } = useGetIdentityLdapAuth(identityId);
+  const clearLockoutsResult = useClearIdentityLdapAuthLockouts();
 
   if (isPending) {
     return (
@@ -98,6 +102,18 @@ export const ViewIdentityLdapAuthContent = ({
           </Tooltip>
         )}
       </IdentityAuthFieldDisplay>
+      <IdentityAuthFieldDisplay label="Lockout">
+        {data.lockoutEnabled ? "Enabled" : "Disabled"}
+      </IdentityAuthFieldDisplay>
+      {data.lockoutEnabled && (
+        <LockoutFields
+          identityId={identityId}
+          lockedOut={lockedOut}
+          clearLockoutsResult={clearLockoutsResult}
+          data={data}
+          onResetAllLockouts={onResetAllLockouts}
+        />
+      )}
     </ViewIdentityContentWrapper>
   );
 };

frontend/src/pages/organization/IdentityDetailsByIDPage/components/ViewIdentityAuthModal/ViewIdentityUniversalAuthContent.tsx

@@ -1,12 +1,7 @@
-import { useState } from "react";
 import { faBan, faCheck, faCopy } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import ms from "ms";
 
-import { createNotification } from "@app/components/notifications";
-import { OrgPermissionCan } from "@app/components/permissions";
-import { Button, EmptyState, IconButton, Spinner, Tooltip } from "@app/components/v2";
-import { OrgPermissionIdentityActions, OrgPermissionSubjects } from "@app/context";
+import { EmptyState, IconButton, Spinner, Tooltip } from "@app/components/v2";
 import { useTimedReset } from "@app/hooks";
 import {
   useClearIdentityUniversalAuthLockouts,
@@ -16,6 +11,7 @@ import {
 import { IdentityUniversalAuthForm } from "@app/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentityUniversalAuthForm";
 
 import { IdentityAuthFieldDisplay } from "./IdentityAuthFieldDisplay";
+import { LockoutFields } from "./IdentityAuthLockoutFields";
 import { IdentityUniversalAuthClientSecretsTable } from "./IdentityUniversalAuthClientSecretsTable";
 import { ViewAuthMethodProps } from "./types";
 import { ViewIdentityContentWrapper } from "./ViewIdentityContentWrapper";
@@ -32,33 +28,12 @@ export const ViewIdentityUniversalAuthContent = ({
   const { data, isPending } = useGetIdentityUniversalAuth(identityId);
   const { data: clientSecrets = [], isPending: clientSecretsPending } =
     useGetIdentityUniversalAuthClientSecrets(identityId);
-  const { mutateAsync: clearLockoutsFn, isPending: isClearLockoutsPending } =
-    useClearIdentityUniversalAuthLockouts();
-
-  const [lockedOutState, setLockedOutState] = useState(lockedOut);
+  const clearLockoutsResult = useClearIdentityUniversalAuthLockouts();
 
   const [copyTextClientId, isCopyingClientId, setCopyTextClientId] = useTimedReset<string>({
     initialState: "Copy Client ID to clipboard"
   });
 
-  async function clearLockouts() {
-    try {
-      const deleted = await clearLockoutsFn({ identityId });
-      createNotification({
-        text: `Successfully cleared ${deleted} lockout${deleted === 1 ? "" : "s"}`,
-        type: "success"
-      });
-      setLockedOutState(false);
-      onResetAllLockouts();
-    } catch (error) {
-      console.error(error);
-      createNotification({
-        text: "Failed to clear lockouts. Please try again.",
-        type: "error"
-      });
-    }
-  }
-
   if (isPending || clientSecretsPending) {
     return (
       <div className="flex w-full items-center justify-center">
@@ -119,36 +94,13 @@ export const ViewIdentityUniversalAuthContent = ({
         {data.lockoutEnabled ? "Enabled" : "Disabled"}
       </IdentityAuthFieldDisplay>
       {data.lockoutEnabled && (
-        <>
-          <div className="col-span-2 mt-3 flex justify-between border-b border-mineshaft-500 pb-2">
-            <span className="text-bunker-300">Lockout Options</span>
-            <OrgPermissionCan
-              I={OrgPermissionIdentityActions.Edit}
-              a={OrgPermissionSubjects.Identity}
-            >
-              {(isAllowed) => (
-                <Button
-                  isDisabled={!isAllowed || !lockedOutState || isClearLockoutsPending}
-                  size="xs"
-                  onClick={() => clearLockouts()}
-                  isLoading={isClearLockoutsPending}
-                  colorSchema="secondary"
-                >
-                  Reset All Lockouts
-                </Button>
-              )}
-            </OrgPermissionCan>
-          </div>
-          <IdentityAuthFieldDisplay label="Lockout Threshold">
-            {data.lockoutThreshold}
-          </IdentityAuthFieldDisplay>
-          <IdentityAuthFieldDisplay label="Lockout Duration">
-            {ms(data.lockoutDurationSeconds * 1000, { long: true })}
-          </IdentityAuthFieldDisplay>
-          <IdentityAuthFieldDisplay label="Lockout Counter Reset">
-            {ms(data.lockoutCounterResetSeconds * 1000, { long: true })}
-          </IdentityAuthFieldDisplay>
-        </>
+        <LockoutFields
+          identityId={identityId}
+          lockedOut={lockedOut}
+          clearLockoutsResult={clearLockoutsResult}
+          data={data}
+          onResetAllLockouts={onResetAllLockouts}
+        />
       )}
       <div className="col-span-2 my-3">
         <div className="mb-3 border-b border-mineshaft-500 pb-2">