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
2 changes: 1 addition & 1 deletion app/oauth/callback/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ export async function GET(request: NextRequest) {
});

// Redirect to the return URL
return NextResponse.redirect(new URL(returnUrl, request.url));
return NextResponse.redirect(new URL(returnUrl, baseUrl));
} catch (err) {
logger.error("OAuth callback error", err as Error, {
code: code ? "[present]" : "[missing]",
Expand Down
4 changes: 3 additions & 1 deletion proxy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ export function proxy(request: NextRequest) {
const token = request.cookies.get("token")?.value;

if (!token) {
const loginUrl = new URL("/login", request.url);
// Use configured base URL when behind a reverse proxy, falling back to request origin for local dev.
const baseUrl = process.env.APP_BASE_URL ?? request.nextUrl.origin;
const loginUrl = new URL("/login", baseUrl);
// Preserve the original URL for redirect after login (except for home page)
if (pathname !== "/") {
loginUrl.searchParams.set("redirect", encodeURIComponent(pathname));
Expand Down
Loading