Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-05-06 16:27:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

more fixes

Browse Source
This commit is contained in:
Baris Soner Usakli
2014-01-16 17:52:46 -05:00
parent 2515ba9455
commit e061978bd5
6 changed files with 30 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/socket.io/user.js
View File

@@ -33,7 +33,7 @@ SocketUser.reset.commit = function(socket, data, callback) {
};
SocketUser.isOnline = function(socket, uid, callback) {
callback({
callback(null, {
online: module.parent.exports.isUserOnline(uid),
uid: uid,
timestamp: Date.now()
@@ -54,29 +54,31 @@ SocketUser.changePicture = function(socket, data, callback) {
function updateHeader() {
user.getUserFields(socket.uid, ['picture'], function(err, fields) {
if (!err && fields) {
fields.uid = socket.uid;
socket.emit('meta.updateHeader', fields);
callback(true);
} else {
callback(false);
if(err) {
return callback(err);
}
if (fields) {
fields.uid = socket.uid;
socket.emit('meta.updateHeader', null, fields);
}
callback(null);
});
}
if (type === 'gravatar') {
user.getUserField(socket.uid, 'gravatarpicture', function(err, gravatar) {
user.setUserField(socket.uid, 'picture', gravatar);
updateHeader();
});
type = 'gravatarpicture';
} else if (type === 'uploaded') {
user.getUserField(socket.uid, 'uploadedpicture', function(err, uploadedpicture) {
user.setUserField(socket.uid, 'picture', uploadedpicture);
updateHeader();
});
type = 'uploadedpicture';
} else {
callback(false);
return callback(new Error('invalid-image-type'));
}
user.getUserField(socket.uid, type, function(err, picture) {
user.setUserField(socket.uid, 'picture', picture);
updateHeader();
});
};
SocketUser.follow = function(socket, data, callback) {

12
src/user.js
View File

@@ -347,13 +347,11 @@ var bcrypt = require('bcrypt'),
User.changePassword = function(uid, data, callback) {
if (!utils.isPasswordValid(data.newPassword)) {
return callback({
error: 'Invalid password!'
});
return callback(new Error('Invalid password!'));
}
User.getUserField(uid, 'password', function(err, user_password) {
bcrypt.compare(data.currentPassword, user_password, function(err, res) {
User.getUserField(uid, 'password', function(err, currentPassword) {
bcrypt.compare(data.currentPassword, currentPassword, function(err, res) {
if (err) {
return callback(err);
}
@@ -365,9 +363,7 @@ var bcrypt = require('bcrypt'),
callback(null);
});
} else {
callback({
error: 'Your current password is not correct!'
});
callback(new Error('Your current password is not correct!'));
}
});
});