diff --git a/app/api/callback/route.ts b/app/api/callback/route.ts index b79ef99..f0bb943 100644 --- a/app/api/callback/route.ts +++ b/app/api/callback/route.ts @@ -21,6 +21,14 @@ function checkRateLimit(ip: string): boolean { } export async function GET(request: NextRequest) { + const url = process.env.PUBLIC_URL; + if (url) { + const requestOrigin = request.nextUrl.origin; + if (requestOrigin !== url) { + return NextResponse.json({ message: "Access denied" }, { status: 403 }); + } + } + const ip = request.headers.get("x-forwarded-for") ?? request.headers.get("x-real-ip") ?? "unknown"; if (!checkRateLimit(ip)) { return NextResponse.json({ message: "Too many requests" }, { status: 429 }); @@ -43,10 +51,19 @@ export async function GET(request: NextRequest) { } try { + console.log("1. exchangeCode start"); const tokens = await exchangeCode(code, codeVerifier); - await setTokens(tokens.access_token, tokens.refresh_token, tokens.expires_in); + console.log("2. tokens obtained"); + console.log("3. setTokens start"); + await setTokens(tokens.access_token, tokens.refresh_token, tokens.expires_in); + console.log("4. setTokens done"); + + console.log("5. fetchKotosoftUser start"); const kotosoftUser = await fetchKotosoftUser(tokens.access_token); + console.log("6. user fetched", kotosoftUser); + + console.log("7. findOrCreateUser start"); const user = await findOrCreateUser({ kotosoftId: kotosoftUser.id, email: kotosoftUser.email, @@ -56,13 +73,20 @@ export async function GET(request: NextRequest) { birthDate: kotosoftUser.birth_date, isAdmin: false, }); + console.log("8. user created/updated", user); + console.log("9. createSession start"); await createSession(user.id); - await deleteOAuthCookies(); + console.log("10. session created"); - return NextResponse.redirect(new URL("/account", request.url)); + console.log("11. deleteOAuthCookies start"); + await deleteOAuthCookies(); + console.log("12. done"); + + return NextResponse.redirect("/account"); } catch (e) { console.error("OAuth callback error:", e); - return NextResponse.redirect(new URL("/callback/error", request.url)); + console.error("Stack trace:", e instanceof Error ? e.stack : "No stack"); + return NextResponse.redirect("/callback/error"); } -} +} \ No newline at end of file