From 18166337b810c548b80e3131e773982d892ab865 Mon Sep 17 00:00:00 2001
From: Gabor Javorszky <gabor@javorszky.co.uk>
Date: Mon, 27 May 2013 17:10:35 +0100
Subject: [PATCH] Replaced bcrypt with bcrypt-nodejs

---
 core/shared/models/dataProvider.bookshelf.users.js | 5 +++--
 package.json                                       | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/shared/models/dataProvider.bookshelf.users.js b/core/shared/models/dataProvider.bookshelf.users.js
index 6c2e2becf1..7407b271a8 100644
--- a/core/shared/models/dataProvider.bookshelf.users.js
+++ b/core/shared/models/dataProvider.bookshelf.users.js
@@ -3,7 +3,7 @@
 
     var util = require('util'),
         _ = require('underscore'),
-        bcrypt = require('bcrypt'),
+        bcrypt = require('bcrypt-nodejs'),
         models = require('./models.js'),
         when = require('when'),
         nodefn = require('when/node/function'),
@@ -30,9 +30,10 @@
             // Clone the _user so we don't expose the hashed password unnecessarily
             userData = _.extend({}, _user);
 
-        return nodefn.call(bcrypt.hash, _user.password, 10).then(function (hash) {
+        return nodefn.call(bcrypt.hash, _user.password, null, null).then(function (hash) {
             userData.password = hash;
             return BaseProvider.prototype.add.call(self, userData);
+
         });
     };
 
diff --git a/package.json b/package.json
index 5bc458515b..0cf04c5962 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     "bookshelf": "0.1.x",
     "knex": "0.1.x",
     "when": "2.1.x",
-    "bcrypt": "~0.7.5"
+    "bcrypt-nodejs": "0.0.3"
   },
   "devDependencies": {
     "grunt": "~0.4.1",