diff --git a/app/actions/login.tsx b/app/actions/login.tsx index 7f7a36f..cb2dc34 100644 --- a/app/actions/login.tsx +++ b/app/actions/login.tsx @@ -1,19 +1,17 @@ "use server" +import { generatePkce, generateState } from "@/lib/auth/pkce"; import { pkceConfig } from "@/lib/cookieConfig"; -import crypto from "crypto" import { cookies } from "next/headers"; import { redirect } from "next/navigation"; export default async function login() { - const verifier = crypto.randomBytes(32).toString("base64url"); - const challenge = crypto.createHash("sha256").update(verifier).digest("base64url"); - const state = crypto.randomBytes(16).toString("hex"); + const { verifier, challenge } = generatePkce(); + const state = generateState(); const store = await cookies(); - - store.set("pkce_verifier", verifier, pkceConfig) - store.set("oauth_state", state, { ...pkceConfig, path: "/" }) + store.set("pkce_verifier", verifier, pkceConfig); + store.set("oauth_state", state, { ...pkceConfig, path: "/" }); const params = new URLSearchParams({ client_id: process.env.KOTOSOFT_ID_CLIENT_ID!, diff --git a/app/actions/logout.tsx b/app/actions/logout.tsx new file mode 100644 index 0000000..be135a4 --- /dev/null +++ b/app/actions/logout.tsx @@ -0,0 +1,9 @@ +"use server" + +import { deleteSession } from "@/lib/auth/session"; +import { redirect } from "next/navigation"; + +export default async function logout() { + await deleteSession(); + redirect("/"); +} \ No newline at end of file diff --git a/app/api/callback/route.ts b/app/api/callback/route.ts index 2e7c4af..a93c8af 100644 --- a/app/api/callback/route.ts +++ b/app/api/callback/route.ts @@ -1,90 +1,47 @@ import { cookies } from "next/headers"; import { NextRequest, NextResponse } from "next/server"; -import { deleteOAuthCookies, setTokens } from "@/lib/cookies"; -import { prisma } from "@/lib/prisma"; -import { setSessionCookie } from "@/lib/session"; -import { signJwt } from "@/lib/jwt"; -import { v4 as uuidv4 } from "uuid"; +import { deleteOAuthCookies, setTokens } from "@/lib/auth/tokens"; +import { createSession } from "@/lib/auth/session"; +import { exchangeCode, fetchKotosoftUser } from "@/lib/kotosoft/client"; +import { findOrCreateUser } from "@/lib/user/repository"; export async function GET(request: NextRequest) { - const searchParams = request.nextUrl.searchParams; - + const { searchParams } = request.nextUrl; const code = searchParams.get("code"); const state = searchParams.get("state"); if (!code || !state) { - return NextResponse.json({ status: 409, message: "Incorrect request" }); + return NextResponse.json({ message: "Incorrect request" }, { status: 409 }); } const store = await cookies(); - const codeVerifier = store.get("pkce_verifier")?.value; const savedState = store.get("oauth_state")?.value; if (!codeVerifier || !savedState || savedState !== state) { - return NextResponse.json({ status: 403, message: "Access denied" }); + return NextResponse.json({ message: "Access denied" }, { status: 403 }); } - const body = new URLSearchParams({ - grant_type: "authorization_code", - code, - redirect_uri: `${process.env.PUBLIC_URL}/api/callback`, - code_verifier: codeVerifier, - }); + try { + const tokens = await exchangeCode(code, codeVerifier); + await setTokens(tokens.access_token, tokens.refresh_token, tokens.expires_in); - const response = await fetch(`${process.env.KOTOSOFT_ID_API_URL}/oauth/token`, { - method: "POST", - headers: { - "Content-Type": "application/x-www-form-urlencoded", - Authorization: `Basic ${Buffer.from( - `${process.env.KOTOSOFT_ID_CLIENT_ID}:${process.env.KOTOSOFT_ID_CLIENT_SECRET}` - ).toString("base64")}`, - }, - body, - }); - - if (!response.ok) { - console.log(response) - return NextResponse.redirect(new URL("/callback/error", request.url)); - } - - const data = await response.json(); - - await setTokens(data.access_token, data.refresh_token, data.expires_in); - - const user = await fetch(`${process.env.KOTOSOFT_ID_API_URL}/api/v1/me`, { - headers: { - Authorization: `Bearer ${data.access_token}`, - }, - }); - const userData = await user.json(); - - var existingUser = await prisma.user.findUnique({ - where: { - kotosoftId: userData.id, - } - }); - - if (!existingUser) { - const createdUser = await prisma.user.create({ - data: { - id: uuidv4(), - kotosoftId: userData.id, - email: userData.email, - firstName: userData.first_name, - secondName: userData.second_name, - sex: userData.sex, - birthDate: userData.birth_date, - }, + const kotosoftUser = await fetchKotosoftUser(tokens.access_token); + const user = await findOrCreateUser({ + kotosoftId: kotosoftUser.id, + email: kotosoftUser.email, + firstName: kotosoftUser.first_name, + secondName: kotosoftUser.second_name, + sex: kotosoftUser.sex, + birthDate: kotosoftUser.birth_date, }); - existingUser = createdUser!; + await createSession(user.id); + await deleteOAuthCookies(); + + return NextResponse.redirect(new URL("/", request.url)); + } catch (e) { + console.error("OAuth callback error:", e); + return NextResponse.redirect(new URL("/callback/error", request.url)); } - - const token = await signJwt(existingUser.id); - - await setSessionCookie(token); - await deleteOAuthCookies(); - - return NextResponse.redirect(new URL("/", request.url)); } \ No newline at end of file diff --git a/components/header.tsx b/components/header.tsx index eeaa625..e63e91a 100644 --- a/components/header.tsx +++ b/components/header.tsx @@ -2,6 +2,7 @@ import Image from "next/image"; import { Button } from "./ui/button"; import login from "@/app/actions/login"; import { getCurrentUser } from "@/lib/user"; +import logout from "@/app/actions/logout"; export default async function Header() { const user = await getCurrentUser(); @@ -20,11 +21,9 @@ export default async function Header() { { user ? ( -