From 59780ccc956bbbb429f9bf063c356e66bd112edd Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Fri, 13 Nov 2015 14:05:15 -0800 Subject: Use bcryptjs instead of bcrypt --- install.js | 2 +- package.json | 4 ++-- passport.js | 2 +- routes/users.js | 2 +- src/passport.coffee | 2 +- src/routes/users.coffee | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/install.js b/install.js index 088d593e..30ece122 100644 --- a/install.js +++ b/install.js @@ -3,7 +3,7 @@ db = require("./redis"); - bcrypt = require('bcrypt'); + bcrypt = require('bcryptjs'); db.get("user:admin", function(err, res) { if (!res) { diff --git a/package.json b/package.json index e5505174..b16847b7 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ }, "dependencies": { "async": "0.9.0", - "bcrypt": "0.7.8", + "bcryptjs": "^2.3.0", "body-parser": "^1.5.0", "coffee-script": "1.7.1", "connect-assets": "4.0.1", @@ -19,11 +19,11 @@ "express-session": "^1.6.5", "hogan-express": "0.5.2", "less": "1.7.3", + "nodemailer": "~1.2.1", "passport": "0.2.0", "passport-local": "1.0.0", "redis": "0.11.0", "request": "~2.40.0", - "nodemailer": "~1.2.1", "sendgrid": "~1.2.0" }, "devDependencies": { diff --git a/passport.js b/passport.js index aa11d658..b8b266d1 100644 --- a/passport.js +++ b/passport.js @@ -3,7 +3,7 @@ db = require("redis").createClient(); - bcrypt = require('bcrypt'); + bcrypt = require('bcryptjs'); passport = require('passport'); diff --git a/routes/users.js b/routes/users.js index 36914152..4ef67d2c 100644 --- a/routes/users.js +++ b/routes/users.js @@ -5,7 +5,7 @@ config = require("../config"); - bcrypt = require('bcrypt'); + bcrypt = require('bcryptjs'); fs = require('fs'); diff --git a/src/passport.coffee b/src/passport.coffee index 12913424..aba6ff53 100644 --- a/src/passport.coffee +++ b/src/passport.coffee @@ -1,5 +1,5 @@ db = require("redis").createClient() -bcrypt = require('bcrypt') +bcrypt = require('bcryptjs') passport = require('passport') LocalStrategy = require('passport-local').Strategy diff --git a/src/routes/users.coffee b/src/routes/users.coffee index 014b74b3..5daae180 100644 --- a/src/routes/users.coffee +++ b/src/routes/users.coffee @@ -1,6 +1,6 @@ db = require("../redis") config = require("../config") -bcrypt = require('bcrypt') +bcrypt = require('bcryptjs') fs = require('fs') request = require('request') -- cgit v1.2.3