Lotsa typescript bullshit

src/middlewares/auth.middleware.ts

@@ -1,8 +1,14 @@
-const logger = require('../utils/logger.js')
-const utils = require('../utils/utils.js')
-const dbtools = require('../utils/dbtools.js')
+import logger from '../utils/logger'
+import utils from '../utils/utils'
+import dbtools from '../utils/dbtools'
 
-module.exports = function(options) {
+interface Options {
+  userDB: any
+  jsonResponse: boolean
+  exceptions: Array<string>
+}
+
+export default function(options: Options): any {
   const { userDB, jsonResponse, exceptions } = options
 
   const renderLogin = (req, res) => {
@@ -60,7 +66,7 @@ module.exports = function(options) {
       return
     }
 
-    const user = GetUserBySessionID(userDB, sessionID, req)
+    const user = GetUserBySessionID(userDB, sessionID)
 
     if (!user) {
       if (isException) {
@@ -127,7 +133,7 @@ function UpdateAccess(db, user, ip, sessionID) {
   }
 }
 
-function GetUserBySessionID(db, sessionID, req) {
+function GetUserBySessionID(db: any, sessionID: string) {
   logger.DebugLog(`Getting user from db`, 'auth', 2)
 
   const session = dbtools.Select(db, 'sessions', {

src/middlewares/reqlogger.middleware.ts

@@ -1,6 +1,11 @@
-const logger = require('../utils/logger.js')
+import logger from '../utils/logger'
 
-module.exports = function(options) {
+interface Options {
+  loggableKeywords: Array<string>
+  loggableModules: Array<string>
+}
+
+export default function(options: Options): any {
   const loggableKeywords = options ? options.loggableKeywords : undefined
   const loggableModules = options ? options.loggableModules : undefined
 
@@ -24,13 +29,13 @@ module.exports = function(options) {
       // fixme: regexp includes checking
       const hasLoggableKeyword =
         loggableKeywords &&
-        loggableKeywords.some((x) => {
-          return req.url.includes(x)
+        loggableKeywords.some((keyword) => {
+          return req.url.includes(keyword)
         })
       const hasLoggableModule =
         loggableModules &&
-        loggableModules.some((x) => {
-          return hostname.includes(x)
+        loggableModules.some((keyword) => {
+          return hostname.includes(keyword)
         })
       const toLog = hasLoggableModule || hasLoggableKeyword