From ff75ad30212f21c9870ee3913e39a1774dc9ad9a Mon Sep 17 00:00:00 2001
From: CamilleC <kmille.c.cc@gmail.com>
Date: Wed, 15 Feb 2017 11:48:20 +0100
Subject: [PATCH] fix recoverId
---
www/js/services/wallet-services.js | 27 ++++++++++++---------------
1 file changed, 12 insertions(+), 15 deletions(-)
diff --git a/www/js/services/wallet-services.js b/www/js/services/wallet-services.js
index 539d4b8ad..ad5ddd3d6 100644
--- a/www/js/services/wallet-services.js
+++ b/www/js/services/wallet-services.js
@@ -1459,27 +1459,24 @@ angular.module('cesium.wallet.services', ['ngResource', 'ngApi', 'cesium.bma.ser
},
recoverId = function(recover) {
+ var nonce = CryptoUtils.util.decode_base58(recover.cypherNonce);
return getkeypairSaveId(recover)
.then(function (recover) {
- var nonce = CryptoUtils.util.decode_base58(recover.cypherNonce);
return CryptoUtils.box.open(recover.cypherSalt, nonce, recover.keypair.boxPk, recover.keypair.boxSk)
- .then(function (salt) {
- recover.salt = salt;
- return CryptoUtils.box.open(recover.cypherPwd, nonce, recover.keypair.boxPk, recover.keypair.boxSk)
- .then(function (pwd) {
- recover.pwd = pwd;
- return recover;
- });
- })
- .catch(function(err){
- console.warn('Try again');
- });
-
+ })
+ .then(function (salt) {
+ recover.salt = salt;
+ return CryptoUtils.box.open(recover.cypherPwd, nonce, recover.keypair.boxPk, recover.keypair.boxSk)
+ })
+ .then(function (pwd) {
+ recover.pwd = pwd;
+ return recover;
+ })
+ .catch(function(err){
+ console.warn('Incorrect answers - Unable to recover passwords');
});
},
-
-
getSaveIDDocument = function(record) {
var saveId = 'Version: 10 \n' +
'Type: SaveID\n' +
--
GitLab