Merge branch 'room-fetching-rest' of https://github.com/CS3219-AY2425S1/cs3219-ay2425s1-project-g25 into room-fetching-rest

Author: njxue

backend/matching-service/.env.example

@@ -18,6 +18,8 @@ RELAXATION_INTERVAL=3000
 MATCH_TIMEOUT=30000
 CLEANUP_INTERVAL=75000
 
+JWT_ACCESS_TOKEN_SECRET=<your-jwt-accecss-token>
+
 # Copy root .env
 # If using mongoDB containerization, set to true. Else set to false (i.e local testing)
 DB_REQUIRE_AUTH=true

backend/matching-service/app.ts

@@ -25,13 +25,13 @@ const server = http.createServer(app);
 
 initSocket(server);
 
+app.use(express.json());
+
 app.use(cors({
     origin: true,
     credentials: true,
 }));
 
-app.use(express.json());
-
 app.use("/api/match", matchingRoutes);
 
 app.use(errorHandler);

backend/matching-service/routes/matchingRoutes.ts

@@ -2,7 +2,7 @@ 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';
+import { authenticateToken } from '../middlewares/auth';
 
 const router = express.Router();