|
|
@ -27,11 +27,16 @@ var async = require('async'),
|
|
|
|
});
|
|
|
|
});
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
UserEmail.verify = function(uid, email) {
|
|
|
|
UserEmail.verify = function(uid, email, callback) {
|
|
|
|
|
|
|
|
callback = callback || function() {};
|
|
|
|
var confirm_code = utils.generateUUID(),
|
|
|
|
var confirm_code = utils.generateUUID(),
|
|
|
|
confirm_link = nconf.get('url') + '/confirm/' + confirm_code;
|
|
|
|
confirm_link = nconf.get('url') + '/confirm/' + confirm_code;
|
|
|
|
|
|
|
|
|
|
|
|
plugins.fireHook('filter:user.verify.code', confirm_code, function(err, confirm_code) {
|
|
|
|
plugins.fireHook('filter:user.verify.code', confirm_code, function(err, confirm_code) {
|
|
|
|
|
|
|
|
if (err) {
|
|
|
|
|
|
|
|
return callback(err);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
async.series([
|
|
|
|
async.series([
|
|
|
|
function(next) {
|
|
|
|
function(next) {
|
|
|
|
db.setObject('confirm:' + confirm_code, {
|
|
|
|
db.setObject('confirm:' + confirm_code, {
|
|
|
@ -43,7 +48,9 @@ var async = require('async'),
|
|
|
|
db.expireAt('confirm:' + confirm_code, Math.floor(Date.now() / 1000 + 60 * 60 * 2), next);
|
|
|
|
db.expireAt('confirm:' + confirm_code, Math.floor(Date.now() / 1000 + 60 * 60 * 2), next);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
], function(err) {
|
|
|
|
], function(err) {
|
|
|
|
|
|
|
|
if (err) {
|
|
|
|
|
|
|
|
return callback(err);
|
|
|
|
|
|
|
|
}
|
|
|
|
user.getUserField(uid, 'username', function(err, username) {
|
|
|
|
user.getUserField(uid, 'username', function(err, username) {
|
|
|
|
if (err) {
|
|
|
|
if (err) {
|
|
|
|
return winston.error(err.stack);
|
|
|
|
return winston.error(err.stack);
|
|
|
@ -64,10 +71,12 @@ var async = require('async'),
|
|
|
|
|
|
|
|
|
|
|
|
if (plugins.hasListeners('action:user.verify')) {
|
|
|
|
if (plugins.hasListeners('action:user.verify')) {
|
|
|
|
plugins.fireHook('action:user.verify', {uid: uid, data: data});
|
|
|
|
plugins.fireHook('action:user.verify', {uid: uid, data: data});
|
|
|
|
|
|
|
|
callback();
|
|
|
|
} else if (plugins.hasListeners('action:email.send')) {
|
|
|
|
} else if (plugins.hasListeners('action:email.send')) {
|
|
|
|
emailer.send('welcome', uid, data);
|
|
|
|
emailer.send('welcome', uid, data, callback);
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
winston.warn('No emailer to send verification email!');
|
|
|
|
winston.warn('No emailer to send verification email!');
|
|
|
|
|
|
|
|
callback();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
});
|
|
|
|
});
|
|
|
|
});
|
|
|
|
});
|
|
|
|