Fix question id not retrieving bug

Author: jq1836

docker-compose.yml

@@ -1,4 +1,25 @@
 services:
+  api-gateway:
+    image: nginx:1.26
+    volumes:
+      - ./api-gateway/templates:/etc/nginx/templates
+      - ./api-gateway/nginx.conf:/etc/nginx/nginx.conf
+    ports:
+      - $API_GATEWAY_PORT:$API_GATEWAY_PORT
+    environment:
+      - PORT=$API_GATEWAY_PORT
+      - FRONTEND_PORT=$FRONTEND_PORT
+      - USER_SVC_PORT=$USER_SVC_PORT
+      - QUESTION_SVC_PORT=$QUESTION_SVC_PORT
+      - MATCHING_SVC_PORT=$MATCHING_SVC_PORT
+      - COLLAB_SVC_PORT=$COLLAB_SVC_PORT
+    depends_on:
+      - frontend
+      - user-service
+      - question-service
+      - matching-service
+      - collab-service
+
   frontend:
     build:
       context: ./frontend
@@ -7,10 +28,8 @@ services:
         - API_GATEWAY_PORT=$API_GATEWAY_PORT
     environment:
       - PORT=$FRONTEND_PORT
-    ports:
-      - $FRONTEND_PORT:$FRONTEND_PORT
-    networks:
-      - hidden
+    expose:
+      - $FRONTEND_PORT
 
   question-service:
     build:
@@ -19,10 +38,8 @@ services:
       - PORT=$QUESTION_SVC_PORT
       - DB_URI=$QUESTION_SVC_DB_URI
       - FRONTEND_PORT=$FRONTEND_PORT
-    ports:
-      - $QUESTION_SVC_PORT:$QUESTION_SVC_PORT
-    networks:
-      - hidden
+    expose:
+      - $QUESTION_SVC_PORT
 
   user-service:
     build:
@@ -33,10 +50,8 @@ services:
       - JWT_SECRET=$JWT_SECRET
       - EMAIL_ADDRESS=$EMAIL_ADDRESS
       - EMAIL_PASSWORD=$EMAIL_PASSWORD
-    ports:
-      - $USER_SVC_PORT:$USER_SVC_PORT
-    networks:
-      - hidden
+    expose:
+      - $USER_SVC_PORT
 
   matching-service:
     build:
@@ -47,46 +62,18 @@ services:
       - REDIS_PORT=$REDIS_PORT
       - QUESTION_SVC_PORT=$QUESTION_SVC_PORT
       - COLLAB_SVC_PORT=$COLLAB_SVC_PORT
-    ports:
-      - $MATCHING_SVC_PORT:$MATCHING_SVC_PORT
+    expose:
+      - $MATCHING_SVC_PORT
     depends_on:
       - redis
       - question-service
       - collab-service
-    networks:
-      - hidden
-
-  api-gateway:
-    image: nginx:1.26
-    volumes:
-      - ./api-gateway/templates:/etc/nginx/templates
-      - ./api-gateway/nginx.conf:/etc/nginx/nginx.conf
-    ports:
-      - $API_GATEWAY_PORT:$API_GATEWAY_PORT
-    environment:
-      - PORT=$API_GATEWAY_PORT
-      - FRONTEND_PORT=$FRONTEND_PORT
-      - USER_SVC_PORT=$USER_SVC_PORT
-      - QUESTION_SVC_PORT=$QUESTION_SVC_PORT
-      - MATCHING_SVC_PORT=$MATCHING_SVC_PORT
-      - COLLAB_SVC_PORT=$COLLAB_SVC_PORT
-    depends_on:
-      - frontend
-      - user-service
-      - question-service
-      - matching-service
-      - collab-service
-    networks:
-      - gateway
-      - hidden
 
   redis:
     image: redis:7.4-alpine
     restart: always
-    ports:
-      - $REDIS_PORT:$REDIS_PORT
-    networks:
-      - hidden
+    expose:
+      - $REDIS_PORT
 
   collab-service:
     build:
@@ -95,13 +82,5 @@ services:
       - PORT=$COLLAB_SVC_PORT
       - DB_URI=$COLLAB_SVC_DB_URI
       - OPENAI_API_KEY=$OPENAI_API_KEY
-    ports:
-      - $COLLAB_SVC_PORT:$COLLAB_SVC_PORT
-    networks:
-      - hidden
-
-networks:
-  gateway:
-  
-  hidden:
-    internal: true
+    expose:
+      - $COLLAB_SVC_PORT

frontend/components/collab/question-display.tsx

@@ -11,6 +11,7 @@ import {
 import { Badge } from "@/components/ui/badge";
 import LoadingScreen from "@/components/common/loading-screen";
 import { getQuestion } from "@/lib/api/question-service/get-question";
+import { useToast } from "@/components/hooks/use-toast";
 import { useAuth } from "@/app/auth/auth-context";
 import { getQuestionId } from "@/lib/api/collab-service/get-questionId";
 
@@ -37,15 +38,26 @@ export default function QuestionDisplay({
   date?: Date;
 }) {
   const auth = useAuth();
+  const { toast } = useToast();
   const token = auth?.token;
   const [question, setQuestion] = useState<Question | null>(null);
   const [loading, setLoading] = useState(true);
 
   useEffect(() => {
     async function fetchQuestion() {
       try {
+        console.log(auth);
+        if (!auth || !auth.token) {
+          toast({
+            title: "Access denied",
+            description: "No authentication token found",
+            variant: "destructive",
+          });
+          return;
+        }
+
         // Call to the collab microservice to get questionId by roomId
-        const response = await getQuestionId(roomId);
+        const response = await getQuestionId(auth.token, roomId);
         const data = await response.json();
 
         if (data.questionId) {

frontend/lib/api/collab-service/get-questionId.ts

@@ -1,11 +1,12 @@
 import { AuthType, collabServiceUri } from "@/lib/api/api-uri";
 
-export const getQuestionId = async (roomId: string) => {
+export const getQuestionId = async (jwtToken: string, roomId: string) => {
   const response = await fetch(
-    `${collabServiceUri(window.location.hostname, AuthType.Public)}/collab/rooms/${roomId}/questionId`,
+    `${collabServiceUri(window.location.hostname, AuthType.Private)}/collab/rooms/${roomId}/questionId`,
     {
       method: "GET",
       headers: {
+        Authorization: `Bearer ${jwtToken}`,
         "Content-Type": "application/json",
       },
     }