diff --git a/src/app/api/auth/[auth0]/route.js b/src/app/api/auth/[auth0]/route.js deleted file mode 100644 index 1d2e4e4..0000000 --- a/src/app/api/auth/[auth0]/route.js +++ /dev/null @@ -1,3 +0,0 @@ -import { handleAuth } from '@auth0/nextjs-auth0'; - -export const GET = handleAuth(); diff --git a/src/app/layout.tsx b/src/app/layout.tsx index 3c90089..fc2e150 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -5,7 +5,6 @@ import { cn } from '@/lib/utils'; import { Toaster } from '@/components/ui/sonner'; import React from 'react'; import Navigation from '@/components/navigation'; -import { UserProvider } from '@auth0/nextjs-auth0/client'; const inter = Inter({subsets: ['latin']}); @@ -50,7 +49,6 @@ export default function RootLayout({ href="/logo_white.png" /> -
@@ -58,7 +56,6 @@ export default function RootLayout({
- ); } diff --git a/src/lib/auth.ts b/src/lib/auth.ts new file mode 100644 index 0000000..63457d2 --- /dev/null +++ b/src/lib/auth.ts @@ -0,0 +1,9 @@ +import { Auth0Client } from "@auth0/nextjs-auth0/server" + +export const auth0 = new Auth0Client({ + appBaseUrl: process.env.AUTH0_BASE_URL, + domain: process.env.AUTH0_ISSUER_BASE_URL, + secret: process.env.AUTH0_SECRET, + clientId: process.env.AUTH0_CLIENT_ID, + clientSecret: process.env.AUTH0_CLIENT_SECRET, +}) diff --git a/src/middleware.ts b/src/middleware.ts index c4d94f5..766325e 100644 --- a/src/middleware.ts +++ b/src/middleware.ts @@ -1,3 +1,22 @@ -import { withMiddlewareAuthRequired } from '@auth0/nextjs-auth0/edge'; +import { NextRequest } from 'next/server'; +import { auth0 } from '@/lib/auth'; -export default withMiddlewareAuthRequired(); +export async function middleware(request: NextRequest) { + try { + return await auth0.middleware(request); + } catch (error) { + console.error("Auth0 middleware error:", error); + } +} + +export const config = { + matcher: [ + /* + * Match all request paths except for the ones starting with: + * - _next/static (static files) + * - _next/image (image optimization files) + * - favicon.ico, sitemap.xml, robots.txt (metadata files) + */ + "/((?!_next/static|_next/image|favicon.ico|sitemap.xml|robots.txt).*)", + ], +}