feat: add auth0 middleware

README.md

@@ -1,9 +1,4 @@
-# Water utility portal
+# Auth0 demo
-
-## To do
-
-- [ ] Get premium Vercel account for database
-- [ ] Add middleware for authentication
 
 ## Commands
 

app/api/protected/customer-form/[id]/route.ts

@@ -1,22 +1,26 @@
-import { getSession, withApiAuthRequired } from '@auth0/nextjs-auth0';
+import { getSession } from '@auth0/nextjs-auth0';
 import prisma from '@prisma/prisma';
 import { createErrorResponse } from '@utils/createErrorResponse';
 import { validateApiRequestContext } from '@utils/validateApiRequestContext';
-import { NextResponse } from 'next/server';
+import { NextRequest, NextResponse } from 'next/server';
 
-export const GET = withApiAuthRequired(async (_, context) => {
+export async function GET(
+  request: NextRequest,
+  context: { params: { id: string } }
+) {
   const session = await getSession();
+  if (!session || !session.user) {
+    return createErrorResponse('Unauthorized', 401);
+  }
 
   let params;
-
   try {
     params = validateApiRequestContext(context);
   } catch (error) {
     return createErrorResponse('Internal server error', 500);
   }
 
-  const userEmail = session?.user?.email;
+  const userEmail = session.user.email;
-
   if (!userEmail) {
     return createErrorResponse('Session not found or invalid', 401);
   }
@@ -45,24 +49,30 @@ export const GET = withApiAuthRequired(async (_, context) => {
     console.error('Error fetching customer form:', error);
     return createErrorResponse('Internal server error', 500);
   }
-});
+}
 
-export const DELETE = withApiAuthRequired(async (_, context) => {
+export async function DELETE(
+  request: NextRequest,
+  context: { params: { id: string } }
+) {
   const session = await getSession();
+  if (!session || !session.user) {
+    return createErrorResponse('Unauthorized', 401);
+  }
 
   let params;
-
   try {
     params = validateApiRequestContext(context);
   } catch (error) {
     return createErrorResponse('Internal server error', 500);
   }
 
+  try {
     const result = await prisma.customerForm.delete({
       where: {
         id: params.id,
         createdBy: {
-        email: session?.user.email
+          email: session.user.email
         }
       }
     });
@@ -75,4 +85,8 @@ export const DELETE = withApiAuthRequired(async (_, context) => {
     }
 
     return NextResponse.json({ success: true });
-});
+  } catch (error) {
+    console.error('Error deleting customer form:', error);
+    return createErrorResponse('Internal server error', 500);
+  }
+}

app/api/protected/customer-form/route.ts

@@ -1,9 +1,9 @@
-import { getSession, withApiAuthRequired } from '@auth0/nextjs-auth0';
+import { getSession } from '@auth0/nextjs-auth0';
 import { CustomerForm } from '@prisma/client';
 import prisma from '@prisma/prisma';
-import { NextResponse } from 'next/server';
+import { NextRequest, NextResponse } from 'next/server';
 
-export const GET = withApiAuthRequired(async () => {
+export async function GET() {
   const session = await getSession();
 
   try {
@@ -25,9 +25,9 @@ export const GET = withApiAuthRequired(async () => {
       { status: 500 }
     );
   }
-});
+}
 
-export const POST = withApiAuthRequired(async request => {
+export async function POST(request: NextRequest) {
   try {
     const session = await getSession();
 
@@ -59,4 +59,4 @@ export const POST = withApiAuthRequired(async request => {
       { status: 500 }
     );
   }
-});
+}

app/api/protected/profile/route.ts

@@ -1,12 +1,12 @@
 import { NextResponse } from 'next/server';
 
-import { getSession, withApiAuthRequired } from '@auth0/nextjs-auth0';
+import { getSession } from '@auth0/nextjs-auth0';
 
-export const GET = withApiAuthRequired(async () => {
+export async function GET() {
   const session = await getSession();
 
   return NextResponse.json({
     success: true,
     data: { email: session?.user.email }
   });
-});
+}

app/customer-form/[id]/page.tsx

@@ -1,12 +1,11 @@
 'use client';
 
-import { withPageAuthRequired } from '@auth0/nextjs-auth0/client';
 import { CustomerForm, CustomerFormSchema } from '@utils/types';
 import axios from 'axios';
 import { useRouter } from 'next/navigation';
 import { useEffect, useState } from 'react';
 
-export default withPageAuthRequired(function SingleCustomerForm({
+export default function SingleCustomerForm({
   params
 }: {
   params: { id: string };
@@ -75,4 +74,4 @@ export default withPageAuthRequired(function SingleCustomerForm({
       </button>
     </div>
   );
-});
+}

app/customer-form/page.tsx

@@ -1,6 +1,5 @@
 'use client';
 
-import { withPageAuthRequired } from '@auth0/nextjs-auth0/client';
 import { Button } from '@components/Button';
 import { FormControl } from '@components/FormControl';
 import { FormMessage } from '@components/FormMessage';
@@ -21,7 +20,7 @@ import { useRouter } from 'next/navigation';
 import { useEffect, useState } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 
-export default withPageAuthRequired(function CustomerForms() {
+export default function CustomerForms() {
   const router = useRouter();
   const [customerForms, setCustomerForms] = useState<CustomerForm[]>([]);
 
@@ -139,4 +138,4 @@ export default withPageAuthRequired(function CustomerForms() {
       </div>
     </div>
   );
-});
+}

middleware.ts

@@ -0,0 +1,14 @@
+import { withMiddlewareAuthRequired } from '@auth0/nextjs-auth0/edge';
+import { NextResponse } from 'next/server';
+
+export default withMiddlewareAuthRequired({
+  async middleware() {
+    const res = NextResponse.next();
+    return res;
+  },
+  returnTo: '/api/auth/login'
+});
+
+export const config = {
+  matcher: ['/api/protected/:path*', '/customer-form/:path*']
+};