From 0467f61196166dbfb138c7fe48557ffee4fe38f7 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Wed, 11 Dec 2013 14:44:13 -0800 Subject: Always require auth --- app.coffee | 8 +- routes/sessions.coffee | 3 +- routes/users.coffee | 15 +-- views/users/new.html | 288 +------------------------------------------------ 4 files changed, 6 insertions(+), 308 deletions(-) diff --git a/app.coffee b/app.coffee index 9adbe83c..7463b2d7 100644 --- a/app.coffee +++ b/app.coffee @@ -20,7 +20,7 @@ app.use(express.static(__dirname + '/public')) app.use(require('connect-assets')(src: 'public')) app.use(express.bodyParser()) app.use(express.cookieParser()) -app.use(express.session(secret: 'weareallmadeofstars', store: sessionStore, key: 'vanbtc.sid')) +app.use(express.session(secret: 'weareallmadeofstars', store: sessionStore, cookie: { maxAge: 25920000000 }, key: 'vanbtc.sid')) app.use(passport.initialize()) app.use(passport.session()) app.use(app.router) @@ -31,10 +31,8 @@ authorize = (req, res, next) -> return next() res.redirect('/login') -app.get('/', calculator.show) +app.get('/', sessions.new) app.get('/register', users.new) -app.get('/setup', calculator.new) -app.get('/calculator', calculator.show) app.get('/ticker', calculator.ticker) app.get('/login', sessions.new) @@ -54,7 +52,7 @@ app.post('/:user/update', authorize, users.update) app.get('/:user/transactions.json', authorize, transactions.json) app.post('/:user/transactions', authorize, transactions.create) app.get('/:user/report', authorize, transactions.index) -app.get('/:user', users.show) +app.get('/:user', authorize, users.show) app.use((err, req, res, next) -> res.status(500) diff --git a/routes/sessions.coffee b/routes/sessions.coffee index 1a740dc2..e120f79a 100644 --- a/routes/sessions.coffee +++ b/routes/sessions.coffee @@ -14,8 +14,7 @@ module.exports = (passport) -> req.login(user, (err) -> if (err) return next(err) - url = req.headers['referer'] - url = "/#{user.username}" unless /edit/.test(url) || /report/.test(url) + url = "/#{user.username}" return res.redirect(url) ) )(req, res, next) diff --git a/routes/users.coffee b/routes/users.coffee index 29300f90..762b519e 100644 --- a/routes/users.coffee +++ b/routes/users.coffee @@ -61,20 +61,7 @@ module.exports = (sessions) -> db.hmset(userkey, username: req.body.username, password: hash, - email: req.body.email, - firstname: req.body.firstname, - lastname: req.body.lastname, - company: req.body.company, - email: req.body.email, - phone: req.body.phone, - companytype: req.body.companytype, - address1: req.body.address1, - address2: req.body.address2, - city: req.body.city, - postcode: req.body.postcode, - state: req.body.state, - country: req.body.country, - web: req.body.web + email: req.body.email , -> req.headers['referer'] = "/#{req.body.username}/edit" sessions.create(req, res) diff --git a/views/users/new.html b/views/users/new.html index a2c249c7..976046d1 100644 --- a/views/users/new.html +++ b/views/users/new.html @@ -20,298 +20,12 @@ - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - -

- + -- cgit v1.2.3