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

show user's display name and account name

Browse Source
This commit is contained in:
ansuz 2016-12-29 17:03:17 +01:00
parent 0c9178ba46
commit a97696c712
2 changed files with 41 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/user/index.html
View File

@ -79,8 +79,10 @@
<div id="user-box" class="box"> <div id="user-box" class="box">
<div> <div>
<p><span data-localization="username_label"></span> <p><span data-localization="displayname_label"></span>
<strong id="display-name" class="display"></strong></p> <strong id="display-name" class="display"></strong></p>
<p><span data-localization="username_label"></span>
<strong id="user-name" class="display"></strong></p>
<p>View your <a href="/file" target="_blank">file manager</a>.</p> <p>View your <a href="/file" target="_blank">file manager</a>.</p>
</div> </div>

55
www/user/main.js
View File

@ -47,7 +47,8 @@ define([
// user elements // user elements
var $userBox = $('#user-box'); var $userBox = $('#user-box');
var $displayName = $('#display-name'); var $displayNameLabel = $('#display-name');
var $userNameLabel = $('#user-name');
var revealer = function ($el) { var revealer = function ($el) {
return function (bool, cb) { return function (bool, cb) {
@ -62,16 +63,27 @@ define([
var revealLogout = APP.revealLogout= revealer($logoutBox); var revealLogout = APP.revealLogout= revealer($logoutBox);
var revealUser = APP.revealUser = revealer($userBox); var revealUser = APP.revealUser = revealer($userBox);
// TODO set registered name AND display name var getDisplayName = APP.getDisplayName = function (proxy) {
APP.setName = function (name) { return proxy['cryptpad.username'];
$displayName.text(name); };
var getAccountName = APP.getAccountName = function (proxy) {
return proxy.login_name;
};
APP.setAccountName = function (user) {
$userNameLabel.text(user || 'unknown');
};
APP.setDisplayName = function (display) {
$displayNameLabel.text(display || 'anonymous');
}; };
var resetUI = APP.resetUI = function () { var resetUI = APP.resetUI = function () {
$username.val(""); $username.val("");
$password.val(""); $password.val("");
$confirm.val(""); $confirm.val("");
APP.setName(''); APP.setAccountName('');
APP.setDisplayName('');
}; };
APP.abort = function () { APP.abort = function () {
@ -108,10 +120,10 @@ define([
// welcome back // welcome back
proxy.atime = opt.now; proxy.atime = opt.now;
var userHash = '/1/edit/' + [opt.channel64, opt.keys.editKeyStr].join('/'); APP.setAccountName(getAccountName(proxy));
APP.setDisplayName(getDisplayName(proxy));
APP.setName(opt.name); Cryptpad.login(opt.editHash, opt.remember);
Cryptpad.login(userHash, opt.remember);
APP.revealLogin(false); APP.revealLogin(false);
APP.revealUser(true); APP.revealUser(true);
APP.revealLogout(true); APP.revealLogout(true);
@ -176,9 +188,14 @@ define([
// could not find a profile for that username/password // could not find a profile for that username/password
confirmPassword(proxy, opt.password, function () { confirmPassword(proxy, opt.password, function () {
APP.confirming = false; APP.confirming = false;
APP.setAccountName((proxy.login_name = opt.name));
APP.setDisplayName(APP.getDisplayName(proxy));
APP.setName(opt.name); // remember your curve key
proxy.login_name = opt.name; proxy.curve = Cryptpad.uint8ArrayToHex(opt.curveSeed);
// remember your ed seed
proxy.ed = Cryptpad.uint8ArrayToHex(opt.edSeed);
var next = function () { var next = function () {
revealConfirm(false); revealConfirm(false);
@ -199,8 +216,10 @@ define([
delete localStorage.FS_hash; delete localStorage.FS_hash;
// TODO if name has changed, prompt user if (!proxy[USERNAME_KEY]) {
//proxy[USERNAME_KEY] = proxy[USERNAME_KEY] = opt.name;
}
next(); next();
}); });
}); });
@ -277,15 +296,13 @@ define([
}; };
Cryptpad.ready(function () { Cryptpad.ready(function () {
if (Cryptpad.getUserHash()) { if (Cryptpad.getUserHash()) {
Cryptpad.getAttribute('username', function (err, uname) {
revealLogout(true); revealLogout(true);
if (err) { var proxy = Cryptpad.getStore().getProxy().proxy;
console.error(err);
return; APP.setAccountName(proxy.login_name);
} APP.setDisplayName(getDisplayName(proxy));
APP.setName(uname);
revealUser(true); revealUser(true);
});
} else { } else {
revealLogin(true); revealLogin(true);
} }