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

Pretty + server messages

Browse source
This commit is contained in:
NyxiumYuuki 2021-05-31 02:51:28 +02:00
parent d103fec09c
commit ed40b33b54
6 changed files with 5 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

1
backend/service-authentication/checkLogin.js
View file

@ -9,6 +9,7 @@ async function checkLogin (req,res) {
const result = await auth.authenticate(req, res); const result = await auth.authenticate(req, res);
if (result === 1){ if (result === 1){
console.log(`${new Date()}] ${req.body.login} connected.`);
return sendMessage(res, true); return sendMessage(res, true);
} }
else{ else{

1
backend/service-authentication/getUsers.js
View file

@ -6,7 +6,6 @@ async function getUsers (req,res) {
return sendError(res, 'Vous n\'avez pas envoyé le champ username'); return sendError(res, 'Vous n\'avez pas envoyé le champ username');
const users = await queries.getUsersQuery(req.body.username); const users = await queries.getUsersQuery(req.body.username);
console.log(users);
if (users){ if (users){
return sendMessage(res, users); return sendMessage(res, users);
} }

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

@ -7,7 +7,4 @@ const config = {
mongodbMessages: 'messages' mongodbMessages: 'messages'
}; };
module.exports = config; module.exports = config;

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

@ -29,9 +29,4 @@ const schemaMessage = mongoose.Schema({
const messages = mongoose.model(config.mongodbMessages, schemaMessage); const messages = mongoose.model(config.mongodbMessages, schemaMessage);
// messages.find({},(err, messages) => {
// if(err) throw err;
// console.log(messages);
// });
module.exports = messages; module.exports = messages;

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

@ -22,10 +22,6 @@ app.use(bodyParser.json());
app.use(cors({origin: 'http://127.0.0.1:4200', credentials: true})); app.use(cors({origin: 'http://127.0.0.1:4200', credentials: true}));
app.use(cookieParser()); app.use(cookieParser());
// app.get('/', (req, res) => {
// res.sendFile(__dirname + '/index.html');
// });
io.on('connection',socket => { io.on('connection',socket => {
auth.getSession(socket.request, function(res){ auth.getSession(socket.request, function(res){
@ -68,7 +64,7 @@ io.on('connection',socket => {
message: message message: message
} }
]).then(function(){ ]).then(function(){
console.log(data, "inserted"); //console.log(data, "inserted");
socket.broadcast.emit('general',[data]); socket.broadcast.emit('general',[data]);
socket.emit('general',[data]); socket.emit('general',[data]);
}).catch(function(error){ }).catch(function(error){
@ -78,14 +74,13 @@ io.on('connection',socket => {
}); });
socket.on("disconnect", function() { socket.on("disconnect", function() {
console.log(`${getUsername} left the chat.`); console.log(`${new Date()}] ${getUsername} left the chat.`);
socket.broadcast.emit('general',[{ socket.broadcast.emit('general',[{
username: 'Server', username: 'Server',
date: new Date(), date: new Date(),
channel: 'general', channel: 'general',
message: `${getUsername} left the chat.` message: `${getUsername} left the chat.`
}]); }]);
}); });
} }
}); });

3
backend/service-privateroom/server.js
View file

@ -28,7 +28,6 @@ const Message = require("../service-privateroom/models/Message");
const conversationRoute = require("./routes/conversations"); const conversationRoute = require("./routes/conversations");
app.use("/conversations", conversationRoute); app.use("/conversations", conversationRoute);
io.on('connection',socket => { io.on('connection',socket => {
auth.getSession(socket.request, function(res){ auth.getSession(socket.request, function(res){
@ -91,7 +90,7 @@ io.on('connection',socket => {
}); });
socket.on("disconnect", function() { socket.on("disconnect", function() {
console.log(`${getUsername} left the chat.`); console.log(`${new Date()}] ${getUsername} left the chat.`);
}); });
} }
}); });