From 36950afca4ded317dcd24731d05f9ab27f2ab0e9 Mon Sep 17 00:00:00 2001
From: NyxiumYuuki <ATAWV5n2q8KG3kn>
Date: Fri, 28 May 2021 15:09:03 +0200
Subject: [PATCH 1/2] frontend ip added

---
 backend/service-authentication/server.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/service-authentication/server.js b/backend/service-authentication/server.js
index a15ce7a..8c6812d 100644
--- a/backend/service-authentication/server.js
+++ b/backend/service-authentication/server.js
@@ -10,7 +10,7 @@ app.use(bodyParser.urlencoded({extended:true}));
 app.use(bodyParser.json());
 
 const cors = require('cors');
-app.use(cors({origin: 'http://127.0.0.1:4200', credentials: true}));
+app.use(cors({origin: 'http://frontend:4200', credentials: true}));
 
 const mongoConnect = require('./mongodbConnect');
 

From 66d976fc2a49726a4df3f668f7be179181783f6e Mon Sep 17 00:00:00 2001
From: NyxiumYuuki <ATAWV5n2q8KG3kn>
Date: Fri, 28 May 2021 15:09:24 +0200
Subject: [PATCH 2/2] remove socket on user

---
 backend/service-message/server.js | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/backend/service-message/server.js b/backend/service-message/server.js
index 3c54fc3..8e8508e 100644
--- a/backend/service-message/server.js
+++ b/backend/service-message/server.js
@@ -35,18 +35,15 @@ io.on('connection',socket => {
     const session = auth.getSession(socket.request);
     const getUsername = auth.getUsername(session);
 
-    console.log(getUsername);
-
-    socket.on('user', (userData) => {
-        console.log(`${getUsername} joined the chat.`);
-        users[socket.id] = getUsername;
-        messages.find({},(err, res) => {
-            if(err) throw err;
-            if(res.length > 0){
-                const savedChat = res;
-                socket.emit('general',savedChat);
-            }
-        });
+    console.log(`${getUsername} joined the chat.`);
+    socket.broadcast.emit('general',`${getUsername} joined the chat.`);
+    users[socket.id] = getUsername;
+    messages.find({},(err, res) => {
+        if(err) throw err;
+        if(res.length > 0){
+            const savedChat = res;
+            socket.emit('general',savedChat);
+        }
     });
 
     socket.on('general',function(data){