From a6d260f6af3963c6184c8b985de0a376bdb633d2 Mon Sep 17 00:00:00 2001
From: MrFry <mrfry@airmail.cc>
Date: Wed, 8 Apr 2020 19:24:17 +0200
Subject: [PATCH] Added contact to login, added some auth exceptions

---
 middlewares/auth.middleware.js         |  2 +-
 modules/api/api.js                     |  8 +++++++-
 modules/dataEditor/qmining-data-editor |  2 +-
 modules/qmining/qmining-page           |  2 +-
 modules/qmining/qmining.js             |  7 +++++--
 sharedViews/login.ejs                  | 11 +++++++++++
 6 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/middlewares/auth.middleware.js b/middlewares/auth.middleware.js
index 46099ac..c854091 100644
--- a/middlewares/auth.middleware.js
+++ b/middlewares/auth.middleware.js
@@ -22,7 +22,7 @@ module.exports = function (options) {
     const ip = req.headers['cf-connecting-ip'] || req.connection.remoteAddress
     const sessionID = req.cookies.sessionID
     const isException = exceptions.some((exc) => {
-      return req.url === exc
+      return req.url.split('?')[0] === exc
     })
 
     // TODO Allowing all urls with _next in it, but not in params
diff --git a/modules/api/api.js b/modules/api/api.js
index 0bbf469..3d80e7f 100644
--- a/modules/api/api.js
+++ b/modules/api/api.js
@@ -72,7 +72,11 @@ function GetApp () {
     exceptions: [
       '/favicon.ico',
       '/login',
-      '/getveteranpw'
+      '/getveteranpw',
+      '/postfeedbackfile',
+      '/postfeedback',
+      '/fosuploader',
+      '/badtestsender'
     ]
   }))
   app.use(express.static('public'))
@@ -575,6 +579,7 @@ function GetApp () {
   }
 
   function IncrementAvaiblePWs () {
+    // FIXME: check this if this is legit and works
     const users = dbtools.SelectAll(userDB, 'users')
     const today = new Date()
     const getDayDiff = (dateString) => {
@@ -593,6 +598,7 @@ function GetApp () {
       }
 
       if (dayDiff % addPWPerDay === 0) {
+        logger.Log(`Incrementing avaible PW-s for user #${u.id}`, logger.GetColor('cyan'))
         dbtools.Update(userDB, 'users', {
           avaiblePWRequests: u.avaiblePWRequests + 1
         }, {
diff --git a/modules/dataEditor/qmining-data-editor b/modules/dataEditor/qmining-data-editor
index 0ba12f4..179aa6e 160000
--- a/modules/dataEditor/qmining-data-editor
+++ b/modules/dataEditor/qmining-data-editor
@@ -1 +1 @@
-Subproject commit 0ba12f4d67f2bfb5ba2553f32dec5a2b439960fb
+Subproject commit 179aa6ebfab2a85c59a251d7bf08988076a51732
diff --git a/modules/qmining/qmining-page b/modules/qmining/qmining-page
index 9f576a4..42e6d4d 160000
--- a/modules/qmining/qmining-page
+++ b/modules/qmining/qmining-page
@@ -1 +1 @@
-Subproject commit 9f576a41f6a8b1de82f2a0cf901046a76ff9a1ed
+Subproject commit 42e6d4dd4c86541bc02787a1df3e22ba8f781295
diff --git a/modules/qmining/qmining.js b/modules/qmining/qmining.js
index e89de38..3cd8de1 100644
--- a/modules/qmining/qmining.js
+++ b/modules/qmining/qmining.js
@@ -54,7 +54,10 @@ function GetApp () {
     jsonResponse: false,
     exceptions: [
       '/favicon.ico',
-      '/getVeteranPw'
+      '/getVeteranPw',
+      '/moodle-test-userscript/stable.user.js',
+      '/donate',
+      '/irc'
     ]
   }))
   app.use(express.static('modules/qmining/public'))
@@ -82,7 +85,7 @@ function GetApp () {
     },
     {
       from: '/install',
-      to: 'https://greasyfork.org/en/scripts/38999-moodle-elearning-kmooc-test-help'
+      to: 'https://qmining.frylabs.net/moodle-test-userscript/stable.user.js'
     },
     {
       from: '/servergit',
diff --git a/sharedViews/login.ejs b/sharedViews/login.ejs
index 10bd79b..410d9f1 100644
--- a/sharedViews/login.ejs
+++ b/sharedViews/login.ejs
@@ -62,6 +62,14 @@
           margin: 4px 2px;
           cursor: pointer;
         }
+        .ircLinkContainer {
+          display: flex;
+          justify-content: flex-end
+        }
+        .ircLink {
+          color: #9999ff;
+          font-size: 12px;
+        }
       </style>
     </head>
     <div class='center'>
@@ -77,6 +85,9 @@
             👁
           </span> -->
         </div>
+        <div class='ircLinkContainer' >
+          <a class='ircLink' href='https://qmining.frylabs.net/irc?loginClick'>Contact</a>
+        </div>
         <button id='sendButton' onclick="Login(this)">Submit</button>
       </div>
     </div>