Add verifytoken check for qn history

-Add verifytoken check before creating and updating question history
-Removing unnecessary API
-fix bug with hasSubmitted

Author: feliciagan

backend/collab-service/src/api/questionHistoryService.ts

@@ -17,17 +17,26 @@ export const createQuestionHistory = (
   title: string,
   submissionStatus: string,
   code: string,
-  language: string
+  language: string,
+  authToken: string
 ) => {
   const dateAttempted = new Date();
-  return qnHistoryService.post("/", {
-    userIds,
-    questionId,
-    title,
-    submissionStatus,
-    dateAttempted,
-    timeTaken: 0,
-    code,
-    language,
-  });
+  return qnHistoryService.post(
+    "/",
+    {
+      userIds,
+      questionId,
+      title,
+      submissionStatus,
+      dateAttempted,
+      timeTaken: 0,
+      code,
+      language,
+    },
+    {
+      headers: {
+        Authorization: authToken,
+      },
+    }
+  );
 };

backend/collab-service/src/handlers/websocketHandler.ts

@@ -71,13 +71,16 @@ export const handleWebsocketCollabEvents = (socket: Socket) => {
       const isPartnerReady = partnerReadiness.get(roomId);
 
       if (isPartnerReady && doc.getText().length === 0) {
+        const token =
+          socket.handshake.headers.authorization || socket.handshake.auth.token;
         createQuestionHistory(
           [uid1, uid2],
           qnId,
           qnTitle,
           "Attempted",
           template,
-          language
+          language,
+          token
         )
           .then((res) => {
             doc.transact(() => {

backend/matching-service/src/api/questionHistoryService.ts

@@ -4,6 +4,9 @@ SERVICE_PORT=3006
 # Origins for cors
 ORIGINS=http://localhost:5173,http://127.0.0.1:5173
 
+# Other services
+USER_SERVICE_URL=http://user-service:3001/api
+
 # Tests
 MONGO_URI_TEST=mongodb://mongo:mongo@test-mongo:27017/
 

backend/qn-history-service/.env.sample

@@ -0,0 +1,12 @@
+import axios from "axios";
+import dotenv from "dotenv";
+
+dotenv.config();
+
+const USER_SERVICE_URL =
+  process.env.USER_SERVICE_URL || "http://user-service:3001/api";
+
+export const userClient = axios.create({
+  baseURL: USER_SERVICE_URL,
+  withCredentials: true,
+});

backend/qn-history-service/src/api/userService.ts

@@ -83,31 +83,6 @@ export const updateQnHistory = async (
   }
 };
 
-export const deleteQnHistory = async (
-  req: Request,
-  res: Response
-): Promise<void> => {
-  try {
-    const { id } = req.params;
-
-    if (!id.match(MONGO_OBJ_ID_FORMAT)) {
-      res.status(400).json({ message: MONGO_OBJ_ID_MALFORMED_MESSAGE });
-      return;
-    }
-
-    const currQnHistory = await QnHistory.findById(id);
-    if (!currQnHistory) {
-      res.status(404).json({ message: QN_HIST_NOT_FOUND_MESSAGE });
-      return;
-    }
-
-    await QnHistory.findByIdAndDelete(id);
-    res.status(200).json({ message: QN_HIST_DELETED_MESSAGE });
-  } catch (error) {
-    res.status(500).json({ message: SERVER_ERROR_MESSAGE, error });
-  }
-};
-
 type QnHistListParams = {
   page: string;
   qnHistLimit: string;

backend/qn-history-service/src/controllers/questionHistoryController.ts

@@ -0,0 +1,17 @@
+import { NextFunction, Response, Request } from "express";
+import { userClient } from "../api/userService";
+
+export const verifyToken = (
+  req: Request,
+  res: Response,
+  next: NextFunction
+) => {
+  const authHeader = req.headers.authorization;
+  userClient
+    .get("/auth/verify-token", { headers: { Authorization: authHeader } })
+    .then(() => next())
+    .catch((err) => {
+      console.log(err.response);
+      return res.status(err.response.status).json(err.response.data);
+    });
+};

backend/qn-history-service/src/middlewares/basicAccessControl.ts

@@ -1,22 +1,20 @@
 import express from "express";
 import {
   createQnHistory,
-  deleteQnHistory,
   readQnHistIndiv,
   readQnHistoryList,
   updateQnHistory,
 } from "../controllers/questionHistoryController";
+import { verifyToken } from "../middlewares/basicAccessControl";
 
 const router = express.Router();
 
-router.post("/", createQnHistory);
+router.post("/", verifyToken, createQnHistory);
 
-router.put("/:id", updateQnHistory);
+router.put("/:id", verifyToken, updateQnHistory);
 
 router.get("/", readQnHistoryList);
 
 router.get("/:id", readQnHistIndiv);
 
-router.delete("/:id", deleteQnHistory);
-
 export default router;

backend/qn-history-service/src/routes/questionHistoryRoutes.ts

@@ -2,8 +2,6 @@ export const QN_HIST_CREATED_MESSAGE = "Question history created successfully.";
 
 export const QN_HIST_NOT_FOUND_MESSAGE = "Question history not found.";
 
-export const QN_HIST_DELETED_MESSAGE = "Question history deleted successfully.";
-
 export const SERVER_ERROR_MESSAGE = "Server error.";
 
 export const QN_HIST_RETRIEVED_MESSAGE =

backend/qn-history-service/src/utils/constants.ts

@@ -255,40 +255,6 @@ paths:
             application/json:
               schema:
                 $ref: "#/definitions/ServerError"
-    delete:
-      tags:
-        - qnhistories
-      summary: Deletes a question history
-      description: Deletes a question history
-      parameters:
-        - in: path
-          name: id
-          type: string
-          required: true
-          description: Question history id
-      responses:
-        200:
-          description: Successful Response
-          content:
-            application/json:
-              schema:
-                type: object
-                properties:
-                  message:
-                    type: string
-                    description: Message
-        404:
-          description: Question History Not Found
-          content:
-            application/json:
-              schema:
-                $ref: "#/definitions/Error"
-        500:
-          description: Internal Server Error
-          content:
-            application/json:
-              schema:
-                $ref: "#/definitions/ServerError"
     get:
       tags:
         - qnhistories