fix: JWT Backend Storage, JWT Bugs

.prettierrc.json

@@ -1 +1,3 @@
-{}
+{
+  "endOfLine": "lf"
+}

backend/api-gateway/Dockerfile

@@ -1,8 +1,8 @@
-FROM nginx
-
-WORKDIR /app
-
-COPY nginx.conf .
-
-CMD ["nginx", "-c", "/app/nginx.conf", "-g", "daemon off;"]
-
+FROM nginx
+
+WORKDIR /app
+
+COPY nginx.conf .
+
+CMD ["nginx", "-c", "/app/nginx.conf", "-g", "daemon off;"]
+

backend/collaboration-service/Dockerfile.prod

@@ -1,16 +1,16 @@
-FROM node:18
-
-WORKDIR /usr/src/app
-
-RUN npm install -g nodemon
-RUN npm install -g ts-node
-
-COPY package*.json ./
-
-RUN npm install
-
-COPY . .
-
-EXPOSE 8082
-
+FROM node:18
+
+WORKDIR /usr/src/app
+
+RUN npm install -g nodemon
+RUN npm install -g ts-node
+
+COPY package*.json ./
+
+RUN npm install
+
+COPY . .
+
+EXPOSE 8082
+
 CMD ["ts-node", "./app.ts"]

backend/collaboration-service/app.ts

@@ -22,7 +22,7 @@ const SOCKET_IO_PORT =
   (process.env.SOCKET_IO_PORT as string) || (process.env.PORT as string);
 
 const setupWSConnection = require("y-websocket/bin/utils").setupWSConnection;
-
+ 
 const mongoose = require("mongoose");
 mongoose.connect(process.env.MONGODB_URL, {
   useNewUrlParser: true,

backend/matching-service/Dockerfile

@@ -1,16 +1,16 @@
-FROM node:18
-
-RUN npm install -g nodemon
-
-WORKDIR /usr/src/app
-
-COPY package*.json ./
-
-RUN npm install --frozen-lockfile
-
-COPY . .
-
-EXPOSE 9000
-
-CMD ["npm", "start"]
-
+FROM node:18
+
+RUN npm install -g nodemon
+
+WORKDIR /usr/src/app
+
+COPY package*.json ./
+
+RUN npm install --frozen-lockfile
+
+COPY . .
+
+EXPOSE 9000
+
+CMD ["npm", "start"]
+

backend/question-service/src/middleware/authMiddleware.ts

@@ -1,16 +1,23 @@
 import { Request, Response, NextFunction } from "express";
 import { authenticateAccessToken } from "../utils/jwt";
 
-interface User {
+export interface User {
   id: number;
+  password: string;
   username: string;
   email: string;
   role: string;
-  languages: string[];
+  languages: { id: number; language: string }[];
+  githubId?: number;
 }
 
-interface JwtPayload {
-  user: User;
+export interface UserWithoutPassword {
+  id: number;
+  role: string;
+}
+
+export interface JwtPayload {
+  user: UserWithoutPassword;
   exp: number;
   iat: number;
 }
@@ -21,10 +28,6 @@ export async function verifyAccessToken(
   res: Response,
   next: NextFunction,
 ) {
-  if (req.cookies["serverToken"] == process.env.SERVER_SECRET) {
-    next();
-    return;
-  }
   const accessToken = req.cookies["accessToken"]; // If JWT token is stored in a cookie
 
   if (!accessToken) {