summaryrefslogtreecommitdiff
path: root/bucky/util
diff options
context:
space:
mode:
Diffstat (limited to 'bucky/util')
-rw-r--r--bucky/util/auth.js13
1 files changed, 6 insertions, 7 deletions
diff --git a/bucky/util/auth.js b/bucky/util/auth.js
index 061983d..ad8ce14 100644
--- a/bucky/util/auth.js
+++ b/bucky/util/auth.js
@@ -138,16 +138,16 @@ var auth = module.exports = {
})
},
- makePassword: function(username, pw) {
+ makePassword: function(username, password) {
var salt = username.substr(0, 2) // lol
- return crypt(pw, salt)
+ return crypt(password, salt)
// var shasum = crypto.createHash('sha1')
- // shasum.update(pw)
+ // shasum.update(password)
// return shasum.digest('hex');
},
- validPassword: function(user, pw){
- return user.get('password') === auth.makePassword(user.get('username'), pw);
+ validPassword: function(user, password){
+ return user.get('password') === auth.makePassword(user.get('username'), password);
},
changePassword: function(req, res, next) {
@@ -171,8 +171,7 @@ var auth = module.exports = {
// if (err) { return done(err); }
if (! user) { return done("no user") }
- return done(null, user)
-
+ // return done(null, user)
if (! user || ! auth.validPassword(user, password)) {
return done(null, false, { error: { message: 'Bad username/password.' } })
}