finishing auth middleware

Author: Aayush-Agnihotri

src/app/api/authenticate/route.ts

@@ -0,0 +1,8 @@
+import { NextRequest, NextResponse } from 'next/server';
+
+export async function GET(request: NextRequest) {
+  // Middleware handles auth, if it succeeds return 200
+  console.log('GET /api/authenticate');
+  console.log(request.headers.get('uid'));
+  return NextResponse.json({ success: true });
+}

src/contexts/AuthContext.tsx

@@ -89,26 +89,26 @@ export const AuthProvider = ({ children }: { children: ReactNode }) => {
 
       try {
         const token = await currentUser.getIdToken();
-        const firebaseResponse = await fetch('/api/login', {
+        // Validate firebase token
+        const firebaseMiddlewareResponse = await fetch('/api/login', {
           headers: {
             Authorization: `Bearer ${token}`,
           }
         });
-
-        if (!firebaseResponse.ok) {
-          throw new Error(await firebaseResponse.text());
+        if (!firebaseMiddlewareResponse.ok) {
+          throw new Error(await firebaseMiddlewareResponse.text());
         }
 
-        const authenticateResponse = await fetch('/api/authenticate');
-
-        if (!authenticateResponse.ok) {
-          throw new Error(await authenticateResponse.text());
+        // Ensure user is in the database
+        const userResponse  = await fetch('/api/authenticate');
+        if (!userResponse.ok) {
+          throw new Error(await userResponse.text());
         }
 
         setUser(currentUser);
       } catch (error) {
         // TODO: Add toast to tell user there is an error
-        setError((error as Error).message);
+        setError(JSON.parse((error as Error).message).message);
         setUser(null);
       } finally {
         setLoading(false);

src/middleware.ts

@@ -27,13 +27,13 @@ export async function middleware(request: NextRequest) {
       const uid = decodedToken.uid;
 
       // TODO: Check if user is in the database
-      // if (true) {
-      //   const response = NextResponse.json({ error: 'You must be part of Cornell AppDev to use this app' }, { status: 401 });
-      //   response.cookies.set(process.env.AUTH_COOKIE_NAME!, '', {
-      //     expires: new Date(0),
-      //   });
-      //   return response;
-      // }
+      if (!decodedToken.email?.endsWith('@cornell.edu')) {
+        const response = NextResponse.json({ message: 'Only Cornell AppDev members can use this app' }, { status: 401 });
+        response.cookies.set(process.env.AUTH_COOKIE_NAME!, '', {
+          expires: new Date(0),
+        });
+        return response;
+      }
 
       const forwardedHeaders = new Headers(headers);
       forwardedHeaders.set('uid', uid);
@@ -53,10 +53,10 @@ export async function middleware(request: NextRequest) {
           }
         });
       }
-      return NextResponse.json({ error: `${message} - please login again` }, { status: 401 });
+      return NextResponse.json({ sucess: false, message: `${message} - please login again` }, { status: 401 });
     },
     handleError: async (error) => {
-      return NextResponse.json({ error: (error as Error).message }, { status: 500 });
+      return NextResponse.json({ success:false, message: (error as Error).message }, { status: 500 });
     }
   });
 }