Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions src/app/auth/confirm/route.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import { describe, expect, it } from "vitest";
import { resolveMagicLinkRedirect } from "./route";

describe("resolveMagicLinkRedirect", () => {
const appUrl = "https://ugig.net";

it("preserves internal paths and query parameters", () => {
expect(resolveMagicLinkRedirect(appUrl, "/dashboard?tab=applications")).toBe(
"https://ugig.net/dashboard?tab=applications"
);
});

it.each([
["host-like value", "@example.com"],
["absolute URL", "https://example.com"],
["protocol-relative URL", "//example.com"],
["leading backslash", "\\example.com"],
["mixed slash URL", "/\\example.com"],
["empty string", ""],
])("falls back for %s", (_label, next) => {
expect(resolveMagicLinkRedirect(appUrl, next)).toBe("https://ugig.net/dashboard");
});

it("falls back when next is missing", () => {
expect(resolveMagicLinkRedirect(appUrl, null)).toBe("https://ugig.net/dashboard");
});
Comment thread
greptile-apps[bot] marked this conversation as resolved.
});
27 changes: 24 additions & 3 deletions src/app/auth/confirm/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,31 @@
import { NextRequest, NextResponse } from "next/server";
import { createClient } from "@/lib/supabase/server";

export function resolveMagicLinkRedirect(appUrl: string, next: string | null): string {
const fallback = new URL("/dashboard", appUrl);

if (!next?.startsWith("/")) {
return fallback.toString();
}

try {
const target = new URL(next, fallback.origin);
return target.origin === fallback.origin ? target.toString() : fallback.toString();
} catch {
return fallback.toString();
}
}

export async function GET(request: NextRequest) {
const { searchParams } = new URL(request.url);
const tokenHash = searchParams.get("token_hash");
const type = searchParams.get("type") as "signup" | "email" | "recovery" | "invite" | "magiclink" | null;
const type = searchParams.get("type") as
| "signup"
| "email"
| "recovery"
| "invite"
| "magiclink"
| null;
const next = searchParams.get("next");

const appUrl = process.env.NEXT_PUBLIC_APP_URL || "https://ugig.net";
Expand Down Expand Up @@ -48,8 +69,8 @@ export async function GET(request: NextRequest) {
}

// Magic link (OAuth flow) — go to next or dashboard
if (type === "magiclink" && next) {
return NextResponse.redirect(`${appUrl}${next}`);
if (type === "magiclink") {
return NextResponse.redirect(resolveMagicLinkRedirect(appUrl, next));
}

// Signup/email confirmation — go to login with success message
Expand Down
Loading