Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-03 20:45:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

test router fix

Browse Source
This commit is contained in:
Baris Usakli
2017-07-25 12:54:23 -04:00
parent e9639833c5
commit 6087f3c8cd
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins.js
View File

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

6
src/routes/index.js
View File

@@ -118,8 +118,8 @@ module.exports = function (app, middleware, hotswapIds, callback) {
app.all(relativePath + '(/api/admin|/api/admin/*?)', middleware.isAdmin); app.all(relativePath + '(/api/admin|/api/admin/*?)', middleware.isAdmin);
app.all(relativePath + '(/admin|/admin/*?)', ensureLoggedIn.ensureLoggedIn(nconf.get('relative_path') + '/login?local=1'), middleware.applyCSRF, middleware.isAdmin); app.all(relativePath + '(/admin|/admin/*?)', ensureLoggedIn.ensureLoggedIn(nconf.get('relative_path') + '/login?local=1'), middleware.applyCSRF, middleware.isAdmin);
router.all('(/api/admin|/api/admin/*?)', middleware.isAdmin); // 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.all('(/admin|/admin/*?)', ensureLoggedIn.ensureLoggedIn(nconf.get('relative_path') + '/login?local=1'), middleware.applyCSRF, middleware.isAdmin);
adminRoutes(router, middleware, controllers); adminRoutes(router, middleware, controllers);
metaRoutes(router, middleware, controllers); metaRoutes(router, middleware, controllers);
@@ -138,7 +138,7 @@ module.exports = function (app, middleware, hotswapIds, callback) {
groupRoutes(router, middleware, controllers); groupRoutes(router, middleware, controllers);
for (x = 0; x < routers.length; x += 1) { for (x = 0; x < routers.length; x += 1) {
app.use(relativePath, routers[x]); app.use(relativePath ? relativePath : '/', routers[x]);
} }
if (process.env.NODE_ENV === 'development') { if (process.env.NODE_ENV === 'development') {