From 8ab807aba239365903856c1bb3e1d1875de48538 Mon Sep 17 00:00:00 2001 From: Nils-Johan Gynther Date: Sun, 19 Apr 2026 21:49:15 +0200 Subject: [PATCH] fix: ta bort middleware.ts (Next.js 16 anvander proxy.ts), uppdatera matcher --- frontend/middleware.ts | 37 ------------------------------------- frontend/proxy.ts | 2 +- 2 files changed, 1 insertion(+), 38 deletions(-) delete mode 100644 frontend/middleware.ts diff --git a/frontend/middleware.ts b/frontend/middleware.ts deleted file mode 100644 index 31e0ed29..00000000 --- a/frontend/middleware.ts +++ /dev/null @@ -1,37 +0,0 @@ -import { NextResponse } from 'next/server'; -import { auth } from './auth'; - -export default auth((req) => { - const { pathname } = req.nextUrl; - - // Alltid tillgängliga sidor - const publicPaths = ['/login', '/register']; - if (publicPaths.some((p) => pathname.startsWith(p))) { - return NextResponse.next(); - } - - // Om ej inloggad, omdirigera till /login - if (!req.auth) { - const loginUrl = new URL('/login', req.url); - loginUrl.searchParams.set('callbackUrl', pathname); - return NextResponse.redirect(loginUrl); - } - - // Admin-sidor kräver admin-roll - if (pathname.startsWith('/admin')) { - const role = (req.auth.user as any)?.role; - if (role !== 'admin') { - return NextResponse.redirect(new URL('/', req.url)); - } - } - - return NextResponse.next(); -}); - -export const config = { - matcher: ['/((?!api|_next/static|_next/image|favicon.ico).*)'], -}; - -export const config = { - matcher: ['/((?!_next/static|_next/image|favicon.ico|api/auth).*)'], -}; diff --git a/frontend/proxy.ts b/frontend/proxy.ts index c5ca6fa4..e6c51006 100644 --- a/frontend/proxy.ts +++ b/frontend/proxy.ts @@ -29,5 +29,5 @@ export default auth((req) => { }); export const config = { - matcher: ['/((?!_next/static|_next/image|favicon.ico|api/auth).*)'], + matcher: ['/((?!api|_next/static|_next/image|favicon.ico).*)'], };