Merge pull request #213 from CS3219-AY2425S1/206-be-fix-nginx-routing…

…-for-deployment-and-dev 206 be fix nginx routing for deployment and dev
CS3219-AY2425S1 · Nov 9, 2024 · 8929f9b · 8929f9b
2 parents f09194d + 600de35
commit 8929f9b
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/frontend/components/dashboard/new-session.tsx b/frontend/components/dashboard/new-session.tsx
@@ -82,7 +82,7 @@ export const NewSession = () => {
 
         // Refactor this
         const wsUrl = (process.env.NEXT_PUBLIC_API_URL || 'ws://localhost:3006')?.concat(
-            `/matching/ws/?id=${websocketId}`
+            `/api/matching/ws/?id=${websocketId}`
         )
         const socket = new WebSocket(wsUrl)
         setTimeout(() => {

diff --git a/frontend/pages/api/auth/[...nextauth].ts b/frontend/pages/api/auth/[...nextauth].ts
@@ -24,7 +24,7 @@ export default NextAuth({
 
                 try {
                     const api = axios.create({
-                        baseURL: process.env.NEXT_PUBLIC_API_URL ?? 'http://localhost:3002',
+                        baseURL: process.env.NEXT_PUBLIC_API_URL?.concat('/api') ?? 'http://localhost:3002',
                     })
 
                     const response = await api.post('/auth/login', { usernameOrEmail: username, password })

diff --git a/frontend/pages/code/editor.tsx b/frontend/pages/code/editor.tsx
@@ -52,7 +52,7 @@ const CodeMirrorEditor = forwardRef(({ roomId, language }: IProps, ref) => {
         const token = session.user.accessToken
         if (!token) return undefined
         const wsProvider = new WebsocketProvider(
-            process.env.NEXT_PUBLIC_API_URL?.concat('/collab/y/ws') ?? 'ws://localhost:3008',
+            process.env.NEXT_PUBLIC_API_URL?.concat('/api/collab/y/ws') ?? 'ws://localhost:3008',
             roomId,
             ydoc,
             {

diff --git a/frontend/services/axios-middleware.ts b/frontend/services/axios-middleware.ts
@@ -38,9 +38,11 @@ const createServiceAPI = (baseURL: string) => {
     return api
 }
 
-const userServiceAPI = createServiceAPI(process.env.NEXT_PUBLIC_API_URL ?? 'http://localhost:3002')
-const questionServiceAPI = createServiceAPI(process.env.NEXT_PUBLIC_API_URL ?? 'http://localhost:3004')
-const matchingServiceAPI = createServiceAPI(process.env.NEXT_PUBLIC_API_URL ?? 'http://localhost:3006')
-const collaborationServiceAPI = createServiceAPI(process.env.NEXT_PUBLIC_API_URL ?? 'http://localhost:3008')
+const userServiceAPI = createServiceAPI(process.env.NEXT_PUBLIC_API_URL?.concat('/api') ?? 'http://localhost:3002')
+const questionServiceAPI = createServiceAPI(process.env.NEXT_PUBLIC_API_URL?.concat('/api') ?? 'http://localhost:3004')
+const matchingServiceAPI = createServiceAPI(process.env.NEXT_PUBLIC_API_URL?.concat('/api') ?? 'http://localhost:3006')
+const collaborationServiceAPI = createServiceAPI(
+    process.env.NEXT_PUBLIC_API_URL?.concat('/api') ?? 'http://localhost:3008'
+)
 
 export default { userServiceAPI, questionServiceAPI, matchingServiceAPI, collaborationServiceAPI }
diff --git a/nginx/templates/local-nginx.conf.template b/nginx/templates/local-nginx.conf.template
@@ -18,6 +18,10 @@ http {
         proxy_set_header Upgrade ${D}http_upgrade;
         proxy_set_header Connection "upgrade";
 
+        location /api/ {
+            rewrite ^/api(/.*)$ $1 last;
+        }
+
         location /auth {
             proxy_pass ${USER_SERVICE_URL};
         }