web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't redirect until realtime is synced when logging in

Browse Source
This commit is contained in:
yflory
2017-03-08 16:15:31 +01:00
parent 0c1efd361b
commit a8d200ef2e
3 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
www/login/main.js
View File

@@ -76,18 +76,21 @@ define([
if (result.proxy && !result.proxy.login_name) {
result.proxy.login_name = result.userName;
}
Cryptpad.login(result.userHash, result.userName, function () {
if (sessionStorage.redirectTo) {
var h = sessionStorage.redirectTo;
var parser = document.createElement('a');
parser.href = h;
if (parser.origin === window.location.origin) {
delete sessionStorage.redirectTo;
window.location.href = h;
return;
Cryptpad.whenRealtimeSyncs(result.realtime, function() {
Cryptpad.login(result.userHash, result.userName, function () {
if (sessionStorage.redirectTo) {
var h = sessionStorage.redirectTo;
var parser = document.createElement('a');
parser.href = h;
if (parser.origin === window.location.origin) {
delete sessionStorage.redirectTo;
window.location.href = h;
return;
}
}
}
window.location.href = '/drive/';
window.location.href = '/drive/';
});
});
return;
}