Modules now return a function which creates app-s, qmining module auth handle

modules/qmining/qmining.js

@@ -23,154 +23,170 @@ const bodyParser = require('body-parser')
 const busboy = require('connect-busboy')
 const app = express()
 
-const reqlogger = require('../../middlewares/reqlogger.middleware.js')
 const utils = require('../../utils/utils.js')
 const logger = require('../../utils/logger.js')
+const auth = require('../../middlewares/auth.middleware.js')
 
 let donateURL = ''
+let userDB
+
 try {
   donateURL = utils.ReadFile('./data/donateURL')
 } catch (e) {
   logger.Log('Couldnt read donate URL file!', logger.GetColor('red'))
 }
 
-app.use(bodyParser.urlencoded({
-  limit: '5mb',
-  extended: true
-}))
-app.use(bodyParser.json({
-  limit: '5mb'
-}))
-app.set('view engine', 'ejs')
-app.set('views', [
-  './modules/qmining/views',
-  './sharedViews'
-])
-app.use(reqlogger())
-app.use(express.static('modules/qmining/public'))
-app.use(express.static('public'))
-app.use(busboy({
-  limits: {
-    fileSize: 10000 * 1024 * 1024
-  }
-}))
-
-// --------------------------------------------------------------
-// REDIRECTS
-// --------------------------------------------------------------
-
-// to be backwards compatible
-app.get('/ask', function (req, res) {
-  logger.DebugLog(`Qmining module ask redirect`, 'ask', 1)
-  res.redirect(`http://api.frylabs.net/ask?q=${req.query.q}&subj=${req.query.subj}&data=${req.query.data}`)
-})
-
-const simpleRedirects = [
-  {
-    from: '/dataeditor',
-    to: 'https://dataeditor.frylabs.net'
-  },
-  {
-    from: '/install',
-    to: 'https://greasyfork.org/en/scripts/38999-moodle-elearning-kmooc-test-help'
-  },
-  {
-    from: '/servergit',
-    to: 'https://gitlab.com/MrFry/mrfrys-node-server'
-  },
-  {
-    from: '/scriptgit',
-    to: 'https://gitlab.com/MrFry/moodle-test-userscript'
-  },
-  {
-    from: '/qminingSite',
-    to: 'https://gitlab.com/MrFry/qmining-page'
-  },
-  {
-    from: '/classesgit',
-    to: 'https://gitlab.com/MrFry/question-classes'
-  },
-  {
-    from: '/menuClick',
-    to: '/'
-  },
-  {
-    from: '/lred',
-    to: '/allQuestions.html'
-  },
-  {
-    from: '/donate',
-    to: donateURL
-  },
-  { // to be backwards compatible
-    from: '/legacy',
-    to: '/allQuestions.html'
-  },
-  {
-    from: '/allqr',
-    to: 'http://api.frylabs.net/allqr.txt'
-  },
-  {
-    from: '/allqr.txt',
-    to: 'http://api.frylabs.net/allqr.txt'
-  },
-  {
-    from: '/infos',
-    to: 'http://api.frylabs.net/infos?version=true&motd=true&subjinfo=true',
-    nolog: true
-  },
-  {
-    from: '/irc',
-    to: 'https://kiwiirc.com/nextclient/irc.sub.fm/#qmining'
-  }
-]
-
-simpleRedirects.forEach((redirect) => {
-  app.get(redirect.from, function (req, res) {
-    if (!redirect.nolog) {
-      logger.LogReq(req)
+function GetApp () {
+  app.use(bodyParser.urlencoded({
+    limit: '5mb',
+    extended: true
+  }))
+  app.use(bodyParser.json({
+    limit: '5mb'
+  }))
+  app.set('view engine', 'ejs')
+  app.set('views', [
+    './modules/qmining/views',
+    './sharedViews'
+  ])
+  app.use(auth({
+    userDB: userDB,
+    jsonResponse: false,
+    exceptions: [
+      '/favicon.ico'
+    ]
+  }))
+  app.use(express.static('modules/qmining/public'))
+  app.use(express.static('public'))
+  app.use(busboy({
+    limits: {
+      fileSize: 10000 * 1024 * 1024
     }
-    logger.DebugLog(`Qmining module ${redirect.from} redirect`, 'infos', 1)
-    res.redirect(`${redirect.to}`)
+  }))
+
+  // --------------------------------------------------------------
+  // REDIRECTS
+  // --------------------------------------------------------------
+
+  // to be backwards compatible
+  app.get('/ask', function (req, res) {
+    logger.DebugLog(`Qmining module ask redirect`, 'ask', 1)
+    res.redirect(`http://api.frylabs.net/ask?q=${req.query.q}&subj=${req.query.subj}&data=${req.query.data}`)
   })
-})
 
-// --------------------------------------------------------------
-
-function AddHtmlRoutes (files) {
-  const routes = files.reduce((acc, f) => {
-    if (f.includes('html')) {
-      acc.push(f.split('.')[0])
-      return acc
+  const simpleRedirects = [
+    {
+      from: '/dataeditor',
+      to: 'https://dataeditor.frylabs.net'
+    },
+    {
+      from: '/install',
+      to: 'https://greasyfork.org/en/scripts/38999-moodle-elearning-kmooc-test-help'
+    },
+    {
+      from: '/servergit',
+      to: 'https://gitlab.com/MrFry/mrfrys-node-server'
+    },
+    {
+      from: '/scriptgit',
+      to: 'https://gitlab.com/MrFry/moodle-test-userscript'
+    },
+    {
+      from: '/qminingSite',
+      to: 'https://gitlab.com/MrFry/qmining-page'
+    },
+    {
+      from: '/classesgit',
+      to: 'https://gitlab.com/MrFry/question-classes'
+    },
+    {
+      from: '/menuClick',
+      to: '/'
+    },
+    {
+      from: '/lred',
+      to: '/allQuestions.html'
+    },
+    {
+      from: '/donate',
+      to: donateURL
+    },
+    { // to be backwards compatible
+      from: '/legacy',
+      to: '/allQuestions.html'
+    },
+    {
+      from: '/allqr',
+      to: 'http://api.frylabs.net/allqr.txt'
+    },
+    {
+      from: '/allqr.txt',
+      to: 'http://api.frylabs.net/allqr.txt'
+    },
+    {
+      from: '/infos',
+      to: 'http://api.frylabs.net/infos?version=true&motd=true&subjinfo=true',
+      nolog: true
+    },
+    {
+      from: '/irc',
+      to: 'https://kiwiirc.com/nextclient/irc.sub.fm/#qmining'
     }
-    return acc
-  }, [])
+  ]
 
-  routes.forEach((route) => {
-    logger.DebugLog(`Added route /${route}`, 'Qmining routes', 1)
-    app.get(`/${route}`, function (req, res) {
-      logger.LogReq(req)
-      res.redirect(`${route}.html`)
+  simpleRedirects.forEach((redirect) => {
+    app.get(redirect.from, function (req, res) {
+      if (!redirect.nolog) {
+        logger.LogReq(req)
+      }
+      logger.DebugLog(`Qmining module ${redirect.from} redirect`, 'infos', 1)
+      res.redirect(`${redirect.to}`)
     })
   })
+
+  // --------------------------------------------------------------
+
+  function AddHtmlRoutes (files) {
+    const routes = files.reduce((acc, f) => {
+      if (f.includes('html')) {
+        acc.push(f.split('.')[0])
+        return acc
+      }
+      return acc
+    }, [])
+
+    routes.forEach((route) => {
+      logger.DebugLog(`Added route /${route}`, 'Qmining routes', 1)
+      app.get(`/${route}`, function (req, res) {
+        logger.LogReq(req)
+        res.redirect(`${route}.html`)
+      })
+    })
+  }
+  AddHtmlRoutes(utils.ReadDir('modules/qmining/public'))
+
+  // --------------------------------------------------------------
+
+  app.get('/', function (req, res) {
+    res.end('hai')
+    logger.LogReq(req)
+  })
+
+  app.get('*', function (req, res) {
+    res.status(404).render('404')
+  })
+
+  app.post('*', function (req, res) {
+    res.status(404).render('404')
+  })
+
+  return {
+    app: app
+  }
 }
-AddHtmlRoutes(utils.ReadDir('modules/qmining/public'))
 
-// --------------------------------------------------------------
-
-app.get('/', function (req, res) {
-  res.end('hai')
-  logger.LogReq(req)
-})
-
-app.get('*', function (req, res) {
-  res.status(404).render('404')
-})
-
-app.post('*', function (req, res) {
-  res.status(404).render('404')
-})
-
-exports.app = app
-
-logger.Log('Qmining module started', logger.GetColor('yellow'))
+exports.name = 'Qmining'
+exports.getApp = GetApp
+exports.setup = (data) => {
+  userDB = data.userDB
+}