Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-06 07:40:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fixes #5894"

Browse Source 
This reverts commit e2b40ddf34.
This commit is contained in:
Julian Lam
2017-08-23 21:38:58 -04:00
parent 9d2bf4746c
commit 73d4517d27
2 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
public/src/sockets.js
View File

@@ -28,11 +28,9 @@ app.isConnected = false;
setTimeout(socket.connect.bind(socket), parseInt(config.reconnectionDelay, 10) * 10);
});
socket.on('checkSession', function (uid, remoteExist) {
if (parseInt(uid, 10) !== parseInt(app.user.uid, 10) && remoteExist) {
socket.on('checkSession', function (uid) {
if (parseInt(uid, 10) !== parseInt(app.user.uid, 10)) {
app.handleInvalidSession();
} else {
app.logout();
}
});

21
src/socket.io/index.js
View File

@@ -75,20 +75,15 @@ function onConnection(socket) {
}
function onConnect(socket) {
user.exists(socket.uid, function (err, exists) {
if (err) {
return winston.error(err);
}
if (socket.uid && exists) {
socket.join('uid_' + socket.uid);
socket.join('online_users');
} else {
socket.join('online_guests');
}
if (socket.uid) {
socket.join('uid_' + socket.uid);
socket.join('online_users');
} else {
socket.join('online_guests');
}
socket.join('sess_' + socket.request.signedCookies[nconf.get('sessionKey')]);
io.sockets.sockets[socket.id].emit('checkSession', socket.uid, exists);
});
socket.join('sess_' + socket.request.signedCookies[nconf.get('sessionKey')]);
io.sockets.sockets[socket.id].emit('checkSession', socket.uid);
}
function onMessage(socket, payload) {