diff --git a/backend/service-authentication/checkLogin.js b/backend/service-authentication/checkLogin.js index 728fb28..8a88c65 100644 --- a/backend/service-authentication/checkLogin.js +++ b/backend/service-authentication/checkLogin.js @@ -9,6 +9,7 @@ async function checkLogin (req,res) { const result = await auth.authenticate(req, res); if (result === 1){ + console.log(`${new Date()}] ${req.body.login} connected.`); return sendMessage(res, true); } else{ diff --git a/backend/service-authentication/getUsers.js b/backend/service-authentication/getUsers.js index 2dd4645..95b39d2 100644 --- a/backend/service-authentication/getUsers.js +++ b/backend/service-authentication/getUsers.js @@ -6,7 +6,6 @@ async function getUsers (req,res) { return sendError(res, 'Vous n\'avez pas envoyé le champ username'); const users = await queries.getUsersQuery(req.body.username); - console.log(users); if (users){ return sendMessage(res, users); } diff --git a/backend/service-message/config.js b/backend/service-message/config.js index 8b1fed7..6689868 100644 --- a/backend/service-message/config.js +++ b/backend/service-message/config.js @@ -7,7 +7,4 @@ const config = { mongodbMessages: 'messages' }; -module.exports = config; - - - +module.exports = config; \ No newline at end of file diff --git a/backend/service-message/mongodb-message.js b/backend/service-message/mongodb-message.js index 324d34d..9a09db3 100644 --- a/backend/service-message/mongodb-message.js +++ b/backend/service-message/mongodb-message.js @@ -29,9 +29,4 @@ const schemaMessage = mongoose.Schema({ const messages = mongoose.model(config.mongodbMessages, schemaMessage); -// messages.find({},(err, messages) => { -// if(err) throw err; -// console.log(messages); -// }); - module.exports = messages; diff --git a/backend/service-message/server.js b/backend/service-message/server.js index d4a9488..ab0f3fd 100644 --- a/backend/service-message/server.js +++ b/backend/service-message/server.js @@ -22,10 +22,6 @@ app.use(bodyParser.json()); app.use(cors({origin: 'http://127.0.0.1:4200', credentials: true})); app.use(cookieParser()); -// app.get('/', (req, res) => { -// res.sendFile(__dirname + '/index.html'); -// }); - io.on('connection',socket => { auth.getSession(socket.request, function(res){ @@ -68,7 +64,7 @@ io.on('connection',socket => { message: message } ]).then(function(){ - console.log(data, "inserted"); + //console.log(data, "inserted"); socket.broadcast.emit('general',[data]); socket.emit('general',[data]); }).catch(function(error){ @@ -78,14 +74,13 @@ io.on('connection',socket => { }); socket.on("disconnect", function() { - console.log(`${getUsername} left the chat.`); + console.log(`${new Date()}] ${getUsername} left the chat.`); socket.broadcast.emit('general',[{ username: 'Server', date: new Date(), channel: 'general', message: `${getUsername} left the chat.` }]); - }); } }); diff --git a/backend/service-privateroom/server.js b/backend/service-privateroom/server.js index 2114423..df99412 100644 --- a/backend/service-privateroom/server.js +++ b/backend/service-privateroom/server.js @@ -28,7 +28,6 @@ const Message = require("../service-privateroom/models/Message"); const conversationRoute = require("./routes/conversations"); app.use("/conversations", conversationRoute); - io.on('connection',socket => { auth.getSession(socket.request, function(res){ @@ -91,7 +90,7 @@ io.on('connection',socket => { }); socket.on("disconnect", function() { - console.log(`${getUsername} left the chat.`); + console.log(`${new Date()}] ${getUsername} left the chat.`); }); } });