π OpenHands: AI-Driven Development
fix: preserve query params in returnTo during login redirect (#12567)
Rohit Malhotrad60dd38d7802
diff --git a/frontend/__tests__/routes/root-layout.test.tsx b/frontend/__tests__/routes/root-layout.test.tsxindex 5dc2d24fd3..224e0a5c42 100644--- a/frontend/__tests__/routes/root-layout.test.tsx+++ b/frontend/__tests__/routes/root-layout.test.tsx@@ -48,6 +48,7 @@ function LoginStub() {searchParams.get("email_verification_required") === "true";const emailVerified = searchParams.get("email_verified") === "true";const emailVerificationText = "AUTH$PLEASE_CHECK_EMAIL_TO_VERIFY";+ const returnTo = searchParams.get("returnTo");return (<div data-testid="login-page">@@ -58,6 +59,7 @@ function LoginStub() {{emailVerificationText}</div>)}+ {returnTo && <div data-testid="return-to-param">{returnTo}</div>}</div></div>);@@ -100,6 +102,27 @@ const RouterStubWithLogin = createRoutesStub([},]);+const RouterStubWithDeviceVerify = createRoutesStub([+ {+ Component: MainApp,+ path: "/",+ children: [+ {+ Component: () => <div data-testid="outlet-content" />,+ path: "/",+ },+ {+ Component: () => <div data-testid="device-verify-page" />,+ path: "/oauth/device/verify",+ },+ ],+ },+ {+ Component: LoginStub,+ path: "/login",+ },+]);+const renderMainApp = (initialEntries: string[] = ["/"]) =>render(<RouterStub initialEntries={initialEntries} />, {wrapper: ({ children }) => (@@ -311,5 +334,23 @@ describe("MainApp", () => {{ timeout: 2000 },);});++ it("should preserve query parameters in returnTo when redirecting to login", async () => {+ renderWithLoginStub(RouterStubWithDeviceVerify, [+ "/oauth/device/verify?user_code=F9XN6BKU",+ ]);++ await waitFor(+ () => {+ expect(screen.getByTestId("login-page")).toBeInTheDocument();+ const returnToElement = screen.getByTestId("return-to-param");+ expect(returnToElement).toBeInTheDocument();+ expect(returnToElement.textContent).toBe(+ "/oauth/device/verify?user_code=F9XN6BKU",+ );+ },+ { timeout: 2000 },+ );+ });});});diff --git a/frontend/src/routes/root-layout.tsx b/frontend/src/routes/root-layout.tsxindex d0afbe98fd..bbd4feeed1 100644--- a/frontend/src/routes/root-layout.tsx+++ b/frontend/src/routes/root-layout.tsx@@ -5,6 +5,7 @@ import {Outlet,useNavigate,useLocation,+ useSearchParams,} from "react-router";import { useTranslation } from "react-i18next";import { I18nKey } from "#/i18n/declaration";@@ -67,6 +68,7 @@ export default function MainApp() {const appTitle = useAppTitle();const navigate = useNavigate();const { pathname } = useLocation();+ const [searchParams] = useSearchParams();const isOnTosPage = useIsOnTosPage();const { data: settings } = useSettings();const { migrateUserConsent } = useMigrateUserConsent();@@ -182,13 +184,18 @@ export default function MainApp() {React.useEffect(() => {if (shouldRedirectToLogin) {- const returnTo = pathname !== "/" ? pathname : "";- const loginUrl = returnTo- ? `/login?returnTo=${encodeURIComponent(returnTo)}`+ // Include search params in returnTo to preserve query string (e.g., user_code for device OAuth)+ const searchString = searchParams.toString();+ let fullPath = "";+ if (pathname !== "/") {+ fullPath = searchString ? `${pathname}?${searchString}` : pathname;+ }+ const loginUrl = fullPath+ ? `/login?returnTo=${encodeURIComponent(fullPath)}`: "/login";navigate(loginUrl, { replace: true });}- }, [shouldRedirectToLogin, pathname, navigate]);+ }, [shouldRedirectToLogin, pathname, searchParams, navigate]);if (shouldRedirectToLogin) {return (