diff --git a/package-lock.json b/package-lock.json index 24a1511..8bd5ec0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,6 @@ "dependencies": { "axios": "^0.21.1", "config": "^3.3.6", - "connect-ensure-login": "^0.1.1", "cookie-parser": "^1.4.5", "core-js": "^3.6.5", "cors": "^2.8.5", @@ -4188,14 +4187,6 @@ "node": ">= 10.0.0" } }, - "node_modules/connect-ensure-login": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/connect-ensure-login/-/connect-ensure-login-0.1.1.tgz", - "integrity": "sha1-F03MUSQ7nqwj+NmCFa62aU4uihI=", - "engines": { - "node": ">= 0.4.0" - } - }, "node_modules/connect-history-api-fallback": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz", @@ -19466,11 +19457,6 @@ "json5": "^2.1.1" } }, - "connect-ensure-login": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/connect-ensure-login/-/connect-ensure-login-0.1.1.tgz", - "integrity": "sha1-F03MUSQ7nqwj+NmCFa62aU4uihI=" - }, "connect-history-api-fallback": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz", diff --git a/package.json b/package.json index 43b8611..17c13bc 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,6 @@ "dependencies": { "axios": "^0.21.1", "config": "^3.3.6", - "connect-ensure-login": "^0.1.1", "cookie-parser": "^1.4.5", "core-js": "^3.6.5", "cors": "^2.8.5", diff --git a/server/app.js b/server/app.js index b3bdae8..aac7d0a 100644 --- a/server/app.js +++ b/server/app.js @@ -7,9 +7,7 @@ const path = require('path') const cookieParser = require('cookie-parser') const config = require('config') -const indexRouter = require('./routes/index') const authRouter = require('./routes/auth') -const myaccountRouter = require('./routes/myaccount') const usersRouter = require('./routes/users') const app = express() @@ -43,9 +41,7 @@ app.use(passport.initialize()) app.use(passport.authenticate('session')) // Define routes -app.use('/', indexRouter) app.use('/', authRouter) -app.use('/myaccount', myaccountRouter) app.use('/users', usersRouter) module.exports = app diff --git a/server/routes/index.js b/server/routes/index.js deleted file mode 100644 index a9dc002..0000000 --- a/server/routes/index.js +++ /dev/null @@ -1,8 +0,0 @@ -const express = require('express') -const router = express.Router() - -router.get('/', function (req, res, next) { - res.json({ user: req.user }) -}) - -module.exports = router diff --git a/server/routes/myaccount.js b/server/routes/myaccount.js deleted file mode 100644 index 54a53ff..0000000 --- a/server/routes/myaccount.js +++ /dev/null @@ -1,23 +0,0 @@ -const express = require('express') -const ensureLoggedIn = require('connect-ensure-login').ensureLoggedIn -const db = require('../db') - -const router = express.Router() - -/* GET users listing. */ -router.get('/', - ensureLoggedIn(), - function (req, res, next) { - db.get('SELECT rowid AS id, username, name FROM users WHERE rowid = ?', [req.user.id], function (err, row) { - if (err) { return next(err) } - - const user = { - id: row.id.toString(), - username: row.username, - displayName: row.name - } - res.render('profile', { user: user }) - }) - }) - -module.exports = router