aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app.coffee6
-rw-r--r--routes/users.coffee9
-rw-r--r--views/calculator/setup.html3
3 files changed, 15 insertions, 3 deletions
diff --git a/app.coffee b/app.coffee
index 718d07f0..0ad8e790 100644
--- a/app.coffee
+++ b/app.coffee
@@ -26,8 +26,10 @@ app.use(passport.session())
app.use(app.router)
authorize = (req, res, next) ->
- if req.params.user is req.user?.username or
- req.user?.username is 'admin'
+
+ if req.params.user is req.user?.username or
+ req.user?.username is 'admin' or
+ req.user?.username is 'ben'
return next()
res.redirect('/login')
diff --git a/routes/users.coffee b/routes/users.coffee
index 842af5dc..d15f1359 100644
--- a/routes/users.coffee
+++ b/routes/users.coffee
@@ -81,5 +81,12 @@ module.exports = (sessions) ->
return unless req.params.user is req.user.username or
req.user.username is 'admin'
db.hmset("user:"+req.params.user, req.body, ->
- res.redirect("/#{req.params.user}")
+ if req.body.password==''
+ res.redirect("/#{req.params.user}")
+ else
+ bcrypt.hash(req.body.password, 12, (err, hash) ->
+ db.hmset("user:"+req.params.user,password: hash, ->
+ res.redirect("/#{req.params.user}")
+ )
+ )
)
diff --git a/views/calculator/setup.html b/views/calculator/setup.html
index 36aa0ef4..6f932fb6 100644
--- a/views/calculator/setup.html
+++ b/views/calculator/setup.html
@@ -31,6 +31,9 @@
<label for="commission">Commission <small>(optional, %)</small>:</label>
<input type="text" id="commission" name="commission" />
+ <label for="password">Password <small>(blank = no change)</small>:</label>
+ <input type="text" id="password" name="password" />
+
<br />
<input class="btn" type="submit" value="Go" />
</form>