diff --git a/app/api/callback/route.ts b/app/api/callback/route.ts index c99a51a..34885b6 100644 --- a/app/api/callback/route.ts +++ b/app/api/callback/route.ts @@ -23,6 +23,17 @@ function checkRateLimit(ip: string): boolean { export async function GET(request: NextRequest) { const baseUrl = process.env.PUBLIC_URL || request.nextUrl.origin; + + // IT BLOCKS! + // 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 }); @@ -45,19 +56,11 @@ export async function GET(request: NextRequest) { } try { - console.log("1. exchangeCode start"); const tokens = await exchangeCode(code, codeVerifier); - 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, @@ -67,15 +70,9 @@ 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); - console.log("10. session created"); - - console.log("11. deleteOAuthCookies start"); await deleteOAuthCookies(); - console.log("12. done"); return NextResponse.redirect(new URL("/account", baseUrl)); } catch (e) { diff --git a/lib/user/actions.ts b/lib/user/actions.ts index 73dddc4..72d59ea 100644 --- a/lib/user/actions.ts +++ b/lib/user/actions.ts @@ -30,6 +30,7 @@ export async function login() { state, }); + //Frontend public url, not api. And wtf I need to dubplicate it all redirect(`${process.env.KOTOSOFT_ID_API_PUBLIC_URL}/oauth/authorize?${params}`); }