configure admin middleware

Author: Kurtyjlee

peerprep-fe/src/app/(main)/page.tsx

@@ -1,6 +1,6 @@
 'use client';
-import LoggedIn from './components/LoggedIn';
+import MainComponent from './components/Main';
 
 export default function Home() {
-  return <LoggedIn />;
+  return <MainComponent />;
 }

peerprep-fe/src/app/signin/page.tsx

@@ -6,7 +6,7 @@ import { Input } from '@/components/ui/input';
 import Link from 'next/link';
 import { GithubIcon } from 'lucide-react';
 import { Alert, AlertDescription, AlertTitle } from '@/components/ui/alert';
-import { axiosUserClient } from '@/network/axiosClient';
+import { axiosAuthClient } from '@/network/axiosClient';
 import { login } from '@/lib/auth';
 import { useRouter } from 'next/navigation';
 import { useAuthStore } from '@/state/useAuthStore';
@@ -23,7 +23,7 @@ export default function LoginForm() {
     e.preventDefault();
     setError('');
 
-    const result = await axiosUserClient.post('/auth/login', {
+    const result = await axiosAuthClient.post('/auth/login', {
       email: email,
       password: password,
     });

peerprep-fe/src/middleware.ts

@@ -1,15 +1,41 @@
 import { NextResponse } from 'next/server';
 import type { NextRequest } from 'next/server';
+import axios from 'axios';
 
 // This function can be marked `async` if using `await` inside
-export function middleware(request: NextRequest) {
+export async function middleware(request: NextRequest) {
   const token = request.cookies.get('access-token');
 
   // Check if token exists
-  if (token && token.value) {
-    return NextResponse.next();
+  if (!token) {
+    return NextResponse.redirect(new URL('/signin', request.url)); // Ensure redirection response is returned
   }
-  return NextResponse.redirect(new URL('/signin', request.url));
+
+  // Check if accessing /admin route
+  if (request.nextUrl.pathname.startsWith('/admin')) {
+    try {
+      const res = await axios.get(
+        'http://localhost:3001/api/v1/auth/verify-token',
+        {
+          headers: {
+            Authorization: `Bearer ${token.value}`,
+          },
+        },
+      );
+      console.log(res.status);
+
+      // Check if the response is valid
+      if (res.status !== 200) {
+        return NextResponse.redirect(new URL('/', request.url)); // Redirect in case of error
+      }
+    } catch (error) {
+      console.error('Error verifying token:', error);
+      return NextResponse.redirect(new URL('/', request.url)); // Redirect on error
+    }
+  }
+
+  // Continue to the next middleware or route handler
+  return NextResponse.next();
 }
 
 export const config = {

peerprep-fe/src/network/axiosClient.ts

@@ -10,7 +10,7 @@ const axiosQuestionClient = axios.create({
   },
 });
 
-const axiosUserClient = axios.create({
+const axiosAuthClient = axios.create({
   baseURL:
     process.env.NEXT_PUBLIC_USER_SERVICE_URL || 'http://localhost:3001/api/v1',
   headers: {
@@ -30,6 +30,18 @@ axiosQuestionClient.interceptors.request.use(
   (error) => Promise.reject(error),
 );
 
+axiosAuthClient.interceptors.request.use(
+  (config) => {
+    const token = getCookie('access-token');
+    console.log('token', token);
+    if (token) {
+      config.headers['Authorization'] = `Bearer ${token}`;
+    }
+    return config;
+  },
+  (error) => Promise.reject(error),
+);
+
 // // TODO: Add response interceptors as needed
 // axiosClient.interceptors.response.use(
 //   (response) => response,
@@ -42,4 +54,4 @@ axiosQuestionClient.interceptors.request.use(
 //   },
 // );
 
-export { axiosQuestionClient, axiosUserClient };
+export { axiosQuestionClient, axiosAuthClient };