diff options
| -rw-r--r-- | bucky/util/auth.js | 13 | ||||
| -rw-r--r-- | views/pages/login.ejs | 2 | ||||
| -rw-r--r-- | views/pages/signup.ejs | 2 |
3 files changed, 8 insertions, 9 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.' } }) } diff --git a/views/pages/login.ejs b/views/pages/login.ejs index f2b686a..12e570f 100644 --- a/views/pages/login.ejs +++ b/views/pages/login.ejs @@ -4,7 +4,7 @@ <form> <div> <label for="username">username</label> - <input type="text" id="login-username" name="username"> + <input type="text" id="login-username" name="username" autocapitalize=off> </div> <div> diff --git a/views/pages/signup.ejs b/views/pages/signup.ejs index 65a29cf..49d9cb2 100644 --- a/views/pages/signup.ejs +++ b/views/pages/signup.ejs @@ -7,7 +7,7 @@ <form> <div> <label for="login-username">username</label> - <input type="text" id="login-username" name="username"> + <input type="text" id="login-username" name="username" autocapitalize=off> </div> <div> |