From 160f2554b1e76ff50ba57903cd53218acebb7395 Mon Sep 17 00:00:00 2001 From: Thomas Poirier Date: Mon, 29 Feb 2016 00:26:31 +0100 Subject: [PATCH 1/3] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 38682ad..fe7113b 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "babel-eslint": "^3.1.23", "babel-istanbul": "^0.2.10", "babel-loader": "^5.3.1", - "bcrypt": "^0.8.3", + "bcryptjs": "^2.3.0", "blocked": "^1.1.0", "bootstrap": "^3.3.5", "browser-sync": "^2.7.13", From fe9ceba91ae09e1ebb6fa205772f5088ad0154c4 Mon Sep 17 00:00:00 2001 From: Thomas Poirier Date: Mon, 29 Feb 2016 00:37:46 +0100 Subject: [PATCH 2/3] Update rest.js --- server/rest.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/rest.js b/server/rest.js index 14f25d0..d63eff1 100644 --- a/server/rest.js +++ b/server/rest.js @@ -4,7 +4,7 @@ import Car from "./models/car"; import Director from "./models/director"; import Film from "./models/film"; import User from "./models/user"; -import bcrypt from "bcrypt"; +import bcrypt from "bcryptjs"; import uuid from "node-uuid"; import koaRouter from "koa-router"; From 876035c05c33393b75eb87eda23972f2a880ca41 Mon Sep 17 00:00:00 2001 From: Thomas Poirier Date: Mon, 29 Feb 2016 00:40:31 +0100 Subject: [PATCH 3/3] Update user.js --- server/models/user.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/models/user.js b/server/models/user.js index 7499372..733053a 100644 --- a/server/models/user.js +++ b/server/models/user.js @@ -1,5 +1,5 @@ import mongoose from 'mongoose'; -// import bcrypt from 'bcrypt'; +// import bcrypt from 'bcryptjs'; import jsonSelect from 'mongoose-json-select'; // const SALT_WORK_FACTOR = 10;