.del does not return error.notFound

This commit is contained in:
Matias Alejo Garcia 2014-11-13 18:31:04 -03:00
parent 948ae393a0
commit f02e5ca1a9

View File

@ -305,36 +305,24 @@
emailPlugin.deleteByEmailAndKey = function deleteByEmailAndKey(email, key, callback) { emailPlugin.deleteByEmailAndKey = function deleteByEmailAndKey(email, key, callback) {
emailPlugin.db.del(valueKey(email, key), function(error) { emailPlugin.db.del(valueKey(email, key), function(error) {
if (error) { if (error) {
if (error.notFound) { logger.error(error);
return callback(emailPlugin.errors.NOT_FOUND); return callback(emailPlugin.errors.INTERNAL_ERROR);
} else {
logger.error(error);
return callback(emailPlugin.errors.INTERNAL_ERROR);
}
} }
return callback(); return callback();
}); });
}; };
emailPlugin.deleteWholeProfile = function deleteWholeProfile(email, callback) { emailPlugin.deleteWholeProfile = function deleteWholeProfile(email, callback) {
var dismissNotFound = function(callback) {
return function(error, result) {
if (error && error.notFound) {
return callback();
}
return callback(error, result);
};
};
async.parallel([ async.parallel([
function(callback) { function(cb) {
emailPlugin.db.del(emailToPassphrase(email), dismissNotFound(callback)); emailPlugin.db.del(emailToPassphrase(email), cb);
}, },
function(callback) { function(cb) {
emailPlugin.db.del(pendingKey(email), dismissNotFound(callback)); emailPlugin.db.del(pendingKey(email), cb);
}, },
function(callback) { function(cb) {
emailPlugin.db.del(validatedKey(email), dismissNotFound(callback)); emailPlugin.db.del(validatedKey(email), cb);
} }
], function(err) { ], function(err) {
if (err) { if (err) {
@ -581,7 +569,7 @@
if (err) { if (err) {
return emailPlugin.returnError(err, response); return emailPlugin.returnError(err, response);
} }
emailPlugin.deleteWholeProfile(email, function(err, value) { emailPlugin.deleteWholeProfile(email, function(err, value) {
if (err) { if (err) {
return emailPlugin.returnError(err, response); return emailPlugin.returnError(err, response);
@ -660,7 +648,7 @@
if (err) { if (err) {
return emailPlugin.returnError(err, response); return emailPlugin.returnError(err, response);
} }
var queryData = ''; var queryData = '';
request.on('data', function(data) { request.on('data', function(data) {
queryData += data; queryData += data;