mmintel/gridpilot.gg
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

website refactor

Browse Source
This commit is contained in:
Marc Mintel
2026-01-18 13:26:35 +01:00
parent 350c78504d
commit 0b301feb61
225 changed files with 1678 additions and 26666 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
apps/website/middleware.ts
View File

@@ -17,30 +17,30 @@ export async function middleware(request: NextRequest) {
const { pathname } = request.nextUrl;
const cookieHeader = request.headers.get('cookie') || '';
logger.info('[MIDDLEWARE] ========== REQUEST START ==========');
logger.info('[MIDDLEWARE] Request details', {
pathname,
method: request.method,
url: request.url,
cookieHeaderLength: cookieHeader.length,
cookiePreview: cookieHeader.substring(0, 100) + (cookieHeader.length > 100 ? '...' : '')
});
// logger.info('[MIDDLEWARE] ========== REQUEST START ==========');
// logger.info('[MIDDLEWARE] Request details', {
// pathname,
// method: request.method,
// url: request.url,
// cookieHeaderLength: cookieHeader.length,
// cookiePreview: cookieHeader.substring(0, 100) + (cookieHeader.length > 100 ? '...' : '')
// });
// Set x-pathname header for layout-level protection
const response = NextResponse.next();
response.headers.set('x-pathname', pathname);
// Get session
logger.info('[MIDDLEWARE] Fetching session...');
// logger.info('[MIDDLEWARE] Fetching session...');
const sessionGateway = new SessionGateway();
const session = await sessionGateway.getSessionFromRequest(request);
logger.info('[MIDDLEWARE] Session fetched', {
hasSession: !!session,
userId: session?.user?.userId,
role: session?.user?.role,
sessionData: session ? JSON.stringify(session, null, 2) : 'null'
});
// logger.info('[MIDDLEWARE] Session fetched', {
// hasSession: !!session,
// userId: session?.user?.userId,
// role: session?.user?.role,
// sessionData: session ? JSON.stringify(session, null, 2) : 'null'
// });
// Convert session to state machine format
const authSession = session ? {
@@ -49,62 +49,62 @@ export async function middleware(request: NextRequest) {
roles: session.user?.role ? [session.user.role] : ['driver']
} : null;
logger.info('[MIDDLEWARE] Auth session converted', {
authSession: authSession ? JSON.stringify(authSession, null, 2) : 'null'
});
// logger.info('[MIDDLEWARE] Auth session converted', {
// authSession: authSession ? JSON.stringify(authSession, null, 2) : 'null'
// });
// Debug: Log route classification
const isPublic = routeMatchers.isPublic(pathname);
const requiresRole = routeMatchers.requiresRole(pathname);
logger.info('[MIDDLEWARE] Route classification', {
path: pathname,
isPublic,
requiresRole
});
// logger.info('[MIDDLEWARE] Route classification', {
// path: pathname,
// isPublic,
// requiresRole
// });
// Use state machine to determine action
let result;
try {
logger.info('[MIDDLEWARE] Calling handleAuthFlow...');
// logger.info('[MIDDLEWARE] Calling handleAuthFlow...');
result = handleAuthFlow(authSession, pathname);
logger.info('[MIDDLEWARE] handleAuthFlow result', {
result: JSON.stringify(result, null, 2)
});
// logger.info('[MIDDLEWARE] handleAuthFlow result', {
// result: JSON.stringify(result, null, 2)
// });
} catch (error) {
logger.error('[MIDDLEWARE] Error in auth flow', error instanceof Error ? error : new Error(String(error)));
// Fallback: redirect to login if there's an error
return NextResponse.redirect(new URL(`/auth/login${SearchParamBuilder.auth(pathname)}`, request.url));
}
logger.info('[MIDDLEWARE] Decision summary', {
pathname,
hasSession: !!authSession,
role: authSession?.role,
shouldRedirect: result.shouldRedirect,
redirectUrl: result.redirectUrl
});
// logger.info('[MIDDLEWARE] Decision summary', {
// pathname,
// hasSession: !!authSession,
// role: authSession?.role,
// shouldRedirect: result.shouldRedirect,
// redirectUrl: result.redirectUrl
// });
if (result.shouldRedirect && result.redirectUrl) {
const redirectUrl = new URL(result.redirectUrl, request.url);
logger.info('[MIDDLEWARE] REDIRECTING', {
from: pathname,
to: redirectUrl.toString()
});
// logger.info('[MIDDLEWARE] REDIRECTING', {
// from: pathname,
// to: redirectUrl.toString()
// });
const redirectResponse = NextResponse.redirect(redirectUrl);
logger.info('[MIDDLEWARE] ========== REQUEST END (REDIRECT) ==========');
// logger.info('[MIDDLEWARE] ========== REQUEST END (REDIRECT) ==========');
return redirectResponse;
}
// Handle /sponsor root redirect (preserves cookies)
// Only reached if authenticated and allowed
if (pathname === '/sponsor') {
logger.info('[MIDDLEWARE] Redirecting /sponsor → /sponsor/dashboard');
// logger.info('[MIDDLEWARE] Redirecting /sponsor → /sponsor/dashboard');
return NextResponse.redirect(new URL('/sponsor/dashboard', request.url));
}
// All checks passed
logger.info('[MIDDLEWARE] ALLOWING ACCESS', { pathname });
logger.info('[MIDDLEWARE] ========== REQUEST END (ALLOW) ==========');
// logger.info('[MIDDLEWARE] ALLOWING ACCESS', { pathname });
// logger.info('[MIDDLEWARE] ========== REQUEST END (ALLOW) ==========');
return response;
}
@@ -119,8 +119,10 @@ export const config = {
* - _next/image (image optimization files)
* - _next/data (Next.js data requests)
* - favicon.ico (favicon file)
* - health (health check endpoint)
* - media (media assets)
* - Files with extensions (static assets)
*/
'/((?!_next/static|_next/image|_next/data|favicon.ico|.*\\.(?:svg|png|jpg|jpeg|gif|webp|mp4|webm|mov|avi)$).*)',
'/((?!_next/static|_next/image|_next/data|favicon.ico|health|media|.*\\.(?:svg|png|jpg|jpeg|gif|webp|mp4|webm|mov|avi)$).*)',
],
};