Merge remote-tracking branch 'origin/post-ms6' into collab-post-ms6

Author: alvinlim277

collab/main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	verify "collab/verify"
+	"context"
 	"encoding/json"
 	"io"
 	"log"
@@ -226,7 +227,7 @@ func handleMessages(
 				log.Println("Authentication failed - no token attached")
 				client.conn.WriteMessage(
 					websocket.TextMessage,
-					[]byte("Authentication failed - no JWT token"),
+					[]byte("Authentication failed"),
 				)
 				client.conn.Close()
 				break
@@ -248,12 +249,16 @@ func handleMessages(
 			if !isSuccess {
 				client.conn.WriteMessage(
 					websocket.TextMessage,
-					[]byte("Authentication failed - failed to find a matching room"),
+					[]byte("Authentication failed"),
 				)
 				client.conn.Close()
 				break
 			}
 			client.authenticated = true
+			client.conn.WriteMessage(
+				websocket.TextMessage,
+				[]byte("Auth Success"),
+			)
 			log.Println("Client authenticated successfully")
 		}
 		// i can comment out this whole block and it would work
@@ -277,6 +282,20 @@ func handleMessages(
 				RoomID:  client.roomID,
 				Content: []byte("The session has been closed by a user."),
 			}
+			targetId := msgData["userId"].(string)
+			data, err := persistMappings.Conn.HGetAll(context.Background(), targetId).Result()
+			if err != nil {
+				log.Printf("Error retrieving data for userID %s: %v", targetId, err)
+			} else {
+				_, err1 := persistMappings.Conn.Del(context.Background(), targetId).Result()
+				if err1 != nil {
+					log.Printf("Error deleting data for userID %s: %v", targetId, err1);
+				}
+				_, err2 := persistMappings.Conn.Del(context.Background(), data["otherUser"]).Result()
+				if err2 != nil {
+					log.Printf("Error deleting data for other user %s: %v", data["otherUser"], err2);
+				}
+			}
 			hub.broadcast <- closeMessage
 		}
 

collab/verify/roomMappings.go

