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

Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

Browse Source
This commit is contained in:
yflory
2017-02-07 18:47:24 +01:00
parent 1e2cc6bea4 dae17588c6
commit 702798f65a
4 changed files with 69 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,17 +68,11 @@ define([
var userNameKey = common.userNameKey = 'User_name';
var fileHashKey = common.fileHashKey = 'FS_hash';
var login = common.login = function (hash, name, remember, cb) {
var login = common.login = function (hash, name, cb) {
if (!hash) { throw new Error('expected a user hash'); }
if (!name) { throw new Error('expected a user name'); }
if (!remember) {
sessionStorage.setItem(userHashKey, hash);
sessionStorage.setItem(userNameKey, name);
}
else {
localStorage.setItem(userHashKey, hash);
localStorage.setItem(userNameKey, name);
}
localStorage.setItem(userHashKey, hash);
localStorage.setItem(userNameKey, name);
if (cb) { cb(); }
};
@@ -86,9 +80,10 @@ define([
// delete sessionStorage values that might have been left over
// from the main page's /user redirect
[
'login',
'login_user',
'login_pass',
'login_remember',
'login_rmb',
'register'
].forEach(function (k) {
delete sessionStorage[k];