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

ask users to sign back if signing keys are missing

Browse Source
This commit is contained in:
ansuz
2017-04-18 11:58:41 +02:00
parent 107e75b287
commit da69c1822c
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -221,6 +221,12 @@ define([
return typeof getUserHash() === "string"; return typeof getUserHash() === "string";
}; };
var hasSigningKeys = common.hasSigningKeys = function (proxy) {
return typeof(proxy) === 'object' &&
typeof(proxy.edPrivate) === 'string' &&
typeof(proxy.edPublic) === 'string';
};
common.isArray = $.isArray; common.isArray = $.isArray;
/* /*

11
www/common/fsStore.js
View File

@@ -156,6 +156,17 @@ define([
proxy.uid = Cryptpad.createChannelId(); proxy.uid = Cryptpad.createChannelId();
} }
// if the user is logged in, but does not have signing keys...
if (Cryptpad.isLoggedIn() && !Cryptpad.hasSigningKeys(proxy)) {
// log out so that you don't go into an endless loop...
Cryptpad.logout();
// redirect them to log in, and come back when they're done.
sessionStorage.redirectTo = window.location.href;
window.location.href = '/login/';
return;
}
proxy.on('change', [Cryptpad.displayNameKey], function (o, n, p) { proxy.on('change', [Cryptpad.displayNameKey], function (o, n, p) {
if (typeof(n) !== "string") { return; } if (typeof(n) !== "string") { return; }
Cryptpad.changeDisplayName(n); Cryptpad.changeDisplayName(n);