Temporary fix for question view fetch fail

Author: alvinlim277

nginx/nginx.conf

@@ -8,6 +8,8 @@ events {
 http {
     include       mime.types;
     default_type  application/octet-stream;
+    # for caching of cookie
+    proxy_cache_path cache/  keys_zone=auth_cache:1m;
 
     #log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
     #                  '$status $body_bytes_sent "$http_referer" '
@@ -27,19 +29,46 @@ http {
         listen       80;
         server_name  localhost;
 
-        # frontend
+        # frontend (i guess login page)
         location / {
-            proxy_pass http://localhost:3000; # frontend running on...similar for other services 
+            proxy_pass http://localhost:3000/; # frontend running on...similar for other services 
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection "Upgrade";
+            proxy_set_header Host $host;
+            proxy_cache_bypass $http_upgrade;    
         }
 
         # question
         location /api/ {
             proxy_pass http://localhost:9090/;  
         }
 
-        # user
-        location /users/ {
-            proxy_pass http://localhost:3001/;  
-        }
+        # # user (pure conjecture, just referencing gaylord article)
+        # location /users/ {
+        #     auth_request auth;
+        #     auth_request_set $userid $upstream_http_x_auth_user;
+            
+        #     # if fail go back to landing
+        #     if ($http_accept ~* "text/html" ) {
+        #         error_page 401 403 =200 /;
+        #     }
+        #     proxy_set_header X-Auth-User $userid;
+        #     proxy_set_header Host $host;
+        #     proxy_set_header X-Forwarded-For $remote_addr;
+        #     proxy_pass http://localhost:3001/;  
+
+        # }
+
+        # location = auth {
+        #     internal;
+        #     # proxy_pass to authenticator service
+        #     proxy_set_header Content-Length "";
+        #     proxy_set_header X-Dbg $cookie_AUTH;
+
+        #     proxy_cache auth_cache;
+        #     proxy_cache_valid 200 204 1m;
+        #     proxy_cache_key "$http_authorization"; # jwt?
+        # }
     }
 }

peerprep/.env.sample

@@ -1,5 +1,7 @@
+# THIS CANNOT BE RIGHT, TEMP FIX
+NEXT_PUBLIC_BASE_URL=http://localhost
 # location of question service
 NEXT_PUBLIC_QUESTION_SERVICE=api
-NEXT_PUBLIC_QUESTION_SERVICE=users
+NEXT_PUBLIC_USER_SERVICE=users
 # dev flag, originally used when services were not up
 DEV_ENV=not

peerprep/api/gateway.ts

@@ -28,6 +28,8 @@ const questions: { [key: string]: Question } = {
   },
 };
 
+const apiHome = `${process.env.NEXT_PUBLIC_BASE_URL}/${process.env.NEXT_PUBLIC_QUESTION_SERVICE}`;
+
 export async function fetchQuestion(
   questionId: string
 ): Promise<Question | StatusBody> {
@@ -38,9 +40,7 @@ export async function fetchQuestion(
       : questions[questionId];
   }
   try {
-    const response = await fetch(
-      `${process.env.NEXT_PUBLIC_QUESTION_SERVICE}/questions/solve/${questionId}`
-    );
+    const response = await fetch(`${apiHome}/questions/solve/${questionId}`);
     if (!response.ok) {
       return {
         error: await response.text(),
@@ -109,9 +109,7 @@ export async function deleteQuestion(question: Question): Promise<StatusBody> {
 
 export async function getAllQuestions(): Promise<Question[] | StatusBody> {
   try {
-    const response = await fetch(
-      `${process.env.NEXT_PUBLIC_QUESTION_SERVICE}/questions`
-    );
+    const response = await fetch(`${apiHome}/questions`);
     if (!response.ok) {
       return {
         error: await response.text(),

peerprep/components/questionpage/QuestionCard.tsx

@@ -1,11 +1,9 @@
-"use client";
 import { deleteQuestion } from "@/api/gateway";
 import React from "react";
 import { Question, Difficulty } from "@/api/structs";
 import PeerprepButton from "../shared/PeerprepButton";
 import { useRouter } from "next/navigation";
 import styles from "@/style/questionCard.module.css";
-import QuestionList from "./QuestionList";
 
 type QuestionCardProps = {
   question: Question;
@@ -71,7 +69,9 @@ const QuestionCard: React.FC<QuestionCardProps> = ({ question }) => {
       </div>
 
       <div className={styles.buttonContainer}>
-        <PeerprepButton onClick={() => router.push(`questions/${question.id}`)}>
+        <PeerprepButton
+          onClick={() => router.push(`/questions/${question.id}`)}
+        >
           View
         </PeerprepButton>
         <PeerprepButton onClick={handleDelete}>Delete</PeerprepButton>