Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
Julian Lam
2017-07-25 12:28:43 -04:00
177 changed files with 645 additions and 615 deletions

View File

@@ -117,6 +117,10 @@ Plugins.reload = function (callback) {
Plugins.reloadRoutes = function (callback) {
var router = express.Router();
var ensureLoggedIn = require('connect-ensure-login');
router.all('(/api/admin|/api/admin/*?)', middleware.isAdmin);
router.all('(/admin|/admin/*?)', ensureLoggedIn.ensureLoggedIn(nconf.get('relative_path') + '/login?local=1'), middleware.applyCSRF, middleware.isAdmin);
router.hotswapId = 'plugins';
router.render = function () {