From c84b18faa82a83326a6c66d754d46a312a163c33 Mon Sep 17 00:00:00 2001 From: Ivan Rezchikov Date: Fri, 18 Sep 2026 01:50:22 +0300 Subject: [PATCH] fix: use FRONTEND_URL for redirects behind proxy --- docker-compose.yml | 1 + fancy-frontend/app/oauth/callback/route.ts | 6 ++++-- fancy-frontend/app/oauth/login/route.ts | 10 ++++------ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 844723c..a41979e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -60,6 +60,7 @@ services: restart: unless-stopped environment: BACKEND_URL: http://fancy_backend:8080 + FRONTEND_URL: ${FRONTEND_URL} KOTOSOFT_ID_AUTHORIZE_URL: ${KOTOSOFT_ID_AUTHORIZE_URL} KOTOSOFT_ID_TOKEN_URL: ${KOTOSOFT_ID_TOKEN_URL} CLIENT_ID: ${CLIENT_ID} diff --git a/fancy-frontend/app/oauth/callback/route.ts b/fancy-frontend/app/oauth/callback/route.ts index 97dc188..2fef317 100644 --- a/fancy-frontend/app/oauth/callback/route.ts +++ b/fancy-frontend/app/oauth/callback/route.ts @@ -11,9 +11,11 @@ export async function GET(req: Request) { const storedState = cookieStore.get("oauth_state")?.value; const verifier = cookieStore.get("oauth_verifier")?.value; + const origin = new URL(process.env.FRONTEND_URL ?? "http://localhost:3000").origin; + const fail = (reason: string) => { const response = NextResponse.redirect( - new URL(`/oauth/error?reason=${reason}`, url.origin) + new URL(`/oauth/error?reason=${reason}`, origin) ); response.cookies.delete("oauth_verifier"); response.cookies.delete("oauth_state"); @@ -47,7 +49,7 @@ export async function GET(req: Request) { const { session_token } = await sessionResponse.json(); - const response = NextResponse.redirect(new URL("/collections", url.origin)); + const response = NextResponse.redirect(new URL("/collections", origin)); response.cookies.set("session", session_token, { httpOnly: true, diff --git a/fancy-frontend/app/oauth/login/route.ts b/fancy-frontend/app/oauth/login/route.ts index b8e3d67..54f5ece 100644 --- a/fancy-frontend/app/oauth/login/route.ts +++ b/fancy-frontend/app/oauth/login/route.ts @@ -1,16 +1,14 @@ import { NextResponse } from "next/server"; -import { cookies, headers as fetchHeaders } from "next/headers"; +import { cookies } from "next/headers"; import { generateCodeVerifier, generateCodeChallenge, generateState } from "@/lib/pkce"; const FLOW_TTL = 60 * 10; +const origin = () => new URL(process.env.FRONTEND_URL ?? "http://localhost:3000").origin; + export async function GET() { if ((await cookies()).get("session")) { - const headers = await fetchHeaders(); - const protocol = headers.get("x-forwarded-proto") ?? "http"; - const host = headers.get("host"); - const origin = host ? `${protocol}://${host}` : "http://localhost:3000"; - return NextResponse.redirect(new URL("/", origin)); + return NextResponse.redirect(new URL("/", origin())); } const verifier = generateCodeVerifier();