yvachot/chatless
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
wilfried 2021-05-28 15:13:44 +02:00
commit ef54c66a5b
2 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backend/service-authentication/server.js
View file

@ -10,7 +10,7 @@ app.use(bodyParser.urlencoded({extended:true}));
app.use(bodyParser.json()); app.use(bodyParser.json());
const cors = require('cors'); 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'); const mongoConnect = require('./mongodbConnect');

5
backend/service-message/server.js
View file

@ -35,10 +35,8 @@ io.on('connection',socket => {
const session = auth.getSession(socket.request); const session = auth.getSession(socket.request);
const getUsername = auth.getUsername(session); const getUsername = auth.getUsername(session);
console.log(getUsername);
socket.on('user', (userData) => {
console.log(`${getUsername} joined the chat.`); console.log(`${getUsername} joined the chat.`);
socket.broadcast.emit('general',`${getUsername} joined the chat.`);
users[socket.id] = getUsername; users[socket.id] = getUsername;
messages.find({},(err, res) => { messages.find({},(err, res) => {
if(err) throw err; if(err) throw err;
@ -47,7 +45,6 @@ io.on('connection',socket => {
socket.emit('general',savedChat); socket.emit('general',savedChat);
} }
}); });
});
socket.on('general',function(data){ socket.on('general',function(data){
socket.broadcast.emit('general',data); socket.broadcast.emit('general',data);