@@ -92,18 +159,10 @@ export const HeaderSidebar = ({ children }: HeaderSidebarProps) => {
{ routeGroup.title }
- {routeGroup.routes?.filter(filter).map(route =>
-
- {route.name}
- )
- }
+ {routeGroup.routes?.filter(filter).map(renderHeaderLink)}
- {routeGroup !== MAIN_ROUTES &&
- {MAIN_ROUTES.routes.filter(filter).map(route =>
- {route.name}
- )}
+ {routeGroup !== MAIN_ROUTES &&
+ {MAIN_ROUTES.routes.filter(filter).map(renderHeaderLink)}
}
@@ -123,5 +182,6 @@ export const HeaderSidebar = ({ children }: HeaderSidebarProps) => {
{children}
+ {/* end top navbar */}
)
};
diff --git a/src/components/providers.tsx b/src/components/providers.tsx
index fb827d1..fbe1c5d 100644
--- a/src/components/providers.tsx
+++ b/src/components/providers.tsx
@@ -1,9 +1,12 @@
import { ReactNode } from 'react';
import { auth } from '@/auth';
import { SessionProvider } from 'next-auth/react';
+import { CookiesProvider } from 'next-client-cookies/server';
export async function Providers({ children }: { children: ReactNode }) {
return (
- {children}
+
+ {children}
+
);
}
diff --git a/src/db.ts b/src/db.ts
index 4e84c8f..87d8087 100644
--- a/src/db.ts
+++ b/src/db.ts
@@ -3,6 +3,9 @@ import { createPool } from 'mysql2';
import { Generated, Kysely, MysqlDialect } from 'kysely';
const createDb = () => {
+ if (process.env.NEXT_RUNTIME === 'edge')
+ return null;
+
if ((globalThis as any).db)
return (globalThis as any).db as Kysely
;
@@ -26,4 +29,4 @@ export type GeneratedDB = {
}
};
-export const db = createDb();
+export const db = createDb()!;
diff --git a/src/middleware.ts b/src/middleware.ts
index 28b21ff..ed21d0a 100644
--- a/src/middleware.ts
+++ b/src/middleware.ts
@@ -1,9 +1,24 @@
import { NextRequest, NextResponse } from 'next/server';
+import { uncachedAuth } from '@/auth';
-export function middleware(request: NextRequest) {
+export const middleware = uncachedAuth((request: NextRequest) => {
const headers = new Headers(request.headers);
headers.set('x-path', request.nextUrl.basePath + request.nextUrl.pathname);
- return NextResponse.next({
+
+ const options: ResponseInit & { request: { headers: Headers; }; } = {
request: { headers }
- });
-}
+ };
+
+ if (request.nextUrl.pathname === '/') {
+ const newUrl = request.nextUrl.clone();
+ newUrl.pathname = request.auth?.user?.homepage ?? '/dashboard';
+ return NextResponse.rewrite(newUrl, options);
+ }
+
+ if (request.nextUrl.pathname === '/forbidden')
+ options.status = 403;
+ else if (request.nextUrl.pathname === '/auth/login' && request.nextUrl.searchParams.get('error'))
+ options.status = 401;
+
+ return NextResponse.next(options);
+});
diff --git a/src/routes.ts b/src/routes.ts
index 11d27f9..e00d378 100644
--- a/src/routes.ts
+++ b/src/routes.ts
@@ -1,18 +1,22 @@
import { UserPayload } from '@/types/user';
+import { UserPermissions } from '@/types/permissions';
export type UserOnly = boolean | keyof UserPayload;
-type Subroute = {
+export type Subroute = {
url: string,
name: string,
- userOnly?: UserOnly
+ userOnly?: UserOnly,
+ permissions?: (UserPermissions | UserPermissions[])[],
+ routes?: Omit[]
};
-type Route = {
+export type Route = {
url: string,
name: string,
title: string,
userOnly?: UserOnly,
+ permissions?: (UserPermissions | UserPermissions[])[],
routes: Subroute[]
};
@@ -26,6 +30,19 @@ export const MAIN_ROUTES: Route = {
}, {
url: '/arcade',
name: 'Arcades'
+ }, {
+ url: '/admin',
+ name: 'Admin',
+ permissions: [[UserPermissions.USERMOD, UserPermissions.SYSADMIN]],
+ routes: [{
+ url: '/admin/users',
+ name: 'Users',
+ permissions: [UserPermissions.USERMOD]
+ }, {
+ url: '/admin/system-config',
+ name: 'System Config',
+ permissions: [UserPermissions.SYSADMIN]
+ }]
}]
};
diff --git a/src/types/next-auth/index.d.ts b/src/types/next-auth/index.d.ts
index 59d09fe..c591cec 100644
--- a/src/types/next-auth/index.d.ts
+++ b/src/types/next-auth/index.d.ts
@@ -14,3 +14,12 @@ declare module 'next-auth' {
}
}
}
+
+declare module 'next/server' {
+ interface NextRequest {
+ auth: {
+ user: UserPayload,
+ expires: string
+ } | null
+ }
+}
\ No newline at end of file