joe/kami-parse-server
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Addressed bugs with bcrypt-nodejs and changed crypto.js to password.js

Browse Source
This commit is contained in:
Fosco Marotto
2016-02-01 11:24:26 -08:00
parent 7f01a67c0f
commit cb1079a6d3
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
RestWrite.js
View File

@@ -9,7 +9,7 @@ var rack = require('hat').rack();
var Auth = require('./Auth'); var Auth = require('./Auth');
var cache = require('./cache'); var cache = require('./cache');
var Config = require('./Config'); var Config = require('./Config');
var crypto = require('./crypto'); var passwordCrypto = require('./password');
var facebook = require('./facebook'); var facebook = require('./facebook');
var Parse = require('parse/node'); var Parse = require('parse/node');
var triggers = require('./triggers'); var triggers = require('./triggers');
@@ -300,7 +300,7 @@ RestWrite.prototype.transformUser = function() {
if (this.query) { if (this.query) {
this.storage['clearSessions'] = true; this.storage['clearSessions'] = true;
} }
return crypto.hash(this.data.password).then((hashedPassword) => { return passwordCrypto.hash(this.data.password).then((hashedPassword) => {
this.data._hashed_password = hashedPassword; this.data._hashed_password = hashedPassword;
delete this.data.password; delete this.data.password;
}); });

2
crypto.js → password.js
View File

@@ -5,7 +5,7 @@ var bcrypt = require('bcrypt-nodejs');
// Returns a promise for a hashed password string. // Returns a promise for a hashed password string.
function hash(password) { function hash(password) {
return new Promise(function(fulfill, reject) { return new Promise(function(fulfill, reject) {
bcrypt.hash(password, 8, function(err, hashedPassword) { bcrypt.hash(password, null, null, function(err, hashedPassword) {
if (err) { if (err) {
reject(err); reject(err);
} else { } else {

4
spec/ParseUser.spec.js
View File

@@ -6,7 +6,7 @@
// Tests that involve sending password reset emails. // Tests that involve sending password reset emails.
var request = require('request'); var request = require('request');
var crypto = require('../crypto'); var passwordCrypto = require('../password');
describe('Parse.User testing', () => { describe('Parse.User testing', () => {
it("user sign up class method", (done) => { it("user sign up class method", (done) => {
@@ -1560,7 +1560,7 @@ describe('Parse.User testing', () => {
it('password format matches hosted parse', (done) => { it('password format matches hosted parse', (done) => {
var hashed = '$2a$10$8/wZJyEuiEaobBBqzTG.jeY.XSFJd0rzaN//ososvEI4yLqI.4aie'; var hashed = '$2a$10$8/wZJyEuiEaobBBqzTG.jeY.XSFJd0rzaN//ososvEI4yLqI.4aie';
crypto.compare('test', hashed) passwordCrypto.compare('test', hashed)
.then((pass) => { .then((pass) => {
expect(pass).toBe(true); expect(pass).toBe(true);
done(); done();

4
users.js
View File

@@ -5,7 +5,7 @@ var Parse = require('parse/node').Parse;
var rack = require('hat').rack(); var rack = require('hat').rack();
var Auth = require('./Auth'); var Auth = require('./Auth');
var crypto = require('./crypto'); var passwordCrypto = require('./password');
var facebook = require('./facebook'); var facebook = require('./facebook');
var PromiseRouter = require('./PromiseRouter'); var PromiseRouter = require('./PromiseRouter');
var rest = require('./rest'); var rest = require('./rest');
@@ -45,7 +45,7 @@ function handleLogIn(req) {
'Invalid username/password.'); 'Invalid username/password.');
} }
user = results[0]; user = results[0];
return crypto.compare(req.body.password, user.password); return passwordCrypto.compare(req.body.password, user.password);
}).then((correct) => { }).then((correct) => {
if (!correct) { if (!correct) {
throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND,