Merge branch '159-bcyrpt-nodejs' into 'staging'

Fixes #159

See merge request !108

src/server/components/auth.js

@@ -1,5 +1,5 @@
 define([
-	'bcrypt',
+	'bcrypt-nodejs',
 	'security/io',
 	'misc/messages',
 	'security/connections',
@@ -243,7 +243,7 @@ define([
 			}
 		},
 		onUnhashedLogin: function(msg) {
-			bcrypt.hash(msg.data.password, 10, this.onPasswordHashed.bind(this, msg));
+			bcrypt.hash(msg.data.password, null, null, this.onPasswordHashed.bind(this, msg));
 		},
 		onPasswordHashed: function(msg, err, hashedPassword) {
 			io.set({
@@ -294,7 +294,7 @@ define([
 
 			var credentials = msg.data;
 
-			bcrypt.hash(credentials.password, 10, this.onHashGenerated.bind(this, msg));
+			bcrypt.hash(credentials.password, null, null, this.onHashGenerated.bind(this, msg));
 		},
 		onHashGenerated: function(msg, err, hashedPassword) {
 			io.set({

src/server/package.json

@@ -3,7 +3,7 @@
   "version": "0.0.2",
   "description": "isleward",
   "dependencies": {
-    "bcrypt": "^1.0.2",
+    "bcrypt-nodejs": "0.0.3",
     "express": "^4.13.1",
     "extend": "^3.0.0",
     "less-middleware": "^2.0.1",