Skip to content

Open-source status page, incident response and uptime monitoring

fix: callback url (#1724)

Maximilian Kaske3478aa594ccb
diff --git a/apps/dashboard/src/app/(dashboard)/onboarding/client.tsx b/apps/dashboard/src/app/(dashboard)/onboarding/client.tsx
index 837daa336..ebc706431 100644
--- a/apps/dashboard/src/app/(dashboard)/onboarding/client.tsx
+++ b/apps/dashboard/src/app/(dashboard)/onboarding/client.tsx
@@ -129,7 +129,17 @@ export function Client() {
);
useEffect(() => {
- if (callbackUrl) router.push(callbackUrl);
+ if (!callbackUrl) return;
+ // Ignore base URL redirects - only redirect for meaningful paths (e.g., /invite?token=...)
+ try {
+ const url = new URL(callbackUrl, window.location.origin);
+ if (url.pathname === "/" || url.pathname === "") return;
+ router.push(callbackUrl);
+ } catch {
+ // If callbackUrl is a relative path, check it directly
+ if (callbackUrl === "/" || callbackUrl === "") return;
+ router.push(callbackUrl);
+ }
}, [callbackUrl, router]);
return (
diff --git a/apps/dashboard/src/app/login/page.tsx b/apps/dashboard/src/app/login/page.tsx
index bc0677621..a6f8578be 100644
--- a/apps/dashboard/src/app/login/page.tsx
+++ b/apps/dashboard/src/app/login/page.tsx
@@ -34,7 +34,7 @@ export default async function Page(props: {
<form
action={async () => {
"use server";
- await signIn("github", { redirectTo });
+ await signIn("github", { redirectTo: redirectTo ?? undefined });
}}
className="w-full"
>
@@ -45,7 +45,7 @@ export default async function Page(props: {
<form
action={async () => {
"use server";
- await signIn("google", { redirectTo });
+ await signIn("google", { redirectTo: redirectTo ?? undefined });
}}
className="w-full"
>
diff --git a/apps/dashboard/src/app/login/search-params.ts b/apps/dashboard/src/app/login/search-params.ts
index 3447a1e24..474d2ffa5 100644
--- a/apps/dashboard/src/app/login/search-params.ts
+++ b/apps/dashboard/src/app/login/search-params.ts
@@ -1,7 +1,7 @@
import { createSearchParamsCache, parseAsString } from "nuqs/server";
export const searchParamsParsers = {
- redirectTo: parseAsString.withDefault("/"),
+ redirectTo: parseAsString,
};
export const searchParamsCache = createSearchParamsCache(searchParamsParsers);