From 11ea947454fa8be0663881c00f0c0098c1b06b89 Mon Sep 17 00:00:00 2001 From: Taken Date: Thu, 26 Jun 2025 12:14:13 +0200 Subject: [PATCH] Updated auth --- src/lib/auth/auth.ts | 4 +++- src/middleware.ts | 21 +++++++-------------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/src/lib/auth/auth.ts b/src/lib/auth/auth.ts index f8fec01..48d4db2 100644 --- a/src/lib/auth/auth.ts +++ b/src/lib/auth/auth.ts @@ -3,12 +3,14 @@ import { drizzleAdapter } from "better-auth/adapters/drizzle" import { genericOAuth } from "better-auth/plugins" import { db } from "../drizzle/db" import { env } from "../env/server" +import { nextCookies } from "better-auth/next-js" export const auth = betterAuth({ database: drizzleAdapter(db, { provider: "pg" }), plugins: [ + nextCookies(), genericOAuth({ config: [{ providerId: "authentik", @@ -16,6 +18,6 @@ export const auth = betterAuth({ clientSecret: env.AUTHENTIK_CLIENT_SECRET, discoveryUrl: env.AUTHENTIK_DISCOVERY_URL }] - }) + }), ] }) diff --git a/src/middleware.ts b/src/middleware.ts index fd4b54e..7438877 100644 --- a/src/middleware.ts +++ b/src/middleware.ts @@ -1,20 +1,13 @@ -import { NextRequest, NextResponse } from "next/server" -import { auth } from "./lib/auth/auth" +import { NextRequest, NextResponse } from "next/server"; +import { getSessionCookie } from "better-auth/cookies"; export async function middleware(request: NextRequest) { - const { nextUrl, headers, url } = request - - if (nextUrl.pathname.startsWith('/dashboard')) { - const session = await auth.api.getSession({ - headers: headers - }) - - if (!session) { - return NextResponse.redirect(new URL('/sign-in', url)) - } + const sessionCookie = getSessionCookie(request); + if (!sessionCookie) { + return NextResponse.redirect(new URL("/", request.url)); } - return NextResponse.next() + return NextResponse.next(); } -export const config = { matcher: ['/dashboard/:path*'] } +export const config = { matcher: ["/dashboard"] }; \ No newline at end of file