Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-05-06 15:06:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove some deprecated/unnecessary code (#9688)

Browse Source 
* refactor: remove mkdirp promisify

* refactor: remove old session deletion API route

* refactor: remove middleware.isAdmin

* refactor: remove templateValues.config.bootswatchSkin

* fix: unused dependencies
This commit is contained in:
Opliko
2021-08-02 04:03:19 +02:00
committed by GitHub
parent 9db28b4b4f
commit d509a307f0
4 changed files with 1 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/middleware/header.js
View File

@@ -101,7 +101,6 @@ middleware.renderHeader = async function renderHeader(req, res, data) {
results.user.isEmailConfirmSent = !!results.isEmailConfirmSent;
templateValues.bootswatchSkin = (parseInt(meta.config.disableCustomUserSkins, 10) !== 1 ? res.locals.config.bootswatchSkin : '') || meta.config.bootswatchSkin || '';
templateValues.config.bootswatchSkin = templateValues.bootswatchSkin || 'noskin'; // TODO remove in v1.12.0+
templateValues.browserTitle = results.browserTitle;
({
navigation: templateValues.navigation,

43
src/middleware/user.js
View File

@@ -1,11 +1,9 @@
'use strict';
const nconf = require('nconf');
const winston = require('winston');
const passport = require('passport');
const util = require('util');
const meta = require('../meta');
const user = require('../user');
const privileges = require('../privileges');
const plugins = require('../plugins');
@@ -209,47 +207,6 @@ module.exports = function (middleware) {
controllers.helpers.redirect(res, path);
});
middleware.isAdmin = helpers.try(async (req, res, next) => {
// TODO: Remove in v1.16.0
winston.warn('[middleware] middleware.isAdmin deprecated, use middleware.admin.checkPrivileges instead');
const isAdmin = await user.isAdministrator(req.uid);
if (!isAdmin) {
return controllers.helpers.notAllowed(req, res);
}
const hasPassword = await user.hasPassword(req.uid);
if (!hasPassword) {
return next();
}
const loginTime = req.session.meta ? req.session.meta.datetime : 0;
const adminReloginDuration = meta.config.adminReloginDuration * 60000;
const disabled = meta.config.adminReloginDuration === 0;
if (disabled || (loginTime && parseInt(loginTime, 10) > Date.now() - adminReloginDuration)) {
const timeLeft = parseInt(loginTime, 10) - (Date.now() - adminReloginDuration);
if (req.session.meta && timeLeft < Math.min(300000, adminReloginDuration)) {
req.session.meta.datetime += Math.min(300000, adminReloginDuration);
}
return next();
}
let returnTo = req.path;
if (nconf.get('relative_path')) {
returnTo = req.path.replace(new RegExp(`^${nconf.get('relative_path')}`), '');
}
returnTo = returnTo.replace(/^\/api/, '');
req.session.returnTo = returnTo;
req.session.forceLogin = 1;
if (res.locals.isAPI) {
controllers.helpers.formatApiResponse(401, res);
} else {
res.redirect(`${nconf.get('relative_path')}/login?local=1`);
}
});
middleware.requireUser = function (req, res, next) {
if (req.loggedIn) {
return next();