NoLog.cz/etherpad
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

pad: Revert back to sending CLIENT_READY on reconnect

Browse source 
Commit 0bb8d73ba2 fixed the author ID
that is saved in the socket.io sessioninfo when the client sends a
`CLIENT_READY` with `reconnect` set to true, so it is now safe to undo
the workaround from PR #3868.

Fixes #4331.
This commit is contained in:
Richard Hansen 2020-09-13 00:43:38 -04:00 committed by John McLear
parent 72ed1816ec
commit 1e3aa9edff
1 changed files with 4 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/static/js/pad.js
View file

@ -170,23 +170,10 @@ function sendClientReady(isReconnect, messageType)
"protocolVersion": 2
};
//this is a reconnect, lets tell the server our revisionnumber
if(isReconnect == true)
{
// Hammer approach for now. This is obviously wrong and needs a proper fix
// TODO: See https://github.com/ether/etherpad-lite/issues/3830
document.location=document.location;
// Switching to pad should work but doesn't...
// return pad.switchToPad(padId); // hacky but whatever.
// It might be related to Auth because failure logs...
// [ERROR] console - Auth was never applied to a session.
// If you are using the stress-test tool then restart Etherpad
// and the Stress test tool.
msg.client_rev=pad.collabClient.getCurrentRevisionNumber();
msg.reconnect=true;
// this is a reconnect, lets tell the server our revisionnumber
if (isReconnect) {
msg.client_rev = pad.collabClient.getCurrentRevisionNumber();
msg.reconnect = true;
}
socket.json.send(msg);