From affe228986f76b06aa96b3789852a01f8a950644 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Sat, 23 Aug 2014 19:04:14 -0700 Subject: Direct to originally requested page after authorization --- src/app.coffee | 9 ++++++--- src/routes/sessions.coffee | 8 +++----- 2 files changed, 9 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/app.coffee b/src/app.coffee index a0ac6334..4198754c 100644 --- a/src/app.coffee +++ b/src/app.coffee @@ -34,10 +34,13 @@ authorize = (req, res, next) -> if req.params.user is req.user?.username or req.user?.username is 'admin' return next() + + req.session.redirect = req.path res.redirect('/login') cache = (req, res, next) -> - res.setHeader "Cache-Control", "public, max-age=900" + unless req.path is '/login' + res.setHeader "Cache-Control", "public, max-age=900" next() fetchRates = -> @@ -69,12 +72,12 @@ app.get('/logout', sessions.destroy) app.get('/users/new', cache, users.new) app.post('/users', users.create) -app.get('/:user/edit', authorize, cache, users.edit) +app.get('/:user/edit', authorize, users.edit) app.post('/:user', authorize, users.update) app.get('/:user/transactions.json', authorize, transactions.json) app.post('/:user/transactions', transactions.create) -app.get('/:user/report', authorize, cache, transactions.index) +app.get('/:user/report', authorize, transactions.index) app.get('/:user.json', users.json) app.get('/:user', cache, users.show) diff --git a/src/routes/sessions.coffee b/src/routes/sessions.coffee index 67efba75..30d3cdef 100644 --- a/src/routes/sessions.coffee +++ b/src/routes/sessions.coffee @@ -21,11 +21,9 @@ module.exports = (passport) -> if (err) return next(err) - if /edit/.test(req.headers['referer']) - url = "/#{user.username}/edit" - else - url = "/#{user.username}" - + url = req.session.redirect if req.session.redirect? + url ?= "/#{user.username}" + delete req.session.redirect return res.redirect(url) ) )(req, res, next) -- cgit v1.2.3