@@ -44,17 +44,9 @@ func VerifyRoomAndMoveToPersist(
 
 	roomMappings.Conn.Del(ctx, matchHash);
 	persistentRoom := map[string]interface{}{
-		"roomId":      roomID,
-		"otherUser":   data["otherUser"],
-		"requestTime": data["requestTime"],
-
-		"title":       data["title"],
-		"titleSlug":   data["titleSlug"],
-		"difficulty":  data["difficulty"],
-		"topicTags":   data["topicTags"],
-		"content":     data["content"],
-		"schemas":     data["schemas"],
-		"id":          data["id"],
+		"roomId":        roomID,
+		"otherUser":     data["otherUser"],
+		"requestTime":   data["requestTime"],
 	}
 
 	// this always overrides the persistent room

comms/server.js

@@ -1,11 +1,14 @@
 const express = require("express");
 const http = require("http");
 const app = express();
+
 const server = http.createServer(app);
 const io = require("socket.io")(server, {
+  path: '/comms',
   cors: {
     // temporarily use * to allow all origins
-    origin: `*`
+    origin: `*`,
+    methods: ["GET", "POST"]
   }
 });
 

compose.yaml

@@ -165,16 +165,27 @@ services:
   nginx:
     build: nginx
     image: distractedcat/nginx
-    ports:
-      - "80:80"
     volumes:
-      - ./nginx/nginx.conf:/etc/nginx/nginx.conf
+      - ./nginx/nginx.conf:/etc/nginx/internal.conf
+    ports:
+      - "70:70"
     depends_on:
       - peerprep
       - backend
       - user-service
       - storage-blob-api
       - matching-service-api
+  
+  inbound-gateway:
+    build: inbound-gateway
+    image: wzwren/inbound-gateway
+    ports:
+      - "80:80"
+    volumes:
+      - ./inbound-gateway/nginx.conf:/etc/nginx/external.conf
+    depends_on:
+      - peerprep
+      - comms
 #  mongo:
 #    image: "mongo:latest"
 #    ports:

inbound-gateway/Dockerfile

@@ -0,0 +1,4 @@
+FROM nginx:alpine 
+COPY nginx.conf /etc/nginx/external.conf
+EXPOSE 80
+CMD ["nginx", "-c", "external.conf", "-g", "daemon off;"]

inbound-gateway/README.md

@@ -0,0 +1,7 @@
+nginx is dockerised, just have to run `docker compose up --build` as usual.
+
+if edits are made to the local nginx.conf file, following command must be run to see changes reflected in docker:
+
+`docker exec cs3219-ay2425s1-project-g14-nginx-1  nginx -s reload`
+
+(or just exec `nginx -s reload` in the container directly)

inbound-gateway/nginx.conf

@@ -0,0 +1,56 @@
+worker_processes  1;
+
+events {
+    worker_connections  1024;
+}
+
+http {
+    include       mime.types;
+ 
+    default_type  application/octet-stream;
+
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                     '$status $body_bytes_sent "$http_referer" '
+                     '"$http_user_agent" "$http_x_forwarded_for"';
+
+    sendfile        on;
+    #tcp_nopush     on;
+
+    keepalive_timeout  65;
+
+    upstream peerprep {
+        server peerprep:3000;
+    }
+
+    server {
+        listen 80;
+
+        location / {
+            proxy_pass http://peerprep/;
+            proxy_set_header   Host               $host;
+            proxy_set_header   X-Real-IP          $remote_addr;
+            proxy_set_header   X-Forwarded-Proto  $scheme;
+            proxy_set_header   X-Forwarded-Host   $host; # port 80 implicitly removes this port
+            proxy_set_header   X-Forwarded-For    $proxy_add_x_forwarded_for;
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection "upgrade";
+            proxy_read_timeout 86400;
+        }
+
+        location /comms/ {
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header Host $host;
+            proxy_set_header X-NginX-Proxy false;
+
+
+            proxy_pass http://comms:4001;
+
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection "upgrade";
+            proxy_read_timeout 86400;
+        }
+    }
+}

nginx/Dockerfile

@@ -1,4 +1,4 @@
 FROM nginx:alpine 
-COPY nginx.conf /etc/nginx/nginx.conf
-EXPOSE 80
-CMD ["nginx", "-g", "daemon off;"]
+COPY nginx.conf /etc/nginx/internal.conf
+EXPOSE 70
+CMD ["nginx", "-c", "internal.conf", "-g", "daemon off;"]

nginx/nginx.conf

@@ -53,7 +53,7 @@ http {
     # }
 
     server {
-        listen 80;
+        listen 70;
         location / {
             proxy_pass http://peerprep/;
             proxy_set_header   Host               $host;
@@ -63,6 +63,7 @@ http {
             proxy_http_version 1.1;
             proxy_set_header Upgrade $http_upgrade;
             proxy_set_header Connection "upgrade";
+            proxy_read_timeout 86400;
         }
 
         location /users/ {

peerprep/app/actions/server_actions.ts

@@ -36,7 +36,13 @@ export async function signup(state: FormState, formData: FormData) {
     redirect("/auth/login");
   } else {
     // TODO: handle failure codes: 400, 409, 500.
-    console.log(`${json.status}: ${json.error}`);
+    console.log(`Error in signup: ${json.status}: ${json.error}`);
+    return {
+      errors: {
+        username: ["Username is already in use."],
+        email: ["Email is already in use."],
+      },
+    };
   }
 }
 
@@ -59,7 +65,23 @@ export async function login(state: FormState, formData: FormData) {
     await createSession(json.data);
     redirect("/questions");
   } else {
-    console.log("Get session login error: " + json.error + " : " + json.status);
+    if (json.status === 401) {
+      return {
+        errors: {
+          email: ["Invalid email or password."],
+        },
+      };
+    } else if (json.status === 500) {
+      console.log(
+        "Get session login error: " + json.error + " : " + json.status,
+      );
+
+      return {
+        errors: {
+          email: ["Please try again."],
+        },
+      };
+    }
   }
 }
 
@@ -73,7 +95,7 @@ export async function hydrateUid(): Promise<null | UserData> {
   if (isError(json)) {
     console.log("Failed to fetch user ID.");
     console.log(`Error ${json.status}: ${json.error}`);
-    redirect("/api/internal/auth/expire");
+    redirect("/auth/logout");
   }
   // TODO: handle error handling
   const response = json as UserServiceResponse;