infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Fix login issues with safe links

pull/1/head
yflory 2020-08-05 15:03:06 +02:00
parent 6b734e7a80
commit bbd101ec8a
3 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
www/common/cryptpad-common.js
View File

@ -2273,7 +2273,7 @@ define([
var o = e.oldValue;
var n = e.newValue;
if (!o && n) {
document.location.reload();
LocalStore.loginReload();
} else if (o && !n) {
LocalStore.logout();
}

12
www/common/outer/local-store.js
View File

@ -129,6 +129,18 @@ define([
if (cb) { cb(); }
};
var loginHandlers = [];
LocalStore.loginReload = function () {
loginHandlers.forEach(function (h) {
if (typeof (h) === "function") { h(); }
});
document.location.reload();
};
LocalStore.onLogin = function (h) {
if (typeof (h) !== "function") { return; }
if (loginHandlers.indexOf(h) !== -1) { return; }
loginHandlers.push(h);
};
LocalStore.onLogout = function (h) {
if (typeof (h) !== "function") { return; }
if (logoutHandlers.indexOf(h) !== -1) { return; }

12
www/common/sframe-common-outer.js
View File

@ -511,7 +511,19 @@ define([
Cryptpad.onMetadataChanged(updateMeta);
sframeChan.onReg('EV_METADATA_UPDATE', updateMeta);
Utils.LocalStore.onLogin(function () {
var ohc = window.onhashchange;
window.onhashchange = function () {};
window.location.hash = currentPad.hash;
window.onhashchange = ohc;
ohc({reset: true});
});
Utils.LocalStore.onLogout(function () {
var ohc = window.onhashchange;
window.onhashchange = function () {};
window.location.hash = currentPad.hash;
window.onhashchange = ohc;
ohc({reset: true});
sframeChan.event('EV_LOGOUT');
});