From 316fba3c084bfed3b72c2dde5322e8b7cf37eac5 Mon Sep 17 00:00:00 2001
From: Mattias Erming <mattias@mattiaserming.com>
Date: Fri, 3 Oct 2014 02:57:35 -0700
Subject: [PATCH] Use 'bcrypt-nodejs' package

---
 package.json              | 2 +-
 src/command-line/add.js   | 5 +++--
 src/command-line/reset.js | 5 +++--
 src/server.js             | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index bbab7fbf..38387255 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "bcrypt": "^0.8.0",
+    "bcrypt-nodejs": "0.0.3",
     "cheerio": "^0.17.0",
     "commander": "^2.3.0",
     "express": "^4.9.5",
diff --git a/src/command-line/add.js b/src/command-line/add.js
index af97b43e..08b4ba86 100644
--- a/src/command-line/add.js
+++ b/src/command-line/add.js
@@ -1,5 +1,5 @@
 var ClientManager = new require("../clientManager");
-var bcrypt = require("bcrypt");
+var bcrypt = require("bcrypt-nodejs");
 var fs = require("fs");
 var program = require("commander");
 var mkdirp = require("mkdirp");
@@ -52,7 +52,8 @@ program
 
 function add(manager, name, password) {
 	console.log("");
-	var hash = bcrypt.hashSync(password, 8);
+	var salt = bcrypt.genSaltSync(8);
+	var hash = bcrypt.hashSync(password, salt);
 	manager.addUser(
 		name,
 		hash
diff --git a/src/command-line/reset.js b/src/command-line/reset.js
index 15ec6f26..b3861751 100644
--- a/src/command-line/reset.js
+++ b/src/command-line/reset.js
@@ -1,4 +1,4 @@
-var bcrypt = require("bcrypt");
+var bcrypt = require("bcrypt-nodejs");
 var ClientManager = new require("../clientManager");
 var fs = require("fs");
 var program = require("commander");
@@ -25,7 +25,8 @@ program
 			if (err) {
 				return;
 			}
-			var hash = bcrypt.hashSync(password, 8);
+			var salt = bcrypt.genSaltSync(8);
+			var hash = bcrypt.hashSync(password, salt);
 			user.password = hash;
 			fs.writeFileSync(
 				file,
diff --git a/src/server.js b/src/server.js
index 139f8cd3..d5798d69 100644
--- a/src/server.js
+++ b/src/server.js
@@ -1,5 +1,5 @@
 var _ = require("lodash");
-var bcrypt = require("bcrypt");
+var bcrypt = require("bcrypt-nodejs");
 var Client = require("./client");
 var ClientManager = require("./clientManager");
 var express = require("express");