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

better integration between /user/ and home

Browse Source
This commit is contained in:
ansuz 2017-02-07 17:50:37 +01:00
parent fe7ba98338
commit 32a5c5ff62
1 changed files with 61 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
www/user/main.js
View File

@ -34,6 +34,10 @@ define([
$notice.text(s); $notice.text(s);
}; };
APP.redirectToDrive = function () {
document.location.href = '/drive/';
};
// confirm elements // confirm elements
var $confirmBox = $('#confirm-panel'); var $confirmBox = $('#confirm-panel');
var $confirm = $('#confirm'); var $confirm = $('#confirm');
@ -60,13 +64,7 @@ define([
var revealConfirm = APP.revealConfirm = revealer($confirmBox); var revealConfirm = APP.revealConfirm = revealer($confirmBox);
var revealLogout = APP.revealLogout= revealer($logoutBox); var revealLogout = APP.revealLogout= revealer($logoutBox);
var revealUser_false = APP.revealUser_false = revealer($userBox); var revealUser = APP.revealUser = revealer($userBox);
var revealUser = APP.revealUser = function (state) {
if (!state) {
revealUser_false(state);
}
document.location.href = '/drive';
};
var getDisplayName = APP.getDisplayName = function (proxy) { var getDisplayName = APP.getDisplayName = function (proxy) {
return proxy['cryptpad.username']; return proxy['cryptpad.username'];
@ -105,7 +103,7 @@ define([
revealLogin(true); revealLogin(true);
revealUser(false); revealUser(false);
APP.abort(); APP.abort();
$username.focus(); //$username.focus();
}); });
}); });
}; };
@ -128,10 +126,9 @@ define([
APP.setAccountName(getAccountName(proxy)); APP.setAccountName(getAccountName(proxy));
APP.setDisplayName(getDisplayName(proxy)); APP.setDisplayName(getDisplayName(proxy));
Cryptpad.login(opt.userHash, getAccountName(proxy), opt.remember); Cryptpad.login(opt.userHash, getAccountName(proxy));
APP.revealLogin(false); APP.revealLogin(false);
APP.revealUser(true); APP.redirectToDrive();
APP.revealLogout(true);
}; };
var abortRegistration = function () { var abortRegistration = function () {
@ -164,8 +161,8 @@ define([
}); });
}; };
addEnterListener($confirm, function () { addEnterListener($password_register, function () {
$register.click(); $login.click();
}); });
addEnterListener($password, function () { addEnterListener($password, function () {
$login.click(); $login.click();
@ -318,33 +315,30 @@ define([
console.log(info); console.log(info);
}); });
}; };
Cryptpad.ready(function () {
if (Cryptpad.getUserHash()) { var showUserInfo = function () {
/* TODO use something like this for a user preferences page
revealLogout(true); revealLogout(true);
var proxy = Cryptpad.getStore().getProxy().proxy; var proxy = Cryptpad.getStore().getProxy().proxy;
APP.setAccountName(proxy.login_name); APP.setAccountName(proxy.login_name);
APP.setDisplayName(getDisplayName(proxy)); APP.setDisplayName(getDisplayName(proxy));
return;
revealUser(true); revealUser(true);
} else { */
if (sessionStorage.register || document.location.hash.slice(1) === 'register') { };
document.location.hash = 'register';
$login.text(Cryptpad.Messages.login_register);
$('#login-panel .register').show();
}
revealLogin(true);
}
$username.focus(); Cryptpad.ready(function () {
// If the user is already logged in...
// TODO show user preferences
if (Cryptpad.getUserHash()) { return APP.redirectToDrive(); }
$login.click(function () { $login.click(function () {
var uname = $username.val().trim(); var uname = $username.val().trim();
var passwd = $password.val(); var passwd = $password.val();
var passwd_confirm = $password_register.val(); var passwd_confirm = $password_register.val();
var confirm = $confirm.val(); var confirm = $confirm.val();
var remember = $remember[0].checked;
remember = true; // TODO : find a way to use a sessionStorage shared with all tabs
var register = document.location.hash.slice(1) === 'register'; var register = document.location.hash.slice(1) === 'register';
@ -370,7 +364,6 @@ define([
revealNotice(false); revealNotice(false);
window.setTimeout(function () { window.setTimeout(function () {
useBytes(bytes, { useBytes(bytes, {
remember: remember,
register: register, register: register,
name: uname, name: uname,
password: passwd, password: passwd,
@ -381,20 +374,32 @@ define([
}); });
}); });
// if the user is not logged in...
if (sessionStorage.register || document.location.hash.slice(1) === 'register') {
Cryptpad.replaceHash('register');
$login.text(Cryptpad.Messages.login_register);
$('#login-panel .register').show();
}
$username.focus();
if (sessionStorage.login || sessionStorage.register) {
$username.val(sessionStorage.login_user);
$password.val(sessionStorage.login_pass);
}
if (sessionStorage.login) { if (sessionStorage.login) {
$username.val(sessionStorage.login_user); APP.setNotice(Cryptpad.Messages.login_hashing);
$password.val(sessionStorage.login_pass); APP.revealNotice(true, function () {
$remember.attr('checked', sessionStorage.login_rmb === "true");
$login.click(); $login.click();
Cryptpad.eraseTempSessionValues();
});
return;
} }
if (sessionStorage.register) { revealLogin(true, function () {
$username.val(sessionStorage.login_user); if (sessionStorage.register) { $password_register.focus(); }
$password.val(sessionStorage.login_pass); Cryptpad.eraseTempSessionValues();
$remember.attr('checked', sessionStorage.login_rmb === "true"); });
} });
['login', 'register', 'login_user', 'login_pass', 'login_rmb'].forEach(function (k) {
delete sessionStorage[k];
}); });
});
});