From 56350ffe1a15ad2c51af6feb8fd7fef1518321ad Mon Sep 17 00:00:00 2001 From: Wyatt Johnson Date: Mon, 6 Mar 2017 09:58:21 -0700 Subject: [PATCH 1/2] Moved to correct route --- routes/api/index.js | 6 +++++- routes/index.js | 5 ----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/routes/api/index.js b/routes/api/index.js index 56846acde..764612f78 100644 --- a/routes/api/index.js +++ b/routes/api/index.js @@ -1,11 +1,15 @@ const express = require('express'); const authorization = require('../../middleware/authorization'); +const pkg = require('../../package.json'); const router = express.Router(); +router.get('/', (req, res) => { + res.json({version: pkg.version}); +}); + router.use('/assets', authorization.needed('ADMIN'), require('./assets')); router.use('/settings', authorization.needed('ADMIN'), require('./settings')); - router.use('/auth', require('./auth')); router.use('/users', require('./users')); router.use('/account', require('./account')); diff --git a/routes/index.js b/routes/index.js index 057199382..58c8f13d7 100644 --- a/routes/index.js +++ b/routes/index.js @@ -1,13 +1,8 @@ const express = require('express'); const path = require('path'); -const pkg = require('../package.json'); const router = express.Router(); -router.get('/', (req, res) => { - res.json({version: pkg.version}); -}); - router.use('/api/v1', require('./api')); router.use('/admin', require('./admin')); router.use('/embed', require('./embed')); From 1c81d0a04fa15c93ad5bd09d26a428783de528a4 Mon Sep 17 00:00:00 2001 From: Wyatt Johnson Date: Mon, 6 Mar 2017 13:00:22 -0700 Subject: [PATCH 2/2] Update index.js --- routes/admin/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routes/admin/index.js b/routes/admin/index.js index e2473bca9..cb256327a 100644 --- a/routes/admin/index.js +++ b/routes/admin/index.js @@ -12,7 +12,7 @@ router.get('/password-reset', (req, res) => { // TODO: store the redirect uri in the token or something fancy. // admins and regular users should probably be redirected to different places. - res.render('password-reset', {redirectUri: process.env.TALK_ROOT_URL}); + res.render('admin/password-reset', {redirectUri: process.env.TALK_ROOT_URL}); }); router.get('*', (req, res) => {