removed initializeSocket function, added returns to response

client/src/components/chat/UserProfile.tsx

@@ -1,5 +1,5 @@
 import zdjecie from "../../../assets/walter.png";
-
+import Cookies from "js-cookie";
 function UserProfile() {
   return (
     <>
@@ -16,6 +16,16 @@ function UserProfile() {
           <p>Walter White</p>
         </div>
       </div>
+      <div>
+        <button
+          onClick={() => {
+            Cookies.remove("token");
+            window.location.reload();
+          }}
+        >
+          remove cookies
+        </button>
+      </div>
     </>
   );
 }

client/src/socket/socket.tsx

@@ -1,36 +1,21 @@
 import io from "socket.io-client";
 import Cookie from "js-cookie";
-import Socket = SocketIOClient.Socket;
 const token = Cookie.get("token");
+//TODO socket is trying to connect on login page
+const socket = io({
+  auth: {
+    token: Cookie.get("token"),
+  },
+});
 
-let socket: Socket;
+socket.on("connect", () => console.log("connected"));
 
-export function initializeSocket() {
-  if (token && !socket) {
-    socket = io({
-      auth: {
-        token: token,
-      },
-      autoConnect: false,
-    });
-
-    socket.on("connect", () => console.log("connected"));
-    socket.on("disconnect", (reason: string) => {
-      console.log("Disconnected from server ", reason);
-    });
-  }
-  socket.connect();
-  return socket;
-}
-
-export function disconnectSocket() {
-  if (socket) {
-    socket.disconnect();
-  }
-}
+socket.on("disconnect", () => {
+  console.log("Disconnected from server");
+});
 
 function sendMessage(message: string, recipient: string | null) {
-  const timestamp = new Date().toString();
+  const timestamp = new Date().toLocaleDateString();
   socket.emit("chat message", {
     message: message,
     recipient: recipient,

server/server.js

@@ -52,8 +52,7 @@ app.post("/api/auth/signup", async (req, res) => {
   // Checks if the user already exists in database (returns result.rows[0].count > 0;)
   const exist = await checkUserExist(username);
   if (exist) {
-    res.status(409).json({ message: "User already exist" });
-    return;
+    return res.status(409).json({ message: "User already exist" });
   }
 
   // Hash password and insert hash and username to database
@@ -72,7 +71,7 @@ app.post("/api/auth/signup", async (req, res) => {
     maxAge: 30 * 24 * 60 * 60 * 1000, // 30 days
   });
 
-  res.status(200).json({ message: "Successfully signed up" });
+  return res.status(200).json({ message: "Successfully signed up" });
 });
 
 app.post("/api/auth/login", async (req, res) => {
@@ -112,7 +111,7 @@ app.post("/api/auth/login", async (req, res) => {
       return res.status(200).json({ message: "Successfully logged In" });
     })
     .catch((err) => {
-      res.status(500).json({ message: "Internal server error" });
+      return res.status(500).json({ message: "Internal server error" });
     });
 });
 
@@ -123,11 +122,13 @@ app.get("/api/auth/validate", (req, res) => {
   }
   const { username } = verifyJwtToken(token);
   if (username) {
+    console.log("Requested successfull");
     return res
       .status(200)
       .json({ message: "Authorized", username: username.username });
   }
-  res.status(401).json({ message: "Unauthorized" });
+  console.log("requested failed");
+  return res.status(401).json({ message: "Unauthorized" });
 });
 
 initializeSocket(io);

server/socket/socket.js

@@ -1,6 +1,7 @@
 const { Server } = require("socket.io");
 const { insertMessage, getMessages } = require("../db/db");
 const { verifyJwtToken } = require("../auth/jwt");
+const console = require("node:console");
 
 function initializeSocket(io) {
   io.use((socket, next) => {
@@ -14,6 +15,9 @@ function initializeSocket(io) {
           `socket id: ${socket.id}, username: ${username}, user_id: ${user_id}`,
         );
         next();
+      } else {
+        console.log("Invalid token");
+        next(new Error("Invalid token"));
       }
     } else {
       console.log("Not logged in");