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

Author: modembcc

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")
 		}
 
@@ -262,6 +267,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

peerprep/components/questionpage/CollabEditor.tsx

@@ -73,6 +73,7 @@ export default function CollabEditor({
   const [value, setValue] = useState(questionSeed);
   const [socket, setSocket] = useState<WebSocket | null>(null);
   const [connected, setConnected] = useState(false);
+  const [authenticated, setAuthenticated] = useState(false);
   const router = useRouter();
 
   const generatePatch = (oldContent: string, newContent: string): string => {
@@ -155,18 +156,17 @@ export default function CollabEditor({
     };
 
     newSocket.onmessage = (event) => {
-      if (event.data == "Authentication failed") {
+      if (event.data == "Auth Success") {
+        setAuthenticated(true);
+      } else if (event.data == "Authentication failed") {
         window.alert("Authentication failed");
-        if (socket) {
-          socket.close();
-        }
+        newSocket.close();
         router.push("/questions");
       } else if (event.data == "The session has been closed by a user.") {
-        window.alert("Session has ended");
-        if (socket) {
-          socket.close();
-        }
-        router.push("/questions");
+        window.alert("Session has ended. If you leave the room now, this data will be lost.");
+        newSocket.close();
+        setAuthenticated(false);
+        setConnected(false);
       } else {
         const message: Message = JSON.parse(event.data);
 
@@ -221,7 +221,7 @@ export default function CollabEditor({
 
   return (
     <>
-      {connected && (
+      {authenticated && (
         <CommsPanel className="flex flex-row justify-around" roomId={roomID} />
       )}
       <div className="m-4 flex items-center space-x-4 p-4">