From f5626835f3c7cfc57f7e77c02a4964dc8a11aa31 Mon Sep 17 00:00:00 2001
From: mrfry <mrfry@airmail.cc>
Date: Sat, 7 Nov 2020 09:11:53 +0100
Subject: [PATCH] Added url module, and changed redirect so it passes req
queryes
---
package-lock.json | 21 +++++++++++++++++++++
package.json | 1 +
src/modules/qmining/qmining.js | 8 +++++++-
3 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/package-lock.json b/package-lock.json
index d808961..9440e1a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1718,6 +1718,11 @@
"resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
"integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
},
+ "querystring": {
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+ "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA="
+ },
"range-parser": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
@@ -2189,6 +2194,22 @@
"punycode": "^2.1.0"
}
},
+ "url": {
+ "version": "0.11.0",
+ "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+ "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+ "requires": {
+ "punycode": "1.3.2",
+ "querystring": "0.2.0"
+ },
+ "dependencies": {
+ "punycode": {
+ "version": "1.3.2",
+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+ "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
+ }
+ }
+ },
"util-deprecate": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
diff --git a/package.json b/package.json
index ec63e8c..89ff841 100755
--- a/package.json
+++ b/package.json
@@ -12,6 +12,7 @@
"express": "^4.6.1",
"express-ejs-layouts": "^1.1.0",
"sqlite3": "^4.1.1",
+ "url": "^0.11.0",
"uuid": "^7.0.3",
"vhost": "^3.0.2"
},
diff --git a/src/modules/qmining/qmining.js b/src/modules/qmining/qmining.js
index 7acf588..4e56141 100644
--- a/src/modules/qmining/qmining.js
+++ b/src/modules/qmining/qmining.js
@@ -22,6 +22,7 @@
const express = require('express')
const bodyParser = require('body-parser')
const busboy = require('connect-busboy')
+const url = require('url')
const app = express()
// other requires
@@ -171,7 +172,12 @@ function GetApp() {
logger.DebugLog(`Added route /${route}`, 'Qmining routes', 1)
app.get(`/${route}`, function(req, res) {
logger.LogReq(req)
- res.redirect(`${route}.html`)
+ res.redirect(
+ url.format({
+ pathname: `${route}.html`,
+ query: req.query,
+ })
+ )
})
})
}