Skip to content
This repository has been archived by the owner on Aug 30, 2021. It is now read-only.

Commit

Permalink
Revert "Merge pull request #79 from mrngoitall/master"
Browse files Browse the repository at this point in the history
This reverts commit b83fb4a, reversing
changes made to f5f4663.
  • Loading branch information
amoshaviv committed Sep 29, 2013
1 parent b83fb4a commit a23f46f
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 5 deletions.
18 changes: 15 additions & 3 deletions app/models/user.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*/
var mongoose = require('mongoose'),
Schema = mongoose.Schema,
bcrypt = require('bcrypt'),
crypto = require('crypto'),
_ = require('underscore'),
authTypes = ['github', 'twitter', 'facebook', 'google'];

Expand All @@ -17,6 +17,7 @@ var UserSchema = new Schema({
username: String,
provider: String,
hashed_password: String,
salt: String,
facebook: {},
twitter: {},
github: {},
Expand All @@ -28,6 +29,7 @@ var UserSchema = new Schema({
*/
UserSchema.virtual('password').set(function(password) {
this._password = password;
this.salt = this.makeSalt();
this.hashed_password = this.encryptPassword(password);
}).get(function() {
return this._password;
Expand Down Expand Up @@ -90,7 +92,17 @@ UserSchema.methods = {
* @api public
*/
authenticate: function(plainText) {
return bcrypt.compareSync(plainText,this.hashed_password);
return this.encryptPassword(plainText) === this.hashed_password;
},

/**
* Make salt
*
* @return {String}
* @api public
*/
makeSalt: function() {
return Math.round((new Date().valueOf() * Math.random())) + '';
},

/**
Expand All @@ -102,7 +114,7 @@ UserSchema.methods = {
*/
encryptPassword: function(password) {
if (!password) return '';
return bcrypt.hashSync(password, 10);
return crypto.createHmac('sha1', this.salt).update(password).digest('hex');
}
};

Expand Down
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@
"forever": "latest",
"grunt": "latest",
"grunt-cli": "latest",
"grunt-bower-task": "latest",
"bcrypt": "latest"
"grunt-bower-task": "latest"
},
"devDependencies": {
"supertest": "latest",
Expand Down

0 comments on commit a23f46f

Please sign in to comment.