Resolve conflicts

Author: njxue

backend/matching-service/middlewares/auth.ts

@@ -1,21 +1,22 @@
-import { Request, Response, NextFunction } from 'express';
-import jwt from 'jsonwebtoken';
+import { Request, Response, NextFunction } from "express";
+import jwt from "jsonwebtoken";
 
 export interface AuthenticatedRequest extends Request {
   userId?: string;
 }
 
 export const authenticateToken = (req: AuthenticatedRequest, res: Response, next: NextFunction) => {
-  const authHeader = req.headers['authorization'];
+  const authHeader = req.headers["authorization"];
 
-  if (!authHeader) return res.status(401).json({ error: 'Authorization header missing' });
+  if (!authHeader) return res.status(401).json({ error: "Authorization header missing" });
 
-  const token = authHeader.split(' ')[1];
+  const token = authHeader.split(" ")[1];
 
-  if (!token) return res.status(401).json({ error: 'Token missing' });
+  if (!token) return res.status(401).json({ error: "Token missing" });
 
   jwt.verify(token, process.env.JWT_ACCESS_TOKEN_SECRET as string, (err, decoded: any) => {
-    if (err) return res.status(403).json({ error: 'Invalid token' });
+    console.log(err);
+    if (err) return res.status(403).json({ error: "Invalid token" });
 
     req.userId = decoded.id;
     next();

backend/matching-service/routes/matchingRoutes.ts

@@ -1,13 +1,12 @@
 import { getRoomDetails } from '../controllers/roomController';
 import { cancelMatch, startMatching } from '../controllers/matchingController';
 import express from 'express';
-import { verifyAccessToken } from '../middlewares/basic-access-control';
 import { authenticateToken } from '../middlewares/auth';
 
 const router = express.Router();
 
-router.post('/', authenticateToken, startMatching);
-router.delete('/:socketId', authenticateToken, cancelMatch)
-router.get('/room/:roomId', authenticateToken, getRoomDetails)
+router.post("/", authenticateToken, startMatching);
+router.delete("/:socketId", authenticateToken, cancelMatch);
+router.get("/room/:roomId", authenticateToken, getRoomDetails);
 
-export default router;
+export default router;