Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-02 12:05:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

checks in socket.io/user

Browse Source 
reset doesnt need socket
This commit is contained in:
barisusakli
2014-11-01 16:55:50 -04:00
parent 8e84e47578
commit 84b7a2c92d
3 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,19 +78,19 @@ SocketUser.reset = {};
SocketUser.reset.send = function(socket, email, callback) {
if (email) {
user.reset.send(socket, email, callback);
user.reset.send(email, callback);
}
};
SocketUser.reset.valid = function(socket, code, callback) {
if (code) {
user.reset.validate(socket, code, callback);
user.reset.validate(code, callback);
}
};
SocketUser.reset.commit = function(socket, data, callback) {
if(data && data.code && data.password) {
user.reset.commit(socket, data.code, data.password, callback);
user.reset.commit(data.code, data.password, callback);
}
};
@@ -112,12 +112,16 @@ SocketUser.checkStatus = function(socket, uid, callback) {
};
SocketUser.changePassword = function(socket, data, callback) {
if(data) {
if (data && socket.uid) {
user.changePassword(socket.uid, data, callback);
}
};
SocketUser.updateProfile = function(socket, data, callback) {
if (!socket.uid) {
return callback('[[error:invalid-uid]]');
}
if (!data || !data.uid) {
return callback(new Error('[[error:invalid-data]]'));
}
@@ -140,6 +144,10 @@ SocketUser.updateProfile = function(socket, data, callback) {
};
SocketUser.changePicture = function(socket, data, callback) {
if (!socket.uid) {
return callback('[[error:invalid-uid]]');
}
if (!data) {
return callback(new Error('[[error:invalid-data]]'));
}
@@ -305,10 +313,16 @@ SocketUser.getOnlineAnonCount = function(socket, data, callback) {
};
SocketUser.getUnreadCount = function(socket, data, callback) {
if (!socket.uid) {
return callback(null, 0);
}
topics.getTotalUnread(socket.uid, callback);
};
SocketUser.getUnreadChatCount = function(socket, data, callback) {
if (!socket.uid) {
return callback(null, 0);
}
messaging.getUnreadCount(socket.uid, callback);
};

2
src/user/profile.js
View File

@@ -223,7 +223,7 @@ module.exports = function(User) {
}
User.changePassword = function(uid, data, callback) {
if(!data || !data.uid) {
if (!uid || !data || !data.uid) {
return callback(new Error('[[error:invalid-uid]]'));
}

11
src/user/reset.js
View File

@@ -11,12 +11,11 @@ var async = require('async'),
db = require('../database'),
meta = require('../meta'),
events = require('../events'),
emailer = require('../emailer'),
tran;
emailer = require('../emailer');
(function(UserReset) {
UserReset.validate = function(socket, code, callback) {
UserReset.validate = function(code, callback) {
db.getObjectField('reset:uid', code, function(err, uid) {
if (err || !uid) {
return callback(err, false);
@@ -39,7 +38,7 @@ var async = require('async'),
});
};
UserReset.send = function(socket, email, callback) {
UserReset.send = function(email, callback) {
user.getUidByEmail(email, function(err, uid) {
if (err || !uid) {
return callback(err || new Error('[[error:invalid-email]]'));
@@ -64,8 +63,8 @@ var async = require('async'),
});
};
UserReset.commit = function(socket, code, password, callback) {
UserReset.validate(socket, code, function(err, validated) {
UserReset.commit = function(code, password, callback) {
UserReset.validate(code, function(err, validated) {
if(err) {
return callback(err);
}