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

Auth is now working with keys

Browse source
This commit is contained in:
NyxiumYuuki 2021-05-29 14:42:08 +02:00
parent 34070afc0e
commit 660d12e841
2 changed files with 61 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -19,17 +19,24 @@ mongoConnect.connectToServer(function( err, client ) {
const checkLogin = require('./checkLogin'); const checkLogin = require('./checkLogin');
const register = require('./register'); const register = require('./register');
const queries = require('./mongodbQueries'); const queries = require('./mongodbQueries');
const auth = require('./auth');
queries.register('Server','admin'); queries.register('Server','admin');
queries.register('khai','test'); queries.register('khai','test');
queries.register('wilfried','test'); queries.register('wilfried','test');
queries.register('yuki','test'); queries.register('yuki','test');
app.post('/verify:token', (req, res) => {
if(typeof req.body !== 'undefined'){
auth.getSession(req.body.sessionid,res);
}
return null;
});
app.post('/checkLogin', (req, res) => { app.post('/checkLogin', (req, res) => {
checkLogin(req,res); checkLogin(req,res);
}); });
app.post('/register', (req, res) => { app.post('/register', (req, res) => {
register(req,res); register(req,res);
}); });

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

@ -30,59 +30,61 @@ io.on('connection',socket => {
let users = {}; let users = {};
const session = auth.getSession(socket.request); auth.getSession(socket.request, function(res){
const getUsername = auth.getUsername(session); const getUsername = auth.getUsername(res);
if (getUsername === -1) { if (getUsername === -1) {
socket.emit('error','not authenticated'); socket.send('error','not authenticated');
} }
console.log(`${getUsername} joined the chat.`); else{
socket.broadcast.emit('general',[{ console.log(`${getUsername} joined the chat.`);
username: 'Server', socket.broadcast.emit('general',[{
date: new Date(), username: 'Server',
channel: 'general', date: new Date(),
message: `${getUsername} joined the chat.` channel: 'general',
}]); message: `${getUsername} joined the chat.`
users[socket.id] = getUsername; }]);
messages.find({}, {'_id':0},{sort: {'date':1}},(err, res) => { users[socket.id] = getUsername;
if(err) throw err; messages.find({}, {'_id':0},{sort: {'date':1}},(err, res) => {
if(res.length > 0){ if(err) throw err;
//console.log(res, res.length); if(res.length > 0){
socket.emit('general',res); //console.log(res, res.length);
socket.emit('general',res);
}
socket.emit('general',[{
username: 'Server',
date: new Date(),
channel: 'general',
message: `${getUsername} joined the chat.`
}]);
});
socket.on('general',function(data){
const username = data.username;
const date = Date.now();
const channel = 'general';
const message = data.message;
messages.insertMany([{
username: username,
date: date,
channel: channel,
message: message
}
]).then(function(){
console.log(data, "inserted");
socket.broadcast.emit('general',[data]);
socket.emit('general',[data]);
}).catch(function(error){
console.log("error",error);
});
});
socket.on("disconnect", function() {
console.log(`${getUsername} left the chat.`);
});
} }
socket.emit('general',[{
username: 'Server',
date: new Date(),
channel: 'general',
message: `${getUsername} joined the chat.`
}]);
}); });
socket.on('general',function(data){
const username = data.username;
const date = Date.now();
const channel = 'general';
const message = data.message;
messages.insertMany([{
username: username,
date: date,
channel: channel,
message: message
}
]).then(function(){
console.log(data, "inserted");
socket.broadcast.emit('general',[data]);
socket.emit('general',[data]);
}).catch(function(error){
console.log("error",error);
});
});
socket.on("disconnect", function() {
console.log(`${getUsername} left the chat.`);
});
}); });
server.listen(port, () => { server.listen(port, () => {