diff --git a/middleware.ts b/middleware.ts index 27ea001..a9e061c 100644 --- a/middleware.ts +++ b/middleware.ts @@ -1,4 +1,5 @@ import { NextResponse, type NextRequest } from 'next/server'; + import { getURL } from './lib/utils'; /** @@ -26,7 +27,7 @@ export async function middleware(req: NextRequest) { return res; } - if (isAuth && req.nextUrl.pathname === '/logout') { + if (isAuth && req.nextUrl.pathname.includes('logout')) { res.cookies.set('token', '', { path: '/', expires: new Date(0) @@ -34,21 +35,15 @@ export async function middleware(req: NextRequest) { } if (isAuth && req.nextUrl.pathname.includes('sign')) { - return NextResponse.redirect(getURL('/dashboard/puzzles')); + return NextResponse.redirect(getURL('/dashboard')); } - - // TODO REMOVE - if (isAuth && req.nextUrl.pathname.match(/^\/dashboard\/?$/)) { - return NextResponse.redirect(getURL('/dashboard/puzzles')); - } - return res; } export const config = { matcher: [ // On exclut les routes de l'API, les fichiers statiques, les images, les assets, le favicon et le service worker. - '/((?!api|_next/static|_next/image|assets|favicon|sw.js).*)' + '/((?!api|_next/static|_next/image|favicon.ico|assets|sw.js).*)' ] };