diff --git a/src/app/api/books/[bookId]/export/route.ts b/src/app/api/books/[bookId]/export/route.ts index 29b2663..010cf88 100644 --- a/src/app/api/books/[bookId]/export/route.ts +++ b/src/app/api/books/[bookId]/export/route.ts @@ -1,15 +1,15 @@ -import { auth } from "@/auth"; +import { getCurrentUser } from "@/lib/session"; import { prisma } from "@/lib/db"; export const dynamic = "force-dynamic"; export async function GET(_req: Request, { params }: { params: Promise<{ bookId: string }> }) { - const session = await auth(); - if (!session?.user?.id) return new Response("Unauthorized", { status: 401 }); + const user = await getCurrentUser(); + if (!user) return new Response("Unauthorized", { status: 401 }); const { bookId } = await params; const book = await prisma.book.findFirst({ - where: { id: bookId, ownerId: session.user.id }, + where: { id: bookId, ownerId: user.id }, include: { entities: true, relations: { include: { members: true } }, diff --git a/src/app/login/page.tsx b/src/app/login/page.tsx index 605cac5..1563361 100644 --- a/src/app/login/page.tsx +++ b/src/app/login/page.tsx @@ -1,13 +1,15 @@ import { redirect } from "next/navigation"; import { IconBook2 } from "@tabler/icons-react"; -import { auth, signIn } from "@/auth"; +import { signIn } from "@/auth"; import { authentikEnabled, devLoginEnabled } from "@/auth.config"; import { getT } from "@/i18n/server"; +import { getCurrentUser } from "@/lib/session"; export const metadata = { title: "Logga in" }; export default async function LoginPage() { - if ((await auth())?.user) redirect("/"); + // Bara en användare som finns i databasen skickas vidare, annars blir det en omdirigeringsloop + if (await getCurrentUser()) redirect("/"); const { t } = await getT(); return ( diff --git a/src/auth.config.ts b/src/auth.config.ts index 7f55aa7..ba40fcc 100644 --- a/src/auth.config.ts +++ b/src/auth.config.ts @@ -42,6 +42,7 @@ export default { }, session({ session, token }) { if (token.uid && session.user) session.user.id = token.uid as string; + if (token.xid && session.user) session.user.externalId = token.xid as string; return session; }, }, diff --git a/src/auth.ts b/src/auth.ts index a31193e..525b363 100644 --- a/src/auth.ts +++ b/src/auth.ts @@ -4,7 +4,8 @@ import { prisma } from "@/lib/db"; declare module "next-auth" { interface Session { - user: { id: string } & DefaultSession["user"]; + // externalId används för att återskapa användaren om databasen byts ut under en pågående inloggning + user: { id: string; externalId?: string } & DefaultSession["user"]; } } @@ -22,6 +23,7 @@ export const { handlers, auth, signIn, signOut } = NextAuth({ create: { externalId, name: user.name ?? null, email: user.email ?? null }, }); token.uid = dbUser.id; + token.xid = externalId; } return token; }, diff --git a/src/lib/session.ts b/src/lib/session.ts index 93d3c22..5ceec83 100644 --- a/src/lib/session.ts +++ b/src/lib/session.ts @@ -1,11 +1,34 @@ +import { cache } from "react"; import { notFound, redirect } from "next/navigation"; import { auth } from "@/auth"; import { prisma } from "./db"; -export async function requireUser() { +/** + * Inloggad användare som verkligen finns i databasen, annars null. + * En inloggningscookie kan överleva att databasen byts ut (t.ex. från dev till prod med samma adress och + * hemlighet). Då återskapas användaren från Authentik-kontot om det går, annars måste man logga in igen. + */ +export const getCurrentUser = cache(async () => { const session = await auth(); - if (!session?.user?.id) redirect("/login"); - return session.user; + const sessionUser = session?.user; + if (!sessionUser?.id) return null; + + const found = await prisma.user.findUnique({ where: { id: sessionUser.id } }); + if (found) return { ...sessionUser, id: found.id }; + + if (!sessionUser.externalId) return null; + const created = await prisma.user.upsert({ + where: { externalId: sessionUser.externalId }, + update: {}, + create: { externalId: sessionUser.externalId, name: sessionUser.name ?? null, email: sessionUser.email ?? null }, + }); + return { ...sessionUser, id: created.id }; +}); + +export async function requireUser() { + const user = await getCurrentUser(); + if (!user) redirect("/login"); + return user; } /** Hämtar boken om den tillhör inloggad användare, annars 404. */