diff --git a/www/js/services/wallet-services.js b/www/js/services/wallet-services.js index 539d4b8ad3f2fd2d5feda317690665085094a087..ad5ddd3d6c554e491593d7677643f8036ce37b2c 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' +