From 9a6553dbbbfa773dc9e0e59fa18d1795059eaabf Mon Sep 17 00:00:00 2001
From: MrFry <mrfry@airmail.cc>
Date: Thu, 9 Apr 2020 12:52:19 +0200
Subject: [PATCH] Auth logging prettying

---
 middlewares/auth.middleware.js | 4 +++-
 modules/api/api.js             | 6 +++---
 utils/logger.js                | 4 ++++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/middlewares/auth.middleware.js b/middlewares/auth.middleware.js
index c854091..400c588 100644
--- a/middlewares/auth.middleware.js
+++ b/middlewares/auth.middleware.js
@@ -25,13 +25,15 @@ module.exports = function (options) {
       return req.url.split('?')[0] === exc
     })
 
-    // TODO Allowing all urls with _next in it, but not in params
+    // FIXME Allowing all urls with _next in it, but not in params
     if (req.url.split('?')[0].includes('_next')) {
+      req.session = { isException: true }
       next()
       return
     }
 
     if (isException) {
+      req.session = { isException: true }
       logger.DebugLog(`EXCEPTION: ${req.url}`, 'auth', 1)
       next()
       return
diff --git a/modules/api/api.js b/modules/api/api.js
index 5339925..b898715 100644
--- a/modules/api/api.js
+++ b/modules/api/api.js
@@ -245,7 +245,7 @@ function GetApp () {
       })
 
       if (existingSessions.length > 0) {
-        logger.Log(`Multiple sessions ( ${existingSessions.length} ) for #${user.id}, deleting olds`, logger.GetColor('cyan'))
+        logger.Log(`Multiple ${isScript ? 'script' : 'website'} sessions ( ${existingSessions.length} ) for #${user.id}, deleting olds`, logger.GetColor('cyan'))
         existingSessions.forEach((sess) => {
           dbtools.Delete(userDB, 'sessions', {
             id: sess.id,
@@ -284,9 +284,9 @@ function GetApp () {
         result: 'success',
         msg: 'you are now logged in'
       })
-      logger.Log(`Successfull login with user ID: #${user.id}`, logger.GetColor('cyan'))
+      logger.Log(`Successfull login to ${isScript ? 'script' : 'website'} with user ID: #${user.id}`, logger.GetColor('cyan'))
     } else {
-      logger.Log(`Login attempt with invalid pw: ${pw}`, logger.GetColor('cyan'))
+      logger.Log(`Login attempt with invalid pw: ${pw} to ${isScript ? 'script' : 'website'}`, logger.GetColor('cyan'))
       res.json({
         result: 'error',
         msg: 'Invalid password'
diff --git a/utils/logger.js b/utils/logger.js
index b857e68..5c4aea3 100755
--- a/utils/logger.js
+++ b/utils/logger.js
@@ -127,6 +127,10 @@ function LogReq (req, toFile, sc) {
 
     if (req.session && req.session.user) {
       logEntry += C('cyan') + req.session.user.id + C() + dl
+    } else if (req.session && req.session.isException === true) {
+      logEntry += C('cyan') + 'EX' + C() + dl
+    } else {
+      logEntry += C('red') + 'NOUSER' + C() + dl
     }
 
     logEntry += GetRandomColor(req.url.split('?')[0]) + req.url