From 701af29192144c90e5c0131f35ea299272036039 Mon Sep 17 00:00:00 2001 From: ansuz Date: Fri, 24 Nov 2017 15:12:00 +0100 Subject: [PATCH] fix broken register/login process --- www/common/login.js | 8 ++++++-- www/common/outer/local-store.js | 5 +++++ www/register/main.js | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/www/common/login.js b/www/common/login.js index 20661adcf..847ca74a7 100644 --- a/www/common/login.js +++ b/www/common/login.js @@ -5,9 +5,11 @@ define([ '/common/common-util.js', '/common/outer/network-config.js', '/common/credential.js', + '/bower_components/chainpad/chainpad.dist.js', + '/bower_components/tweetnacl/nacl-fast.min.js', '/bower_components/scrypt-async/scrypt-async.min.js', // better load speed -], function ($, Listmap, Crypto, Util, NetConfig, Cred) { +], function ($, Listmap, Crypto, Util, NetConfig, Cred, ChainPad) { var Exports = { Cred: Cred, }; @@ -64,6 +66,8 @@ define([ validateKey: opt.keys.validateKey, // derived validation key crypto: Crypto.createEncryptor(opt.keys), logLevel: 1, + classic: true, + ChainPad: ChainPad, }; var rt = opt.rt = Listmap.create(config); @@ -133,7 +137,7 @@ define([ return void cb('ALREADY_REGISTERED', res); } - cb(void 0, res); + setTimeout(function () { cb(void 0, res); }); }); }); }; diff --git a/www/common/outer/local-store.js b/www/common/outer/local-store.js index 09d135d2e..43611aa6f 100644 --- a/www/common/outer/local-store.js +++ b/www/common/outer/local-store.js @@ -52,6 +52,11 @@ define([ return hash; }; + var setUserHash = LocalStore.setUserHash = function (hash) { + var sHash = Hash.serializeHash(hash); + localStorage[Constants.userHashKey] = sHash; + }; + LocalStore.getAccountName = function () { return localStorage[Constants.userNameKey]; }; diff --git a/www/register/main.js b/www/register/main.js index 295f6acf0..69e3a59a4 100644 --- a/www/register/main.js +++ b/www/register/main.js @@ -60,7 +60,7 @@ define([ window.alert("Test passed!"); return; } - localStorage.User_hash = result.userHash; + LocalStore.setUserHash(result.userHash); var proxy = result.proxy; proxy.edPublic = result.edPublic;