Addressed bugs with bcrypt-nodejs and changed crypto.js to password.js
This commit is contained in:
@@ -9,7 +9,7 @@ var rack = require('hat').rack();
|
||||
var Auth = require('./Auth');
|
||||
var cache = require('./cache');
|
||||
var Config = require('./Config');
|
||||
var crypto = require('./crypto');
|
||||
var passwordCrypto = require('./password');
|
||||
var facebook = require('./facebook');
|
||||
var Parse = require('parse/node');
|
||||
var triggers = require('./triggers');
|
||||
@@ -300,7 +300,7 @@ RestWrite.prototype.transformUser = function() {
|
||||
if (this.query) {
|
||||
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;
|
||||
delete this.data.password;
|
||||
});
|
||||
|
||||
@@ -5,7 +5,7 @@ var bcrypt = require('bcrypt-nodejs');
|
||||
// Returns a promise for a hashed password string.
|
||||
function hash(password) {
|
||||
return new Promise(function(fulfill, reject) {
|
||||
bcrypt.hash(password, 8, function(err, hashedPassword) {
|
||||
bcrypt.hash(password, null, null, function(err, hashedPassword) {
|
||||
if (err) {
|
||||
reject(err);
|
||||
} else {
|
||||
@@ -6,7 +6,7 @@
|
||||
// Tests that involve sending password reset emails.
|
||||
|
||||
var request = require('request');
|
||||
var crypto = require('../crypto');
|
||||
var passwordCrypto = require('../password');
|
||||
|
||||
describe('Parse.User testing', () => {
|
||||
it("user sign up class method", (done) => {
|
||||
@@ -1560,7 +1560,7 @@ describe('Parse.User testing', () => {
|
||||
|
||||
it('password format matches hosted parse', (done) => {
|
||||
var hashed = '$2a$10$8/wZJyEuiEaobBBqzTG.jeY.XSFJd0rzaN//ososvEI4yLqI.4aie';
|
||||
crypto.compare('test', hashed)
|
||||
passwordCrypto.compare('test', hashed)
|
||||
.then((pass) => {
|
||||
expect(pass).toBe(true);
|
||||
done();
|
||||
|
||||
4
users.js
4
users.js
@@ -5,7 +5,7 @@ var Parse = require('parse/node').Parse;
|
||||
var rack = require('hat').rack();
|
||||
|
||||
var Auth = require('./Auth');
|
||||
var crypto = require('./crypto');
|
||||
var passwordCrypto = require('./password');
|
||||
var facebook = require('./facebook');
|
||||
var PromiseRouter = require('./PromiseRouter');
|
||||
var rest = require('./rest');
|
||||
@@ -45,7 +45,7 @@ function handleLogIn(req) {
|
||||
'Invalid username/password.');
|
||||
}
|
||||
user = results[0];
|
||||
return crypto.compare(req.body.password, user.password);
|
||||
return passwordCrypto.compare(req.body.password, user.password);
|
||||
}).then((correct) => {
|
||||
if (!correct) {
|
||||
throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND,
|
||||
|
||||
Reference in New Issue
Block a user