Skip to content

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

fix(ui): preserve routes and reset caches when switching organizations (#8377)

Andrew Huang58937a54a57d
diff --git a/frontend/CLAUDE.md b/frontend/CLAUDE.md
index b6335b388c..3feee714f8 100644
--- a/frontend/CLAUDE.md
+++ b/frontend/CLAUDE.md
@@ -62,6 +62,10 @@ When adding new queries, consider whether the default 60s staleTime is appropria
- For data that must always be fresh (auth configs, lease TTLs): override with `staleTime: 0, gcTime: 0`.
- For rarely-changing data (server config, user profile): use `staleTime: Infinity` as the context providers do.
+Organization switching resets the query cache centrally in `pages/middlewares/inject-org-details.tsx`, after authentication succeeds and before tenant data loads. `hooks/api/organization/cache.ts` tracks the active organization per `QueryClient` and removes all queries except the exact auth-token, user-profile, server-config, and session-announcement keys. Removing queries also cancels pending query results, including queries whose keys omit the organization. Same-organization navigation keeps the cache, and the organization layout remounts on organization changes to reset local UI state. Keep tenant cache cleanup at this boundary rather than adding feature-specific removal lists to individual organization selectors. Logout paths must use `clearSession` to remove user-specific cache entries while preserving public server configuration for the login page.
+
+Organization switchers use `helpers/organizationSwitch.ts` to retain safe sections and tabs while dropping resource IDs, action parameters, and legacy suborganization search state. Pass the current location through `navigateUserToOrg` only for organization switches; initial login keeps its Projects landing page. Explicit destinations take precedence, and MFA route handoffs retain the requested destination through `redirect_to`.
+
### Product Analytics
Use `@app/lib/analytics` for new frontend product analytics. Define the event and its typed properties in the shared catalog, then capture it through the method matching its scope so required grouping is applied automatically. Do not call the legacy `Telemetry` wrapper directly from new code or define event names as local strings.
diff --git a/frontend/src/components/v3/platform/RootCommandMenu/RootCommandMenu.tsx b/frontend/src/components/v3/platform/RootCommandMenu/RootCommandMenu.tsx
index 683771b421..b1b8cdf97b 100644
--- a/frontend/src/components/v3/platform/RootCommandMenu/RootCommandMenu.tsx
+++ b/frontend/src/components/v3/platform/RootCommandMenu/RootCommandMenu.tsx
@@ -65,6 +65,7 @@ import {
ProjectPermissionSecretScanningFindingActions,
ProjectPermissionSecretSyncActions
} from "@app/context/ProjectPermissionContext/types";
+import { getOrganizationSwitchDestination } from "@app/helpers/organizationSwitch";
import { getProjectLucideIcon, getProjectTitle } from "@app/helpers/project";
import { useImplicitProduct } from "@app/hooks";
import { useGetOrganizationGroups, useGetOrganizationsWithSubOrgs } from "@app/hooks/api";
@@ -208,6 +209,7 @@ const useEntityCommandGroups = ({
currentOrganizationName?: string;
}) => {
const navigate = useNavigate();
+ const location = useLocation();
const projectsQuery = useGetAccessibleProjectsWithSubOrgs(currentOrganizationId ?? "");
const organizationsQuery = useGetOrganizationsWithSubOrgs();
const { data: projects = [] } = projectsQuery;
@@ -269,11 +271,17 @@ const useEntityCommandGroups = ({
...(organization.isSubOrganization ? ["sub", "sub-org", "sub-organization"] : [])
],
priority: organization.id === currentOrganizationId ? 20 : 0,
- onSelect: () =>
- navigate({
- to: "/organizations/$orgId/projects",
- params: { orgId: organization.id }
- })
+ onSelect: () => {
+ if (organization.id === currentOrganizationId) {
+ return navigate({
+ to: "/organizations/$orgId/projects",
+ params: { orgId: organization.id }
+ });
+ }
+ return navigate(
+ getOrganizationSwitchDestination(location, organization.id, organization.isSubOrganization)
+ );
+ }
}));
const teamItems: GlobalCommandMenuItem[] = teams.map((team) => ({
diff --git a/frontend/src/helpers/organizationSwitch.ts b/frontend/src/helpers/organizationSwitch.ts
new file mode 100644
index 0000000000..b989afc86c
--- /dev/null
+++ b/frontend/src/helpers/organizationSwitch.ts
@@ -0,0 +1,79 @@
+import type { ParsedLocation } from "@tanstack/react-router";
+
+const organizationSwitchSections = [
+ "projects/secret-management/product-settings",
+ "projects/secret-management/secret-sharing",
+ "projects/secret-management/insights",
+ "projects/kms/kmip-servers",
+ "projects/secret-management",
+ "projects/cert-manager",
+ "projects/secret-scanning",
+ "projects/kms",
+ "projects",
+ "networking",
+ "access-management",
+ "audit-logs",
+ "settings",
+ "integrations",
+ "sso",
+ "billing",
+ "oauth-applications",
+ "pam/accounts",
+ "pam/templates",
+ "pam/discovery",
+ "pam/sessions",
+ "pam/approval-requests",
+ "pam/audit-logs",
+ "pam/access-management",
+ "agent-vault/sessions",
+ "agent-vault/access-bundles",
+ "agent-vault/proxies",
+ "agent-vault/settings",
+ "agent-vault/audit-logs",
+ "agent-vault/access-management"
+];
+
+export const getOrganizationSwitchDestination = (
+ location: Pick<ParsedLocation<Record<string, unknown>>, "pathname" | "search">,
+ organizationId: string,
+ isSubOrganization = false
+) => {
+ const path = location.pathname.match(/^\/organizations\/[^/]+\/(.*?)\/?$/)?.[1] ?? "";
+ const accessResource = path.match(/^(?:(pam|agent-vault)\/)?(groups|members|roles|identities)\//);
+ let section = organizationSwitchSections.find(
+ (candidate) => path === candidate || path.startsWith(`${candidate}/`)
+ );
+ let selectedTab =
+ path === section && typeof location.search.selectedTab === "string"
+ ? location.search.selectedTab
+ : undefined;
+
+ if (accessResource) {
+ const [, productScope, resourceTab] = accessResource;
+ section = `${productScope ? `${productScope}/` : ""}access-management`;
+ selectedTab = resourceTab;
+ } else if (path.startsWith("networking/relays/")) {
+ selectedTab = "relays";
+ } else if (path.startsWith("app-connections")) {
+ section = "integrations";
+ }
+
+ if (isSubOrganization) {
+ if (section && ["sso", "billing", "oauth-applications"].includes(section)) {
+ section = "settings";
+ selectedTab = undefined;
+ } else if (
+ section === "settings" &&
+ selectedTab &&
+ ["tab-org-security", "tab-sub-organizations"].includes(selectedTab)
+ ) {
+ selectedTab = undefined;
+ }
+ }
+
+ return {
+ to: `/organizations/$orgId/${section ?? "projects"}`,
+ params: { orgId: organizationId },
+ search: { selectedTab, subOrganization: undefined }
+ };
+};
diff --git a/frontend/src/hooks/api/organization/cache.ts b/frontend/src/hooks/api/organization/cache.ts
new file mode 100644
index 0000000000..1c778481c7
--- /dev/null
+++ b/frontend/src/hooks/api/organization/cache.ts
@@ -0,0 +1,23 @@
+import { hashKey, QueryClient } from "@tanstack/react-query";
+
+import { adminQueryKeys } from "../admin/queries";
+import { announcementKeys } from "../announcement/queries";
+import { authKeys } from "../auth/queries";
+import { userKeys } from "../users/query-keys";
+
+const organizationScopes = new WeakMap<QueryClient, string>();
+const retainedQueryHashes = new Set([
+ hashKey(authKeys.getAuthToken),
+ hashKey(adminQueryKeys.serverConfig()),
+ hashKey(announcementKeys.recent()),
+ hashKey(userKeys.getUser)
+]);
+
+export const resetOrganizationCache = (queryClient: QueryClient, organizationId: string) => {
+ if (organizationScopes.get(queryClient) === organizationId) return;
+
+ queryClient.removeQueries({
+ predicate: (query) => !retainedQueryHashes.has(query.queryHash)
+ });
+ organizationScopes.set(queryClient, organizationId);
+};
diff --git a/frontend/src/layouts/OrganizationLayout/components/NavBar/Navbar.tsx b/frontend/src/layouts/OrganizationLayout/components/NavBar/Navbar.tsx
index 7b4636a529..ec56b9db3e 100644
--- a/frontend/src/layouts/OrganizationLayout/components/NavBar/Navbar.tsx
+++ b/frontend/src/layouts/OrganizationLayout/components/NavBar/Navbar.tsx
@@ -82,17 +82,9 @@ import { OrgPermissionSubOrgActions } from "@app/context/OrgPermissionContext/ty
import { isInfisicalCloud } from "@app/helpers/platform";
import { getOrgScopedProductFromPath } from "@app/helpers/project";
import { useToggle } from "@app/hooks";
-import {
- adminQueryKeys,
- projectKeys,
- subOrganizationsQuery,
- useGetOrganizations,
- useLogoutUser
-} from "@app/hooks/api";
-import { appConnectionKeys } from "@app/hooks/api/appConnections";
-import { authKeys, selectOrganization } from "@app/hooks/api/auth/queries";
+import { subOrganizationsQuery, useGetOrganizations, useLogoutUser } from "@app/hooks/api";
+import { authKeys, fetchAuthToken, selectOrganization } from "@app/hooks/api/auth/queries";
import { MfaMethod } from "@app/hooks/api/auth/types";
-import { pamKeys } from "@app/hooks/api/pam";
import { ProjectType } from "@app/hooks/api/projects/types";
import { getAuthToken } from "@app/hooks/api/reactQuery";
import { getSubscriptionPlanLabel } from "@app/hooks/api/subscriptions";
@@ -211,10 +203,12 @@ export const Navbar = () => {
const handleOrgSelection = async ({
organizationId,
navigateTo,
+ isSubOrganization: targetIsSubOrganization = false,
onSuccess
}: {
organizationId?: string;
navigateTo?: string;
+ isSubOrganization?: boolean;
onSuccess?: () => void | Promise<void>;
}) => {
if (!organizationId) return;
@@ -230,24 +224,30 @@ export const Navbar = () => {
}
toggleShowMfa.on();
setMfaSuccessCallback(() => async () => {
- await handleOrgSelection({ organizationId, onSuccess });
+ await handleOrgSelection({
+ organizationId,
+ navigateTo,
+ isSubOrganization: targetIsSubOrganization,
+ onSuccess
+ });
});
return;
}
SecurityClient.setToken(token);
- queryClient.removeQueries({ queryKey: adminQueryKeys.serverConfig() });
- queryClient.removeQueries({ queryKey: authKeys.getAuthToken });
- queryClient.removeQueries({ queryKey: subOrgQuery.queryKey });
- queryClient.removeQueries({ queryKey: appConnectionKeys.all });
- // PAM's keys carry no org, so a stale entry would render another org's data until it goes stale.
- queryClient.removeQueries({ queryKey: pamKeys.all });
-
- await queryClient.refetchQueries({ queryKey: authKeys.getAuthToken });
- await queryClient.refetchQueries({ queryKey: adminQueryKeys.serverConfig() });
-
- await navigateUserToOrg({ navigate, organizationId, navigateTo });
- queryClient.removeQueries({ queryKey: projectKeys.allProjectQueries() });
+ await queryClient.fetchQuery({
+ queryKey: authKeys.getAuthToken,
+ queryFn: fetchAuthToken,
+ staleTime: 0
+ });
+
+ await navigateUserToOrg({
+ navigate,
+ organizationId,
+ navigateTo,
+ switchFrom: location,
+ isSubOrganization: targetIsSubOrganization
+ });
if (onSuccess) {
await onSuccess();
@@ -267,7 +267,11 @@ export const Navbar = () => {
};
if (isSubOrganization) {
- await handleOrgSelection({ organizationId: rootOrg.id, onSuccess });
+ await handleOrgSelection({
+ organizationId: rootOrg.id,
+ navigateTo: "/organizations/$orgId/billing",
+ onSuccess
+ });
} else {
await navigateToBilling();
}
@@ -537,7 +541,10 @@ export const Navbar = () => {
keywords={[subOrg.name]}
onSelect={() => {
setIsOrgSelectOpen(false);
- handleOrgSelection({ organizationId: subOrg.id });
+ handleOrgSelection({
+ organizationId: subOrg.id,
+ isSubOrganization: true
+ });
}}
>
<Check
@@ -867,7 +874,7 @@ export const Navbar = () => {
<NewSubOrganizationModal
isOpen={showSubOrgForm}
onOpenChange={setShowSubOrgForm}
- onCreated={({ id }) => handleOrgSelection({ organizationId: id })}
+ onCreated={({ id }) => handleOrgSelection({ organizationId: id, isSubOrganization: true })}
/>
<Dialog open={showAdminsModal} onOpenChange={setShowAdminsModal}>
<DialogContent>
diff --git a/frontend/src/pages/auth/LoginPage/Login.utils.tsx b/frontend/src/pages/auth/LoginPage/Login.utils.tsx
index b6546bd778..e8a222770b 100644
--- a/frontend/src/pages/auth/LoginPage/Login.utils.tsx
+++ b/frontend/src/pages/auth/LoginPage/Login.utils.tsx
@@ -1,6 +1,7 @@
-import { NavigateFn, useNavigate } from "@tanstack/react-router";
+import { NavigateFn, ParsedLocation, useNavigate } from "@tanstack/react-router";
import { useServerConfig } from "@app/context";
+import { getOrganizationSwitchDestination } from "@app/helpers/organizationSwitch";
import { fetchOrganizations } from "@app/hooks/api/organization/queries";
import { queryClient } from "@app/hooks/api/reactQuery";
import { userKeys } from "@app/hooks/api/users";
@@ -9,23 +10,33 @@ type NavigateUserToOrgParams = {
navigate: NavigateFn;
organizationId?: string;
navigateTo?: string;
+ switchFrom?: Pick<ParsedLocation<Record<string, unknown>>, "pathname" | "search">;
+ isSubOrganization?: boolean;
};
-const navigateToOrg = (navigate: NavigateFn, organizationId: string, navigateTo?: string) => {
- navigate({
+const navigateToOrg = (
+ navigate: NavigateFn,
+ organizationId: string,
+ { navigateTo, switchFrom, isSubOrganization }: NavigateUserToOrgParams
+) => {
+ if (switchFrom && !navigateTo) {
+ return navigate(
+ getOrganizationSwitchDestination(switchFrom, organizationId, isSubOrganization)
+ );
+ }
+
+ return navigate({
to: navigateTo || ("/organizations/$orgId/projects" as const),
- params: { orgId: organizationId }
+ params: { orgId: organizationId },
+ search: { subOrganization: undefined }
});
};
-export const navigateUserToOrg = async ({
- navigate,
- organizationId,
- navigateTo
-}: NavigateUserToOrgParams) => {
+export const navigateUserToOrg = async (options: NavigateUserToOrgParams) => {
+ const { navigate, organizationId } = options;
if (organizationId) {
localStorage.setItem("orgData.id", organizationId);
- navigateToOrg(navigate, organizationId, navigateTo);
+ await navigateToOrg(navigate, organizationId, options);
return;
}
@@ -34,7 +45,7 @@ export const navigateUserToOrg = async ({
if (nonAuthEnforcedOrgs.length > 0) {
const userOrg = nonAuthEnforcedOrgs[0] && nonAuthEnforcedOrgs[0].id;
localStorage.setItem("orgData.id", userOrg);
- navigateToOrg(navigate, userOrg, navigateTo);
+ await navigateToOrg(navigate, userOrg, options);
} else {
localStorage.removeItem("orgData.id");
navigate({ to: "/organizations/none" });
diff --git a/frontend/src/pages/auth/SelectOrgPage/SelectOrgPage.tsx b/frontend/src/pages/auth/SelectOrgPage/SelectOrgPage.tsx
index 93c2703c5d..ff8218c7b4 100644
--- a/frontend/src/pages/auth/SelectOrgPage/SelectOrgPage.tsx
+++ b/frontend/src/pages/auth/SelectOrgPage/SelectOrgPage.tsx
@@ -131,7 +131,8 @@ export const SelectOrgPage = () => {
org_id: orgId,
callback_port: callbackPort,
is_admin_login: isBreakglassRoute,
- mfa_method: mfaMethodFromSearch
+ mfa_method: mfaMethodFromSearch,
+ redirect_to: redirectTo
} = search;
const { data: orgs, isPending: orgsLoading } = useGetOrganizationsWithSubOrgs();
@@ -303,7 +304,11 @@ export const SelectOrgPage = () => {
} else {
setAuthToken(token);
createNotification({ text: "Successfully logged in", type: "success" });
- navigateUserToOrg({ navigate, organizationId: targetOrgId });
+ if (redirectTo?.startsWith(`/organizations/${targetOrgId}/`)) {
+ navigate({ href: redirectTo });
+ } else {
+ navigateUserToOrg({ navigate, organizationId: targetOrgId });
+ }
}
};
diff --git a/frontend/src/pages/auth/SelectOrgPage/route.tsx b/frontend/src/pages/auth/SelectOrgPage/route.tsx
index 942f1a1196..b92bd61f9f 100644
--- a/frontend/src/pages/auth/SelectOrgPage/route.tsx
+++ b/frontend/src/pages/auth/SelectOrgPage/route.tsx
@@ -1,4 +1,4 @@
-import { createFileRoute, redirect, stripSearchParams } from "@tanstack/react-router";
+import { createFileRoute, isRedirect, redirect, stripSearchParams } from "@tanstack/react-router";
import { zodValidator } from "@tanstack/zod-adapter";
import { addSeconds, formatISO } from "date-fns";
import { z } from "zod";
@@ -18,7 +18,7 @@ import {
TOrgWithSubOrgs
} from "@app/hooks/api/organization/queries";
import { onRequestError, setAuthToken } from "@app/hooks/api/reactQuery";
-import { fetchUserDetails, logoutUser } from "@app/hooks/api/users/queries";
+import { clearSession, fetchUserDetails, logoutUser } from "@app/hooks/api/users/queries";
import { userKeys } from "@app/hooks/api/users/query-keys";
import { getSsoEnforcementError } from "./SelectOrg.utils";
@@ -30,6 +30,7 @@ export const SelectOrganizationPageQueryParams = z.object({
is_admin_login: z.boolean().optional().catch(false),
force: z.boolean().optional(),
mfa_method: z.string().optional().catch(undefined),
+ redirect_to: z.string().startsWith("/organizations/").optional().catch(undefined),
// set by the provider-verified OAuth signup redirect so this page can fire the GTM conversion
// event that the bypassed signup page would have pushed
signup_completed: z.boolean().optional().catch(false)
@@ -166,7 +167,8 @@ export const Route = createFileRoute("/_restrict-login-signup/login/select-organ
search: {
mfa_method: result.mfaMethod,
org_id: targetOrgId,
- callback_port: search.callback_port
+ callback_port: search.callback_port,
+ redirect_to: search.redirect_to
}
});
}
@@ -198,6 +200,10 @@ export const Route = createFileRoute("/_restrict-login-signup/login/select-organ
createNotification({ text: "Successfully logged in", type: "success" });
+ if (search.redirect_to?.startsWith(`/organizations/${targetOrgId}/`)) {
+ throw redirect({ href: search.redirect_to });
+ }
+
// Check for a stored redirect URL from before login (e.g., deep links like /pam/access)
const loginRedirectUrl = consumeLoginRedirectUrl();
if (loginRedirectUrl) {
@@ -212,9 +218,7 @@ export const Route = createFileRoute("/_restrict-login-signup/login/select-organ
}
} catch (error) {
// If it's a redirect, re-throw it
- if (error instanceof Error && error.message === "REDIRECT") throw error;
- // For redirect objects from TanStack Router
- if (typeof error === "object" && error !== null && "to" in error) throw error;
+ if (isRedirect(error)) throw error;
// selectOrganization is called directly (not via mutation hook), so MutationCache.onError
// never fires for it — surface SMTP and lockout errors manually and log the user out.
if (typeof error === "object" && error !== null && "response" in error) {
@@ -225,14 +229,7 @@ export const Route = createFileRoute("/_restrict-login-signup/login/select-organ
response?.data?.error === "UserLocked" || response?.data?.message === "Account is locked";
if (response?.data?.error === "SmtpError" || isLockError) {
onRequestError(error);
- // We can't use the useLogoutUser hook here (beforeLoad runs outside React),
- // so we replicate its mutationFn manually:
- // - setAuthToken("") stops outgoing requests from carrying the stale token.
- // - removeQueries drops the cached auth token so the restrict-login-signup
- // middleware doesn't find it and redirect back to select-organization.
- // - logoutUser() invalidates the session on the server.
- setAuthToken("");
- context.queryClient.removeQueries({ queryKey: authKeys.getAuthToken });
+ clearSession();
await logoutUser().catch(() => {}); // best-effort — redirect must always fire
throw redirect({ to: "/login" });
}
diff --git a/frontend/src/pages/middlewares/inject-org-details.tsx b/frontend/src/pages/middlewares/inject-org-details.tsx
index 2f727bf336..84f3edff9c 100644
--- a/frontend/src/pages/middlewares/inject-org-details.tsx
+++ b/frontend/src/pages/middlewares/inject-org-details.tsx
@@ -1,21 +1,16 @@
-import { createFileRoute, isRedirect, redirect } from "@tanstack/react-router";
+import { createFileRoute, redirect } from "@tanstack/react-router";
import SecurityClient from "@app/components/utilities/SecurityClient";
import { SessionStorageKeys } from "@app/const";
-import { appConnectionKeys } from "@app/hooks/api/appConnections";
import { authKeys, fetchAuthToken, selectOrganization } from "@app/hooks/api/auth/queries";
-import { certManagerInstanceKeys } from "@app/hooks/api/certManagerInstance";
-import { identitiesKeys } from "@app/hooks/api/identities/queries";
+import { resetOrganizationCache } from "@app/hooks/api/organization/cache";
import { fetchOrganizationById, organizationKeys } from "@app/hooks/api/organization/queries";
-import { pamKeys } from "@app/hooks/api/pam";
-import { projectKeys } from "@app/hooks/api/projects";
import { fetchUserOrgPermissions, roleQueryKeys } from "@app/hooks/api/roles/queries";
-import { subOrganizationsQuery } from "@app/hooks/api/subOrganizations";
import { fetchOrgSubscription, subscriptionQueryKeys } from "@app/hooks/api/subscriptions/queries";
// Route context to fill in organization's data like details, subscription etc
export const Route = createFileRoute("/_authenticate/_inject-org-details")({
- beforeLoad: async ({ context, params }) => {
+ beforeLoad: async ({ context, params, location }) => {
let organizationId: string;
if ((params as { orgId?: string })?.orgId) {
@@ -29,46 +24,33 @@ export const Route = createFileRoute("/_authenticate/_inject-org-details")({
const currentTokenOrgId = context.organizationId;
if (urlOrgId !== currentTokenOrgId) {
- try {
- const { token, isMfaEnabled, mfaMethod } = await selectOrganization({
- organizationId: urlOrgId
- });
-
- if (isMfaEnabled) {
- sessionStorage.setItem(SessionStorageKeys.MFA_TEMP_TOKEN, token);
- throw redirect({
- to: "/login/select-organization",
- search: { org_id: urlOrgId, mfa_method: mfaMethod }
- });
- }
-
- if (!isMfaEnabled && token) {
- SecurityClient.setToken(token);
-
- context.queryClient.removeQueries({ queryKey: authKeys.getAuthToken });
- context.queryClient.removeQueries({ queryKey: projectKeys.getAllUserProjects() });
- context.queryClient.removeQueries({ queryKey: subOrganizationsQuery.allKey() });
- context.queryClient.removeQueries({ queryKey: certManagerInstanceKeys.all });
- context.queryClient.removeQueries({ queryKey: identitiesKeys.searchIdentitiesRoot });
- context.queryClient.removeQueries({ queryKey: identitiesKeys.countIdentitiesRoot });
- context.queryClient.removeQueries({ queryKey: appConnectionKeys.all });
- // PAM's keys carry no org, so a stale entry would render another org's data until it goes stale.
- context.queryClient.removeQueries({ queryKey: pamKeys.all });
+ const { token, isMfaEnabled, mfaMethod } = await selectOrganization({
+ organizationId: urlOrgId
+ });
- await context.queryClient.fetchQuery({
- queryKey: authKeys.getAuthToken,
- queryFn: fetchAuthToken
- });
- }
- } catch (error) {
- if (isRedirect(error)) {
- throw error;
- }
- console.warn("Failed to automatically exchange token for organization:", error);
+ if (isMfaEnabled) {
+ sessionStorage.setItem(SessionStorageKeys.MFA_TEMP_TOKEN, token);
+ throw redirect({
+ to: "/login/select-organization",
+ search: {
+ org_id: urlOrgId,
+ mfa_method: mfaMethod,
+ redirect_to: location.href
+ }
+ });
}
+
+ SecurityClient.setToken(token);
+ await context.queryClient.fetchQuery({
+ queryKey: authKeys.getAuthToken,
+ queryFn: fetchAuthToken,
+ staleTime: 0
+ });
}
}
+ resetOrganizationCache(context.queryClient, organizationId);
+
await context.queryClient.ensureQueryData({
queryKey: organizationKeys.getOrgById(organizationId),
queryFn: () => fetchOrganizationById(organizationId)
diff --git a/frontend/src/pages/organization/SettingsPage/components/OrgSubOrgsTab/OrgSubOrgsTab.tsx b/frontend/src/pages/organization/SettingsPage/components/OrgSubOrgsTab/OrgSubOrgsTab.tsx
index 5c1c0c7100..0ee96a5c0d 100644
--- a/frontend/src/pages/organization/SettingsPage/components/OrgSubOrgsTab/OrgSubOrgsTab.tsx
+++ b/frontend/src/pages/organization/SettingsPage/components/OrgSubOrgsTab/OrgSubOrgsTab.tsx
@@ -2,7 +2,7 @@ import { useState } from "react";
import { useForm } from "react-hook-form";
import { zodResolver } from "@hookform/resolvers/zod";
import { useQuery, useQueryClient } from "@tanstack/react-query";
-import { useNavigate } from "@tanstack/react-router";
+import { useLocation, useNavigate } from "@tanstack/react-router";
import { format } from "date-fns";
import {
CheckIcon,
@@ -160,6 +160,8 @@ export const OrgSubOrgsTab = () => {
useResetPageHelper({ setPage, offset, totalCount });
+ const location = useLocation();
+
const handleLoginSubOrg = async (subOrgId: string) => {
const { token, isMfaEnabled, mfaMethod } = await selectOrganization({
organizationId: subOrgId
@@ -180,7 +182,12 @@ export const OrgSubOrgsTab = () => {
SecurityClient.setToken(token);
queryClient.removeQueries({ queryKey: authKeys.getAuthToken });
await queryClient.refetchQueries({ queryKey: authKeys.getAuthToken });
- await navigateUserToOrg({ navigate, organizationId: subOrgId });
+ await navigateUserToOrg({
+ navigate,
+ organizationId: subOrgId,
+ switchFrom: location,
+ isSubOrganization: true
+ });
};
const handleOpenEditModal = (subOrg: TSubOrganization) => {
diff --git a/frontend/src/pages/organization/layout.tsx b/frontend/src/pages/organization/layout.tsx
index 0caf8286c5..c9f4765df8 100644
--- a/frontend/src/pages/organization/layout.tsx
+++ b/frontend/src/pages/organization/layout.tsx
@@ -4,7 +4,10 @@ import { z } from "zod";
import { OrganizationLayout } from "@app/layouts/OrganizationLayout";
export const Route = createFileRoute("/_authenticate/_inject-org-details/_org-layout")({
- component: OrganizationLayout,
+ component: function OrganizationLayoutRoute() {
+ const { organizationId } = Route.useRouteContext();
+ return <OrganizationLayout key={organizationId} />;
+ },
validateSearch: z.object({
subOrganization: z.string().optional()
}),