diff --git a/src/middleware.js b/src/middleware.js index be96a6ffd8..f2e9f47baf 100644 --- a/src/middleware.js +++ b/src/middleware.js @@ -14,12 +14,6 @@ module.exports.forceSSL = function(req, res, next){ next() } -module.exports.splash = function(req, res, next) { - if (req.url == '/' && !req.headers['x-api-user'] && !req.headers['x-api-key'] && !(req.session && req.session.userId)) - return res.redirect('/static/front') - next() -}; - module.exports.cors = function(req, res, next) { res.header("Access-Control-Allow-Origin", req.headers.origin || "*"); res.header("Access-Control-Allow-Methods", "OPTIONS,GET,POST,PUT,HEAD,DELETE"); diff --git a/src/routes/pages.js b/src/routes/pages.js index 878527a521..3c69dd9f72 100644 --- a/src/routes/pages.js +++ b/src/routes/pages.js @@ -6,6 +6,9 @@ var middleware = require('../middleware') // -------- App -------- router.get('/', function(req, res) { + if (!req.headers['x-api-user'] && !req.headers['x-api-key'] && !(req.session && req.session.userId)) + return res.redirect('/static/front') + return res.render('index', { title: 'HabitRPG | Your Life, The Role Playing Game', env: middleware.locals(req) diff --git a/src/server.js b/src/server.js index 46ad2ef959..902669becd 100644 --- a/src/server.js +++ b/src/server.js @@ -93,7 +93,6 @@ app.use(express.methodOverride()); app.use(express.cookieParser()); app.use(express.cookieSession({ secret: nconf.get('SESSION_SECRET'), httpOnly: false, cookie: { maxAge: TWO_WEEKS }})); //app.use(express.session()); -app.use(middleware.splash); // Initialize Passport! Also use passport.session() middleware, to support // persistent login sessions (recommended).