diff --git a/src/middlewares/auth.middleware.ts b/src/middlewares/auth.middleware.ts
index fc2a16b..387b363 100644
--- a/src/middlewares/auth.middleware.ts
+++ b/src/middlewares/auth.middleware.ts
@@ -24,7 +24,6 @@ import type { Database } from 'better-sqlite3'
import logger from '../utils/logger'
import dbtools from '../utils/dbtools'
-import constants from '../constants'
interface Options {
userDB: Database
@@ -51,9 +50,7 @@ function renderLogin(req: Request, res: Response) {
msg: 'You are not logged in',
})
} else {
- res.render('login', {
- domain: constants.domain,
- })
+ res.render('login')
}
}
diff --git a/src/modules/api/api.ts b/src/modules/api/api.ts
index b97bd4c..7295154 100644
--- a/src/modules/api/api.ts
+++ b/src/modules/api/api.ts
@@ -214,7 +214,7 @@ function setupSubModules(
const loadedModData = mod.setup({
app: parentApp,
userDB: userDB,
- url: url,
+ url: url, // only used by userManagement.ts
publicdirs: publicdirs,
moduleSpecificData: moduleSpecificData,
httpServer: httpServer,
diff --git a/src/modules/api/submodules/feedback.ts b/src/modules/api/submodules/feedback.ts
index f0aada2..7eeba62 100644
--- a/src/modules/api/submodules/feedback.ts
+++ b/src/modules/api/submodules/feedback.ts
@@ -26,7 +26,7 @@ import { Request, SubmoduleData } from '../../../types/basicTypes'
const uloadFiles = 'data/f'
function setup(data: SubmoduleData): void {
- const { app /* userDB, url, publicdirs, moduleSpecificData */ } = data
+ const { app } = data
app.route('/fosuploader').post(function (req: Request, res: Response) {
utils.uploadFile(req, uloadFiles).then(({ fileName }) => {
diff --git a/src/modules/api/submodules/forum.ts b/src/modules/api/submodules/forum.ts
index b6e9dad..2197b11 100644
--- a/src/modules/api/submodules/forum.ts
+++ b/src/modules/api/submodules/forum.ts
@@ -184,8 +184,7 @@ function getPostData(
}
function setup(data: SubmoduleData): void {
- const { app, /* userDB, url, */ publicdirs /*, moduleSpecificData */ } =
- data
+ const { app, publicdirs } = data
const publicDir = publicdirs[0]
diff --git a/src/modules/api/submodules/qminingapi.ts b/src/modules/api/submodules/qminingapi.ts
index 16313f5..d46c293 100644
--- a/src/modules/api/submodules/qminingapi.ts
+++ b/src/modules/api/submodules/qminingapi.ts
@@ -450,7 +450,7 @@ function setup(data: SubmoduleData): Submodule {
const {
app,
userDB,
- /* url */ publicdirs,
+ publicdirs,
moduleSpecificData: { getQuestionDbs, setQuestionDbs, dbsFile },
} = data
diff --git a/src/modules/api/submodules/quickvote.ts b/src/modules/api/submodules/quickvote.ts
index 1719ce0..bd928cf 100644
--- a/src/modules/api/submodules/quickvote.ts
+++ b/src/modules/api/submodules/quickvote.ts
@@ -39,7 +39,7 @@ interface QuickVote {
}
function setup(data: SubmoduleData): void {
- const { app /* userDB, url, publicdirs, moduleSpecificData */ } = data
+ const { app } = data
app.get('/quickvote', (req: Request, res: Response) => {
const key = req.query.key.toString()
diff --git a/src/modules/api/submodules/ranklist.ts b/src/modules/api/submodules/ranklist.ts
index aa88d4d..54ab997 100644
--- a/src/modules/api/submodules/ranklist.ts
+++ b/src/modules/api/submodules/ranklist.ts
@@ -58,7 +58,7 @@ function mergeObjSum(a: Subjects, b: Subjects) {
}
function setup(data: SubmoduleData): void {
- const { app /* userDB, url, publicdirs, moduleSpecificData */ } = data
+ const { app } = data
app.get('/ranklist', (req: Request, res) => {
logger.LogReq(req)
diff --git a/src/modules/api/submodules/todos.ts b/src/modules/api/submodules/todos.ts
index 1593305..5170f7d 100644
--- a/src/modules/api/submodules/todos.ts
+++ b/src/modules/api/submodules/todos.ts
@@ -74,7 +74,7 @@ interface Todos {
const todosFile = 'data/todos.json'
function setup(data: SubmoduleData): void {
- const { app /* userDB, url, publicdirs, moduleSpecificData */ } = data
+ const { app } = data
app.get('/voteTodo', (req: Request, res: Response) => {
logger.LogReq(req)
diff --git a/src/modules/api/submodules/userFiles.ts b/src/modules/api/submodules/userFiles.ts
index b992645..dba9591 100644
--- a/src/modules/api/submodules/userFiles.ts
+++ b/src/modules/api/submodules/userFiles.ts
@@ -83,7 +83,7 @@ function listDir(publicDir: string, subdir: string, userFilesDir: string) {
}
function setup(data: SubmoduleData): void {
- const { app, /* userDB, url, */ publicdirs /* moduleSpecificData */ } = data
+ const { app, publicdirs } = data
app.use((req: Request, _res, next) => {
// /userFiles/test/2021-04-28_10-59.png
diff --git a/src/modules/api/submodules/userManagement.ts b/src/modules/api/submodules/userManagement.ts
index 9c6f31e..20d9d34 100644
--- a/src/modules/api/submodules/userManagement.ts
+++ b/src/modules/api/submodules/userManagement.ts
@@ -90,7 +90,7 @@ function createDefaultUser(userDb: Database) {
const validationTokenName = 'qmining' // readValidationTokenName()
function setup(data: SubmoduleData): Submodule {
- const { app, userDB, url /* publicdirs, moduleSpecificData */ } = data
+ const { app, userDB, url } = data
const domain: any = url
logger.DebugLog(`Cookie domain: ${domain}`, 'cookie', 1)
diff --git a/src/modules/qmining/qmining.ts b/src/modules/qmining/qmining.ts
index 190f9e7..dd1a0a2 100644
--- a/src/modules/qmining/qmining.ts
+++ b/src/modules/qmining/qmining.ts
@@ -35,7 +35,6 @@ import { LinksSchema, validateJSON } from '../../types/typeSchemas'
let publicdirs: string[] = []
let userDB: Database
let nextdir = ''
-let domain = ''
function GetApp(): ModuleType {
app.use(
@@ -112,18 +111,10 @@ function GetApp(): ModuleType {
// REDIRECTS
// --------------------------------------------------------------
- // to be backwards compatible
- app.get('/ask', function (req: Request, res) {
- logger.DebugLog(`Qmining module ask redirect`, 'ask', 1)
- res.redirect(
- `http://${domain}/ask?q=${req.query.q}&subj=${req.query.subj}&data=${req.query.data}`
- )
- })
-
const simpleRedirects = [
{
from: '/install',
- to: `https://${domain}/moodle-test-userscript/stable.user.js`,
+ to: `/moodle-test-userscript/stable.user.js`,
},
{
from: '/servergit',
@@ -163,15 +154,15 @@ function GetApp(): ModuleType {
},
{
from: '/allqr',
- to: `https://${domain}/api/allqr.txt`,
+ to: `/api/allqr.txt`,
},
{
from: '/allqr.txt',
- to: `https://${domain}/api/allqr.txt`,
+ to: `/api/allqr.txt`,
},
{
from: '/infos',
- to: `https://${domain}/api/infos?version=true&motd=true&subjinfo=true`,
+ to: `/api/infos?version=true&motd=true&subjinfo=true`,
nolog: true,
},
{
@@ -261,7 +252,6 @@ export default {
name: 'Qmining',
getApp: GetApp,
setup: (data: SetupData): void => {
- domain = data.url
userDB = data.userDB
publicdirs = data.publicdirs
nextdir = data.nextdir
diff --git a/src/server.ts b/src/server.ts
index 4f8ef43..0feed7b 100755
--- a/src/server.ts
+++ b/src/server.ts
@@ -239,7 +239,7 @@ Object.keys(modules).forEach(function (key) {
if (mod.setup) {
mod.setup({
- url: constants.domain,
+ url: constants.domain, // used by api.ts -> userManagement.ts -> cookies
userDB: userDB,
publicdirs: module.publicdirs,
nextdir: module.nextdir,
@@ -267,7 +267,7 @@ app.get('*', (req, res) => {
if (req.is('application/json')) {
res.status(404).end()
} else {
- res.status(404).render('404', { domain: constants.domain })
+ res.status(404).render('404')
}
})
diff --git a/src/sharedViews/login.ejs b/src/sharedViews/login.ejs
index 12151b8..7bed923 100644
--- a/src/sharedViews/login.ejs
+++ b/src/sharedViews/login.ejs
@@ -1,7 +1,7 @@
- Qmining | <%= domain %> - Login
+ Qmining - Login