Ling0925
/
buster
mirror of https://github.com/buster-so/buster.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'devin/BUS-1455-1752897143' of https://github.com/buster-so/buster into devin/BUS-1455-1752897143

This commit is contained in:
Nate Kelley 2025-07-22 10:40:28 -06:00
parent 3680285cd9 286c51eb0f
commit 9b02f11da5
No known key found for this signature in database
GPG Key ID: FD90372AB8D98B4F
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/web/src/app/app/layout.tsx
View File

@ -10,6 +10,15 @@ import { createBusterRoute } from '@/routes';
import { BusterRoutes } from '@/routes/busterRoutes';
import { ClientRedirect } from '../../components/ui/layouts/ClientRedirect';
const isValidRedirectUrl = (url: string): boolean => {
try {
const decoded = decodeURIComponent(url);
return decoded.startsWith('/') && !decoded.startsWith('//');
} catch {
return false;
}
};
const newUserRoute = createBusterRoute({ route: BusterRoutes.NEW_USER });
const loginRoute = createBusterRoute({ route: BusterRoutes.AUTH_LOGIN });
@ -40,7 +49,7 @@ export default async function Layout({
(supabaseContext.user?.is_anonymous && pathname !== loginRoute) ||
!supabaseContext?.user?.id
) {
const redirectParam = pathname ? encodeURIComponent(pathname) : '';
const redirectParam = pathname && isValidRedirectUrl(pathname) ? encodeURIComponent(pathname) : '';
const loginUrlWithRedirect = redirectParam ? `${loginRoute}?next=${redirectParam}` : loginRoute;
return <ClientRedirect to={loginUrlWithRedirect} />;
}

11
apps/web/src/app/auth/login/page.tsx
View File

@ -1,5 +1,12 @@
import { LoginForm } from '@/components/features/auth/LoginForm';
export default function Login() {
return <LoginForm />;
export default async function Login({
searchParams
}: {
searchParams: Promise<{ [key: string]: string | string[] | undefined }>
}) {
const params = await searchParams;
const redirectTo = typeof params.next === 'string' ? params.next : null;
return <LoginForm redirectTo={redirectTo} />;
}

5
apps/web/src/components/features/auth/LoginForm.tsx
View File

@ -2,7 +2,6 @@
import Cookies from 'js-cookie';
import Link from 'next/link';
import { useSearchParams } from 'next/navigation';
import React, { useMemo, useState } from 'react';
import { useHotkeys } from 'react-hotkeys-hook';
import { Button } from '@/components/ui/buttons';
@ -31,9 +30,7 @@ const DEFAULT_CREDENTIALS = {
password: process.env.NEXT_PUBLIC_USER_PASSWORD || ''
};
export const LoginForm: React.FC = () => {
const searchParams = useSearchParams();
const redirectTo = searchParams.get('next');
export const LoginForm: React.FC<{ redirectTo?: string | null }> = ({ redirectTo }) => {
const [loading, setLoading] = useState<'google' | 'github' | 'azure' | 'email' | null>(null);
const [errorMessages, setErrorMessages] = useState<string[]>([]);
const [signUpFlow, setSignUpFlow] = useState(true);