Revert "omg connection and user auth on socket is working"

This reverts commit ec7bbb6d

frontend/js/chat.js

@@ -1,68 +1,39 @@
-
-const recipmentForm = document.getElementById('recipmentForm');
+const form = document.getElementById('form');
 const input = document.getElementById('input');
 const messages = document.getElementById('messages');
-const recipientInput = document.getElementById('recipient');
-// Function to get the token
-async function getToken() {
-    try {
-        const response = await fetch('/auth/token');
+
+form.addEventListener('submit', (e) => {
+    e.preventDefault();
+    if (input.value) {
+        socket.emit('chat message', input.value);
+        input.value = '';
+    }
+});
+fetch('/auth/token')
+    .then(response => {
         if (!response.ok) {
-            console.log('Network response was not ok');
+            throw new Error('Network response was not ok');
         }
-        return await response.text();
-    } catch (error) {
+        return response.text();
+    })
+    .then(token => {
+        localStorage.setItem('token', token); // Save to localStorage
+    })
+    .catch(error => {
         console.error('There was a problem with token fetching', error);
-        return null;
-    }
-}
-// Initialize socket connection
-async function initializeSocket() {
-    const token = await getToken();
-    if (!token) {
-        console.error('Not logged in');
-        return;
+    });
+
+const token = localStorage.getItem('token');
+const socket = io({
+    auth: {
+        token: token
     }
+});
 
-    const socket = io({
-        auth: {
-            token: token
-        },
-        ackTimeout: 10000,
-        retries: 3
-    });
+socket.on('chat message', ({msg}) => {
+    const item = document.createElement('li');
+    item.textContent = msg;
+    messages.appendChild(item);
+    window.scrollTo(0, document.body.scrollHeight);
+});
 
-    socket.on('connect', () => {
-        console.log('Connected to server');
-    });
-
-    socket.on('private message', ({ from, message }) => {
-        const item = document.createElement('li');
-        item.textContent = `${from} (private): ${message}`;
-        messages.appendChild(item);
-        window.scrollTo(0, document.body.scrollHeight);
-    });
-
-    socket.on('chat message', (msg) => {
-        const item = document.createElement('li');
-        item.textContent = msg;
-        messages.appendChild(item);
-        window.scrollTo(0, document.body.scrollHeight);
-    });
-
-    recipmentForm.addEventListener('submit', (e) => {
-        e.preventDefault();
-        if (input.value) {
-            const recipient = recipientInput.value.trim();
-            if (recipient) {
-                socket.emit('private message', { to: recipient, message: input.value });
-            } else {
-                socket.emit('chat message', input.value);
-            }
-            input.value = '';
-            recipientInput.value = '';
-        }
-    });
-}
-
-initializeSocket().then(r => console.log(r));

index.js

@@ -18,12 +18,7 @@ const io = new Server(server, {
         httpOnly: true,
         sameSite: "strict",
         maxAge:  30 * 24 * 60 * 60 * 1000
-    },
-    cors: {
-        origin: process.env.ORIGIN
-    },
-    connectionStateRecovery: {}
-
+    }
 });
 
 const jwt = require('jsonwebtoken');
@@ -47,8 +42,6 @@ app.use(session({
     }
 }));
 
-//TODO logout option
-
 // auth login API
 app.post('/auth/login', async (req, res) => {
     await loginUser(req, res);
@@ -130,27 +123,25 @@ io.use((socket, next) => {
   } else {
       next(new Error('Not logged in'));
   }
+  const username = socket.handshake.username;
 })
 
-
 // socket io connection
 io.on('connection', (socket) => {
-    const username = socket.user.username;
-    console.log(username + ' connected');
+        const username = socket.user.username;
+        console.log(username + ' connected');
 
-    // chat message event
-    socket.on('chat message', (msg, callback) => {
-        const message = username + ': ' + msg;
-        console.log(message);
-        callback();
-        io.emit('chat message', message);
-    });
-
-    // disconnect event
-    socket.on('disconnect', () => {
-        console.log(username + ' have disconnected');
-    });
+        // disconnect event
+        socket.on('disconnect', () => {
+            console.log(username + ' have  disconnected');
+        });
 
+        // chat message event
+        socket.on('chat message', (msg) => {
+            const message = username + ': ' + msg;
+            console.log(message);
+            io.emit('chat message', message);
+        });
 })
 // run server
 server.listen(port, () => {