anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

#import test

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-10-21 12:03:09 -03:00
commit 02d5604497
4 changed files with 40 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

12
js/models/Identity.js
View file

@ -343,11 +343,13 @@ Identity.prototype.closeWallet = function(wid, cb) {
*/
Identity.import = function(str, password, opts, cb) {
preconditions.checkArgument(str);
console.log('[Identity.js.347:str::]',str); //TODO
var json = JSON.parse(str);
preconditions.checkArgument(_.isNumber(json.iterations));
if (!_.isNumber(json.iterations))
return cb('BADSTR: Missing iterations');
if (!json.profile)
return cb('BADSTR: Missing profile');
var iden = new Identity(password, opts);
@ -383,7 +385,7 @@ Identity.prototype.export = function() {
ret.wallets = {};
_.each(this.openWallets, function(w) {
ret.wallets[w.getId()] = w.toEncryptedObj();
ret.wallets[w.getId()] = w.export();
});
var r = JSON.stringify(ret);

6
js/models/Storage.js
View file

@ -233,17 +233,17 @@ Storage.prototype.clearAll = function(cb) {
Storage.prototype.decrypt = function(base64, password, iterations) {
if (password) {
this.storage.savePassphrase();
this.savePassphrase();
var opts = iterations ? {iterations: iterations} : {};
this.storage.setPassword(password, opts);
this.setPassword(password, opts);
}
var decryptedStr = this._decrypt(base64);
var ret = JSON.parse(decryptedStr);
if (password)
this.storage.restorePassphrase();
this.restorePassphrase();
return ret;
};