From 660d12e8415fc436e669ccb4ccf9a9416b5dd0ae Mon Sep 17 00:00:00 2001
From: NyxiumYuuki <ATAWV5n2q8KG3kn>
Date: Sat, 29 May 2021 14:42:08 +0200
Subject: [PATCH] Auth is now working with keys

---
 backend/service-authentication/server.js |   9 +-
 backend/service-message/server.js        | 104 ++++++++++++-----------
 2 files changed, 61 insertions(+), 52 deletions(-)

diff --git a/backend/service-authentication/server.js b/backend/service-authentication/server.js
index 7f226dc..0acca8f 100644
--- a/backend/service-authentication/server.js
+++ b/backend/service-authentication/server.js
@@ -19,17 +19,24 @@ mongoConnect.connectToServer(function( err, client ) {
     const checkLogin = require('./checkLogin');
     const register = require('./register');
     const queries = require('./mongodbQueries');
+    const auth =  require('./auth');
 
     queries.register('Server','admin');
     queries.register('khai','test');
     queries.register('wilfried','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) => {
         checkLogin(req,res);
     });
 
-
     app.post('/register', (req, res) => {
         register(req,res);
     });
diff --git a/backend/service-message/server.js b/backend/service-message/server.js
index bb685f7..f57e942 100644
--- a/backend/service-message/server.js
+++ b/backend/service-message/server.js
@@ -30,59 +30,61 @@ io.on('connection',socket => {
 
     let users = {};
 
-    const session = auth.getSession(socket.request);
-    const getUsername = auth.getUsername(session);
-    if (getUsername === -1) {
-        socket.emit('error','not authenticated');
-    }
-    console.log(`${getUsername} joined the chat.`);
-    socket.broadcast.emit('general',[{
-        username: 'Server',
-        date: new Date(),
-        channel: 'general',
-        message: `${getUsername} joined the chat.`
-    }]);
-    users[socket.id] = getUsername;
-    messages.find({}, {'_id':0},{sort: {'date':1}},(err, res) => {
-        if(err) throw err;
-        if(res.length > 0){
-            //console.log(res, res.length);
-            socket.emit('general',res);
+    auth.getSession(socket.request, function(res){
+        const getUsername = auth.getUsername(res);
+        if (getUsername === -1) {
+            socket.send('error','not authenticated');
+        }
+        else{
+            console.log(`${getUsername} joined the chat.`);
+            socket.broadcast.emit('general',[{
+                username: 'Server',
+                date: new Date(),
+                channel: 'general',
+                message: `${getUsername} joined the chat.`
+            }]);
+            users[socket.id] = getUsername;
+            messages.find({}, {'_id':0},{sort: {'date':1}},(err, res) => {
+                if(err) throw err;
+                if(res.length > 0){
+                    //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, () => {