Add basic middleware, prepare for API refactor

Author: WZWren

peerprep/api/gateway.ts

@@ -1,4 +1,4 @@
-import { SafeParseReturnType, SafeParseSuccess } from "zod";
+import { cookies } from "next/headers";
 import {
   Question,
   StatusBody,
@@ -7,43 +7,16 @@ import {
   SigninResponse,
 } from "./structs";
 
-const questions: { [key: string]: Question } = {
-  "0": {
-    id: 0,
-    difficulty: 2,
-    title: "Two Sum",
-    description:
-      "Given an array of integers, return indices of the two numbers such that they add up to a specific target.",
-    categories: ["Hash Table", "Array"],
-    test_cases: {
-      "[2, 7, 11, 15], 9": "[0, 1]",
-      "[3, 2, 4], 6": "[1, 2]",
-      "[3, 3], 6": "[0, 1]",
-    },
-  },
-  "1": {
-    id: 1,
-    difficulty: 1,
-    title: "Reverse Integer",
-    description: "Given a 32-bit signed integer, reverse digits of an integer.",
-    categories: ["Math"],
-    test_cases: {
-      "123": "321",
-      "1": "1",
-      "22": "22",
-    },
-  },
-};
+function generateJSONHeaders() {
+  return {
+    "Content-type": "application/json; charset=UTF-8",
+    "Authorization": `Bearer ${cookies().get("session")}`
+  }
+}
 
 export async function fetchQuestion(
   questionId: string
 ): Promise<Question | StatusBody> {
-  // remove this when services are up
-  if (process.env.DEV_ENV === "dev") {
-    return questions[questionId] === undefined
-      ? { error: "Question not found", status: 404 }
-      : questions[questionId];
-  }
   try {
     const response = await fetch(
       `${process.env.NEXT_PUBLIC_QUESTION_SERVICE}/questions/solve/${questionId}`

peerprep/app/actions/server_actions.ts

@@ -3,7 +3,6 @@ import { getSessionLogin, postSignupUser } from '@/api/gateway';
 // defines the server-sided login action.
 import { SignupFormSchema, LoginFormSchema, FormState, isError } from '@/api/structs';
 import { createSession } from '@/app/actions/session';
-import { cookies } from 'next/headers';
 import { redirect } from 'next/navigation';
 
 // credit - taken from Next.JS Auth tutorial
@@ -49,15 +48,8 @@ export async function login(state: FormState, formData: FormData) {
 
   const json = await getSessionLogin(validatedFields.data);
   if (!isError(json)) {
-    if (cookies().has('session')) {
-      console.log(cookies().get('session'));
-      console.log("Note a cookie already exists, overriding!");
-    }
     await createSession(json.data.accessToken);
-    
-    if (cookies().has('session')) {
-      console.log(`New cookie: ${cookies().get('session')?.value}`);
-    }
+    redirect("/questions");
   } else {
     console.log(json.error);
   }

peerprep/middleware.ts

@@ -0,0 +1,39 @@
+import { cookies } from 'next/headers'
+import { NextResponse } from 'next/server'
+import type { NextRequest } from 'next/server'
+
+function isNoSession(request: NextRequest): boolean {
+  return request.nextUrl.pathname.startsWith('/auth') && cookies().has("session");
+}
+
+function isSession(request: NextRequest): boolean {
+  return !request.nextUrl.pathname.startsWith('/auth') && !cookies().has("session");
+}
+
+export function middleware(request: NextRequest) {
+  if (isNoSession(request)) {
+    return NextResponse.redirect(new URL("/questions", request.url));
+  }
+ 
+  if (isSession(request)) {
+    return NextResponse.redirect(new URL("/auth/login", request.url));
+  }
+}
+
+// taken from Next.JS's Middleware tutorial
+export const config = {
+  matcher: [
+    /*
+     * Match all request paths except for the ones starting with:
+     * - api (API routes)
+     * - _next/static (static files)
+     * - _next/image (image optimization files)
+     * - favicon.ico, sitemap.xml, robots.txt (metadata files)
+     */
+    '/((?!api|_next/static|_next/image|favicon.ico|sitemap.xml|robots.txt).*)',
+    // We also want to match all internal API routes from the browser
+    // This allows us to inject the JWT token for client components, when
+    // they make a request to the route.
+    '/api/internal/:path*',
+  ],
+}