Merge pull request #315 from Trendyol/credentials-error

fix: credentials infinite loop error

Author: armagandalkiran

gurubu-backend/controllers/roomController.js

@@ -24,8 +24,9 @@ exports.createRoom = async (req, res) => {
 exports.joinRoom = async (req, res) => {
   const roomID = req.params.roomId;
   const nickName = req.body.nickName;
+  const isAdmin = req.body.isAdmin;
 
-  const result = handleJoinRoom(nickName, roomID);
+  const result = handleJoinRoom(nickName, roomID, isAdmin);
 
   if(!result){
     return res.status(404).json({ message: "Room not found" });

gurubu-backend/sockets/groomingSocket.js

@@ -30,40 +30,72 @@ module.exports = (io) => {
 
     socket.on("userVote", (data, roomID, credentials) => {
       joinRoomMiddleware(socket, roomID, credentials);
-      io.to(roomID).emit("voteSent", updateParticipantsVote(data, credentials, roomID, socket));
+      const result = updateParticipantsVote(data, credentials, roomID, socket);
+      if(result?.isSuccess === false){
+        io.to(socket.id).emit("encounteredError", result);
+        return;
+      }
+      io.to(roomID).emit("voteSent", result);
     });
 
     socket.on("showResults", (roomID, credentials) => {
       joinRoomMiddleware(socket, roomID, credentials);
-      io.to(roomID).emit("showResults", getResults(credentials, roomID, socket));
+      const result = getResults(credentials, roomID, socket);
+      if(result?.isSuccess === false){
+        io.to(socket.id).emit("encounteredError", result);
+        return;
+      }
+      io.to(roomID).emit("showResults", result);
     });
 
     socket.on("resetVotes", (roomID, credentials) => {
       joinRoomMiddleware(socket, roomID, credentials);
-      io.to(roomID).emit("resetVotes", resetVotes(credentials, roomID, socket));
+      const result = resetVotes(credentials, roomID, socket);
+      if(result?.isSuccess === false){
+        io.to(socket.id).emit("encounteredError", result);
+        return;
+      }
+      io.to(roomID).emit("resetVotes", result);
     });
 
     socket.on("updateNickName", (roomID, newNickName, credentials) => {
       joinRoomMiddleware(socket, roomID, credentials);
-      io.to(roomID).emit(
-        "updateNickName",
-        updateNickName(credentials, newNickName, roomID, socket)
-      );
+      const result = updateNickName(credentials, newNickName, roomID, socket);
+      if(result?.isSuccess === false){
+        io.to(socket.id).emit("encounteredError", result);
+        return;
+      }
+      io.to(roomID).emit("updateNickName", result);
     });
 
     socket.on("setIssues", (roomID, data, credentials) => {
       joinRoomMiddleware(socket, roomID, credentials);
-      io.to(roomID).emit("setIssues", setIssues(data, credentials, roomID, socket));
+      const result = setIssues(data, credentials, roomID, socket);
+      if(result?.isSuccess === false){
+        io.to(socket.id).emit("encounteredError", result);
+        return;
+      }
+      io.to(roomID).emit("setIssues", result);
     });
 
     socket.on("updateTimer", (roomID, data, credentials) => {
       joinRoomMiddleware(socket, roomID, credentials);
-      io.to(roomID).emit("updateTimer", updateTimer(data, credentials, roomID, socket));
+      const result = updateTimer(data, credentials, roomID, socket);
+      if(result?.isSuccess === false){
+        io.to(socket.id).emit("encounteredError", result);
+        return;
+      }
+      io.to(roomID).emit("updateTimer", result);
     });
 
     socket.on("updateAvatar", (roomID, data, credentials) => {
       joinRoomMiddleware(socket, roomID, credentials);
-      io.to(roomID).emit("updateAvatar", updateAvatar(data, credentials, roomID, socket));
+      const result = updateAvatar(data, credentials, roomID, socket);
+      if(result?.isSuccess === false){
+        io.to(socket.id).emit("encounteredError", result);
+        return;
+      }
+      io.to(roomID).emit("updateAvatar", result);
     });
 
     socket.on("disconnect", (reason) => {

gurubu-backend/utils/groomings.js

@@ -63,7 +63,7 @@ const groomingMode = {
   ],
 };
 
-const rooms = [];
+let rooms = [];
 const groomings = {};
 
 const handleErrors = (errorFunctionName, roomID, socket) => {
@@ -72,25 +72,30 @@ const handleErrors = (errorFunctionName, roomID, socket) => {
     return null;
   }
   if (rooms && !rooms.some(room => room.roomID === roomID)) {
-    console.log("Room is deleted, error shown to the user.", errorFunctionName, roomID, rooms);
-    return socket.emit("encounteredError", {
+    console.log("Room is deleted, info shown to the user.", errorFunctionName, roomID);
+    socket.emit("encounteredError", {
       id: 1,
       message:
-        "Room is not exist. Rooms are available for only 6 hours after they are created. You can continue by creating new one.",
+        "Room is expired, if you think this is an error, please contact Armağan Dalkıran.",
     });
+    return {
+      isSuccess: false,
+      message: "Room is expired, if you think this is an error, please contact Armağan Dalkıran."
+    };
   }
 
-  console.log("User lost connection but popup shown.", errorFunctionName, roomID, rooms);
+  console.log("Something unexpected happen!");
 
-  return socket.emit("encounteredError", {
-    id: 2,
-    message: "Your connection is lost. Connect again",
-  });
+  return {
+    id: 3,
+    isSuccess: false,
+    message: "Your connection is lost. Connect again"
+  }
 };
 
 const generateNewRoom = (nickName, groomingType) => {
   const currentTime = new Date().getTime();
-  const expireTime = currentTime + 6 * 60 * 60 * 1000;
+  const expireTime = currentTime + 12 * 60 * 60 * 1000; // 12 hours
   const roomID = uuid.v4();
 
   const user = userJoin(nickName, roomID);
@@ -131,7 +136,7 @@ const generateNewRoom = (nickName, groomingType) => {
   };
 };
 
-const handleJoinRoom = (nickName, roomID) => {
+const handleJoinRoom = (nickName, roomID, isAdmin) => {
   const user = userJoin(nickName, roomID);
   if (!user) {
     return handleErrors("handleJoinRoom", roomID);
@@ -140,9 +145,13 @@ const handleJoinRoom = (nickName, roomID) => {
   user.isAdmin = false;
   user.connected = true;
 
+  if(isAdmin){
+    user.isAdmin = isAdmin
+  }
+
   groomings[roomID] = {
     ...groomings[roomID],
-    totalParticipants: user.userID + 1,
+    totalParticipants: Object.keys(groomings[roomID].participants).length + 1,
   };
 
   const { credentials, ...userWithoutCredentials } = user;
@@ -191,11 +200,11 @@ const removeUserFromOngoingGrooming = (roomID, userID) => {
   }
 
   delete groomings[roomID].participants[userID];
-  groomings[roomID].totalParticipants--;
+  groomings[roomID].totalParticipants = groomings[roomID].totalParticipants - 1;
 };
 
 const updateParticipantsVote = (data, credentials, roomID, socket) => {
-  const user = getCurrentUser(credentials);
+  const user = getCurrentUser(credentials, socket);
   if (!user) {
     return handleErrors("updateParticipantsVote", roomID, socket);
   }
@@ -322,7 +331,7 @@ const calculateScore = (mode, participants, roomID) => {
 };
 
 const getResults = (credentials, roomID, socket) => {
-  const user = getCurrentUser(credentials);
+  const user = getCurrentUser(credentials, socket);
   if (!user) {
     return handleErrors("getResults", roomID, socket);
   }
@@ -334,7 +343,7 @@ const getResults = (credentials, roomID, socket) => {
 
 
 const setIssues = (data, credentials, roomID, socket) => {
-  const user = getCurrentUser(credentials);
+  const user = getCurrentUser(credentials, socket);
   if (!user) {
     return handleErrors("setIssues", roomID, socket);
   }
@@ -345,7 +354,7 @@ const setIssues = (data, credentials, roomID, socket) => {
 };
 
 const updateTimer = (data, credentials, roomID, socket) => {
-  const user = getCurrentUser(credentials);
+  const user = getCurrentUser(credentials, socket);
   if (!user) {
     return handleErrors("updateTimer", roomID, socket);
   }
@@ -356,7 +365,7 @@ const updateTimer = (data, credentials, roomID, socket) => {
 };
 
 const updateAvatar = (data, credentials, roomID, socket) => {
-  const user = getCurrentUser(credentials);
+  const user = getCurrentUser(credentials, socket);
   if (!user) {
     return handleErrors("updateAvatar", roomID, socket);
   }
@@ -374,7 +383,7 @@ const updateAvatar = (data, credentials, roomID, socket) => {
 };
 
 const resetVotes = (credentials, roomID, socket) => {
-  const user = getCurrentUser(credentials);
+  const user = getCurrentUser(credentials, socket);
   if (!user) {
     return handleErrors("resetVotes", roomID, socket);
   }
@@ -396,6 +405,12 @@ const getRooms = () => {
   return rooms;
 };
 
+const logRooms = () => {
+  setInterval(() => {
+    console.log(rooms);
+  }, 10000);
+}
+
 const checkRoomExistance = (roomId) => {
   return rooms.some((room) => room.roomID === roomId);
 };
@@ -431,22 +446,25 @@ function findClosestFibonacci(number) {
 
 const cleanRoomsAndUsers = () => {
   setInterval(() => {
-    const currentTime = new Date().getTime();
-    rooms.forEach((room) => {
-      if (room.expiredAt < currentTime) {
-        const indexToRemove = rooms.findIndex(
-          (indexToRemoveRoom) => indexToRemoveRoom.roomID === room.roomID
-        );
-        rooms.splice(indexToRemove, 1);
-        delete groomings[room.roomID];
-        clearUser(room.roomID);
-      }
-    });
-  }, 60000 * 60 * 3); // work every 3 hours
+    const currentTime = Date.now();
+
+    // Get expired room IDs before modifying arrays
+    const expiredRoomIDs = rooms.filter(room => room.expiredAt < currentTime).map(room => room.roomID);
+
+    // Remove expired rooms safely
+    rooms = rooms.filter(room => room.expiredAt >= currentTime);
+
+    // Remove expired rooms from `groomings`
+    expiredRoomIDs.forEach(roomID => delete groomings[roomID]);
+
+    // Remove users in expired rooms
+    expiredRoomIDs.forEach(clearUser);
+    console.log("Rooms and users cleaned!");
+  }, 1000 * 60 * 60 * 12); // work every 12 hours
 };
 
 const updateNickName = (credentials, newNickName, roomID, socket) => {
-  const user = getCurrentUser(credentials);
+  const user = getCurrentUser(credentials, socket);
   if (!user) {
     return handleErrors("updateNickName", roomID, socket);
   }
@@ -465,6 +483,7 @@ module.exports = {
   checkRoomExistance,
   generateNewRoom,
   getRooms,
+  logRooms,
   handleJoinRoom,
   getGrooming,
   leaveUserFromGrooming,

gurubu-backend/utils/users.js

@@ -1,7 +1,7 @@
 const uuid = require("uuid");
 const { tokenizeNickname } = require("../utils/tokenizeNickname");
 
-const users = [];
+let users = [];
 
 // Join user to grooming room
 function userJoin(nickname, roomID) {
@@ -39,8 +39,20 @@ function updateUserSocket(credentials, socketID) {
 }
 
 // Get current user
-function getCurrentUser(credentials) {
-  return users.find((user) => user.credentials === credentials);
+function getCurrentUser(credentials, socket) {
+  let user = users.find((user) => user.credentials === credentials);
+  if (user) {
+    return user;
+  }
+  console.log("This user could not found with credentials", credentials, users);
+  if (socket) {
+    user = getCurrentUserWithSocket(socket.id);
+    if(user){
+      console.log("This user found with socket id.", user);
+    }
+    return user;
+  }
+  return undefined;
 }
 
 function getCurrentUserWithSocket(socketID) {
@@ -72,18 +84,13 @@ function getRoomUsers(roomID) {
 }
 
 function clearUser(roomId) {
-  users.forEach(() => {
-    const indexToRemove = users.findIndex(
-      (indexToRemoveUser) => indexToRemoveUser.roomID === roomId
-    );
-    users.splice(indexToRemove, 1);
-  });
+  users = users.filter(user => user.roomID !== roomId);
 }
 
 function logUsers() {
   setInterval(() => {
     console.log(users);
-  }, 3000);
+  }, 10000);
 }
 
 module.exports = {

gurubu-client/src/app/components/room/grooming-board/grooming-board-error-popup.tsx

@@ -2,15 +2,33 @@ import classNames from "classnames";
 import { useGroomingRoom } from "@/contexts/GroomingRoomContext";
 import { useSocket } from "@/contexts/SocketContext";
 import { getCurrentLobby } from "@/shared/helpers/lobbyStorage";
+import { ENCOUTERED_ERROR_TYPE } from "@/shared/enums";
+import { handleRoomJoin } from "@/shared/helpers/roomJoin";
 
 interface IProps {
   title: string;
   roomId: string;
 }
 const GroomingBoardErrorPopup = ({ title, roomId }: IProps) => {
   const socket = useSocket();
-  const { showErrorPopup, setShowErrorPopup } = useGroomingRoom();
+  const { showErrorPopup, setShowErrorPopup, encounteredError, userInfo } = useGroomingRoom();
+
+  const handleRemoveUser = () => {
+    localStorage.removeItem("lobby");
+    socket.emit(
+      "removeUser",
+      roomId,
+      userInfo.lobby.userID,
+      userInfo.lobby.credentials
+    );
+  };
+
   const handleClick = () => {
+    if(encounteredError.id === ENCOUTERED_ERROR_TYPE.CREDENTIALS_ERROR){
+      handleRemoveUser();
+      handleRoomJoin(userInfo.nickname, true, roomId, userInfo.lobby.isAdmin)
+      return;
+    }
     const nickname = localStorage.getItem("nickname");
     const lobby = getCurrentLobby(roomId);
     socket.emit("joinRoom", {

gurubu-client/src/app/components/room/grooming-board/grooming-board.tsx

@@ -76,6 +76,9 @@ const GroomingBoard = ({
       if (data.id === ENCOUTERED_ERROR_TYPE.CONNECTION_ERROR) {
         setShowErrorPopup(true);
       }
+      if (data.id === ENCOUTERED_ERROR_TYPE.CREDENTIALS_ERROR) {
+        setShowErrorPopup(true);
+      }
       setEncounteredError(data);
     };