Skip to content

Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.

fix(pki): restore the sync form after an OAuth connection redirect from an Application (#8863)

Andrew Huange434f2fdfdd6
diff --git a/frontend/src/components/pki-syncs/CreatePkiSyncModal.tsx b/frontend/src/components/pki-syncs/CreatePkiSyncModal.tsx
index 3002a10044..cbb19ced43 100644
--- a/frontend/src/components/pki-syncs/CreatePkiSyncModal.tsx
+++ b/frontend/src/components/pki-syncs/CreatePkiSyncModal.tsx
@@ -98,7 +98,7 @@ export const CreatePkiSyncModal = ({
onComplete={closeSheet}
onCancel={() => setSelectedSync(null)}
destination={selectedSync}
- initialData={initialData}
+ initialData={selectedSync === selectSync ? initialData : undefined}
applicationId={applicationId}
/>
) : (
diff --git a/frontend/src/components/pki-syncs/forms/PkiSyncConnectionField.tsx b/frontend/src/components/pki-syncs/forms/PkiSyncConnectionField.tsx
index 5d46d85112..d7283ac1e6 100644
--- a/frontend/src/components/pki-syncs/forms/PkiSyncConnectionField.tsx
+++ b/frontend/src/components/pki-syncs/forms/PkiSyncConnectionField.tsx
@@ -25,6 +25,7 @@ import {
useListAvailableAppConnectionsForApps
} from "@app/hooks/api/appConnections";
import { AppConnection } from "@app/hooks/api/appConnections/enums";
+import { ApplicationTab } from "@app/pages/cert-manager/ApplicationDetailsByIDPage/application-tabs";
import { TPkiSyncForm } from "./schemas/pki-sync-schema";
@@ -65,6 +66,9 @@ export const PkiSyncConnectionField = ({ onChange: callback }: Props) => {
} = useRouterState();
const getPkiSyncReturnUrl = () => {
+ if (pathname.includes("/cert-manager/applications/")) {
+ return `${pathname}?selectedTab=${ApplicationTab.Syncs}`;
+ }
if (pathname.includes("selectedTab=secret-syncs")) {
return pathname.replace("selectedTab=secret-syncs", "selectedTab=pki-syncs");
}
diff --git a/frontend/src/pages/cert-manager/ApplicationDetailsByIDPage/components/ApplicationSyncsTab.tsx b/frontend/src/pages/cert-manager/ApplicationDetailsByIDPage/components/ApplicationSyncsTab.tsx
index 606c41b6de..aee941bbf1 100644
--- a/frontend/src/pages/cert-manager/ApplicationDetailsByIDPage/components/ApplicationSyncsTab.tsx
+++ b/frontend/src/pages/cert-manager/ApplicationDetailsByIDPage/components/ApplicationSyncsTab.tsx
@@ -1,8 +1,10 @@
-import { useState } from "react";
+import { useEffect, useState } from "react";
+import { useNavigate, useRouterState } from "@tanstack/react-router";
import { PlusIcon } from "lucide-react";
import { CertificateSyncsUpgradeIntent, useUpgradeGate } from "@app/components/license/UpgradeGate";
import { CreatePkiSyncModal } from "@app/components/pki-syncs";
+import { TPkiSyncForm } from "@app/components/pki-syncs/forms";
import {
Button,
Card,
@@ -20,15 +22,56 @@ import {
PkiApplicationResourceSub,
useGetPkiApplicationPermissions
} from "@app/hooks/api/pkiApplications";
-import { useListPkiSyncs } from "@app/hooks/api/pkiSyncs";
+import { PkiSync, useListPkiSyncs } from "@app/hooks/api/pkiSyncs";
import { PkiSyncsTable } from "../../IntegrationsListPage/components/PkiSyncsTab/PkiSyncTable";
import { PkiDocsUrls } from "../../pki-docs-urls";
+import { ApplicationTab } from "../application-tabs";
type Props = { applicationId: string; applicationName: string; projectId: string };
export const ApplicationSyncsTab = ({ applicationId, applicationName, projectId }: Props) => {
const [isAddSyncOpen, setIsAddSyncOpen] = useState(false);
+ const [restoredSync, setRestoredSync] = useState<{
+ destination: PkiSync;
+ initialData: Partial<TPkiSyncForm>;
+ } | null>(null);
+ const navigate = useNavigate();
+ const {
+ location: { pathname, search }
+ } = useRouterState();
+ const { connectionId, connectionName } = search as {
+ connectionId?: string;
+ connectionName?: string;
+ };
+
+ useEffect(() => {
+ if (!connectionId || !connectionName) return;
+
+ const storedFormData = localStorage.getItem("pkiSyncFormData");
+
+ if (storedFormData) {
+ try {
+ const { returnUrl, ...form } = JSON.parse(storedFormData) as Partial<TPkiSyncForm> & {
+ returnUrl?: string;
+ };
+ if (form.destination && (!returnUrl || returnUrl.split("?")[0] === pathname)) {
+ localStorage.removeItem("pkiSyncFormData");
+ setRestoredSync({
+ destination: form.destination,
+ initialData: { ...form, connection: { id: connectionId, name: connectionName } }
+ });
+ setIsAddSyncOpen(true);
+ }
+ } catch {
+ localStorage.removeItem("pkiSyncFormData");
+ setRestoredSync(null);
+ }
+ }
+
+ navigate({ to: pathname, search: { selectedTab: ApplicationTab.Syncs }, replace: true });
+ }, [connectionId, connectionName]);
+
const { subscription } = useSubscription();
const { openUpgradeGate, upgradeGate } = useUpgradeGate();
@@ -87,7 +130,12 @@ export const ApplicationSyncsTab = ({ applicationId, applicationName, projectId
</CardContent>
<CreatePkiSyncModal
isOpen={isAddSyncOpen}
- onOpenChange={setIsAddSyncOpen}
+ onOpenChange={(isOpen) => {
+ if (!isOpen) setRestoredSync(null);
+ setIsAddSyncOpen(isOpen);
+ }}
+ selectSync={restoredSync?.destination ?? null}
+ initialData={restoredSync?.initialData}
applicationId={applicationId}
/>
{upgradeGate}
diff --git a/frontend/src/pages/cert-manager/IntegrationsListPage/components/PkiSyncsTab/PkiSyncsTab.tsx b/frontend/src/pages/cert-manager/IntegrationsListPage/components/PkiSyncsTab/PkiSyncsTab.tsx
index 8a9e443f01..9a2320c393 100644
--- a/frontend/src/pages/cert-manager/IntegrationsListPage/components/PkiSyncsTab/PkiSyncsTab.tsx
+++ b/frontend/src/pages/cert-manager/IntegrationsListPage/components/PkiSyncsTab/PkiSyncsTab.tsx
@@ -47,6 +47,10 @@ export const PkiSyncsTab = () => {
if (storedFormData && !popUp.addSync.isOpen) {
try {
const parsedData = JSON.parse(storedFormData);
+ if (parsedData.returnUrl?.includes("/cert-manager/applications/")) {
+ localStorage.removeItem("pkiSyncFormData");
+ return;
+ }
if (connectionId && connectionName) {
const initialData = {
...parsedData,
diff --git a/frontend/src/pages/organization/AppConnections/OauthCallbackPage/OauthCallbackPage.tsx b/frontend/src/pages/organization/AppConnections/OauthCallbackPage/OauthCallbackPage.tsx
index f10820b7fd..50e102943b 100644
--- a/frontend/src/pages/organization/AppConnections/OauthCallbackPage/OauthCallbackPage.tsx
+++ b/frontend/src/pages/organization/AppConnections/OauthCallbackPage/OauthCallbackPage.tsx
@@ -26,6 +26,7 @@ import {
useUpdateAppConnection
} from "@app/hooks/api/appConnections";
import { AppConnection } from "@app/hooks/api/appConnections/enums";
+import { ApplicationTab } from "@app/pages/cert-manager/ApplicationDetailsByIDPage/application-tabs";
import { FormDataMap } from "./OauthCallbackPage.types";
@@ -97,6 +98,10 @@ export const OAuthCallbackPage = () => {
connectionName: data.connection.name,
...(data.returnUrl.includes("integrations")
? { selectedTab: getIntegrationsListTab() }
+ : {}),
+ ...(data.returnUrl.includes("/cert-manager/applications/") &&
+ localStorage.getItem("pkiSyncFormData")
+ ? { selectedTab: ApplicationTab.Syncs }
: {})
}
});