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

add signing keys to user object at login and register time

Browse Source
This commit is contained in:
ansuz
2017-03-15 18:57:13 +01:00
parent 8129b8cdc1
commit 0a6373852e
4 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
www/login/main.js
View File

@@ -71,12 +71,17 @@ define([
var passwd = $passwd.val();
Login.loginOrRegister(uname, passwd, false, function (err, result) {
if (!err) {
var proxy = result.proxy;
// successful validation and user already exists
// set user hash in localStorage and redirect to drive
if (result.proxy && !result.proxy.login_name) {
if (!proxy.login_name) {
result.proxy.login_name = result.userName;
}
proxy.edPrivate = result.edPrivate;
proxy.edPublic = result.edPublic;
Cryptpad.whenRealtimeSyncs(result.realtime, function() {
Cryptpad.login(result.userHash, result.userName, function () {
if (sessionStorage.redirectTo) {