π OpenHands: AI-Driven Development
fix: prevent infinite redirect loop on org-defaults settings pages (#14042)
Graham Neubigfa0da8f3bd68
diff --git a/frontend/__tests__/routes/org-default-condenser-settings.test.ts b/frontend/__tests__/routes/org-default-condenser-settings.test.tsnew file mode 100644index 0000000000..c892fe3517--- /dev/null+++ b/frontend/__tests__/routes/org-default-condenser-settings.test.ts@@ -0,0 +1,98 @@+import { describe, expect, it, vi, beforeEach } from "vitest";+import { redirect } from "react-router";++/**+ * Regression test: when getActiveOrganizationUser() returns undefined on+ * /settings/org-defaults/condenser, the loader must redirect to a safe+ * terminal page (e.g. /settings/user) β NOT to /settings/condenser,+ * which unconditionally bounces back in SaaS mode and creates an+ * infinite redirect loop that crashes the browser tab.+ */++vi.mock("react-router", () => ({+ redirect: vi.fn((path: string) => ({ _tag: "redirect", path })),+}));++vi.mock("#/utils/org/permission-checks", () => ({+ getActiveOrganizationUser: vi.fn(),+}));++vi.mock("#/api/option-service/option-service.api", () => ({+ default: {+ getConfig: vi.fn().mockResolvedValue({+ app_mode: "saas",+ feature_flags: {+ hide_users_page: false,+ hide_billing_page: false,+ hide_integrations_page: false,+ hide_llm_settings: false,+ },+ }),+ },+}));++vi.mock("#/api/organization-service/organization-service.api", () => ({+ organizationService: {+ getOrganizations: vi.fn().mockResolvedValue({+ items: [{ id: "org-1", name: "Team Org", is_personal: false }],+ currentOrgId: "org-1",+ }),+ },+}));++vi.mock("#/stores/selected-organization-store", () => ({+ getSelectedOrganizationIdFromStore: vi.fn(() => "org-1"),+}));++vi.mock("#/query-client-config", () => ({+ queryClient: {+ getQueryData: vi.fn(() => ({+ app_mode: "saas",+ feature_flags: {+ hide_users_page: false,+ hide_billing_page: false,+ hide_integrations_page: false,+ hide_llm_settings: false,+ },+ })),+ setQueryData: vi.fn(),+ fetchQuery: vi.fn(({ queryKey }: { queryKey: unknown[] }) => {+ if (queryKey[0] === "organizations") {+ return Promise.resolve({+ items: [{ id: "org-1", name: "Team Org", is_personal: false }],+ currentOrgId: "org-1",+ });+ }+ return Promise.resolve({+ app_mode: "saas",+ feature_flags: {+ hide_users_page: false,+ hide_billing_page: false,+ hide_integrations_page: false,+ hide_llm_settings: false,+ },+ });+ }),+ },+}));++import { getActiveOrganizationUser } from "#/utils/org/permission-checks";+import { clientLoader } from "#/routes/org-default-condenser-settings";++beforeEach(() => {+ vi.clearAllMocks();+});++describe("org-defaults/condenser clientLoader", () => {+ it("redirects to a safe terminal page when user is undefined", async () => {+ vi.mocked(getActiveOrganizationUser).mockResolvedValue(undefined);++ await clientLoader({+ request: new Request(+ "http://localhost/settings/org-defaults/condenser",+ ),+ });++ expect(redirect).toHaveBeenCalledWith("/settings/user");+ });+});diff --git a/frontend/src/routes/org-default-condenser-settings.tsx b/frontend/src/routes/org-default-condenser-settings.tsxindex fe962f9ea7..cba3222e0b 100644--- a/frontend/src/routes/org-default-condenser-settings.tsx+++ b/frontend/src/routes/org-default-condenser-settings.tsx@@ -15,9 +15,6 @@ function OrgDefaultCondenserSettingsScreen() {);}-export const clientLoader = createPermissionGuard(- "view_llm_settings",- "/settings/condenser",-);+export const clientLoader = createPermissionGuard("view_llm_settings");export default OrgDefaultCondenserSettingsScreen;diff --git a/frontend/src/routes/org-default-llm-settings.tsx b/frontend/src/routes/org-default-llm-settings.tsxindex 48507b3fcc..a040922b64 100644--- a/frontend/src/routes/org-default-llm-settings.tsx+++ b/frontend/src/routes/org-default-llm-settings.tsx@@ -1,10 +1,7 @@import { createPermissionGuard } from "#/utils/org/permission-guard";import { LlmSettingsScreen } from "./llm-settings";-export const clientLoader = createPermissionGuard(- "view_llm_settings",- "/settings",-);+export const clientLoader = createPermissionGuard("view_llm_settings");function OrgDefaultLlmSettingsScreen() {return <LlmSettingsScreen scope="org" />;diff --git a/frontend/src/routes/org-default-verification-settings.tsx b/frontend/src/routes/org-default-verification-settings.tsxindex f46c62f2bb..b7a4254e24 100644--- a/frontend/src/routes/org-default-verification-settings.tsx+++ b/frontend/src/routes/org-default-verification-settings.tsx@@ -14,9 +14,6 @@ function OrgDefaultVerificationSettingsScreen() {);}-export const clientLoader = createPermissionGuard(- "view_llm_settings",- "/settings/verification",-);+export const clientLoader = createPermissionGuard("view_llm_settings");export default OrgDefaultVerificationSettingsScreen;