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

Merge pull request #1836 from matiaspando/existingProfile

Browse source 
Existing profile
This commit is contained in:
Matias Alejo Garcia 2014-11-19 11:30:13 -03:00
commit 8491308cac
2 changed files with 40 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

45
js/models/Identity.js
View file

@ -299,11 +299,14 @@ Identity.prototype.importWalletFromObj = function(obj, opts, cb) {
log.debug('Adding wallet to profile:' + w.getName());
self.addWallet(w);
self.bindWallet(w);
var writeOpts = _.extend({
noWallets: true
}, opts);
self.storeWallet(w, function(err) {
if (err) return cb(err);
self.store({
noWallets: true
}, function(err) {
self.store(writeOpts, function(err) {
return cb(err, w);
});
});
@ -327,7 +330,6 @@ Identity.importFromEncryptedFullJson = function(ejson, password, opts, cb) {
var crypto = opts.cryptoUtil || cryptoUtil;
var str = crypto.decrypt(password, ejson);
if (!str) {
// 0.7.3 broken KDF
log.debug('Trying legacy encryption...');
@ -360,24 +362,35 @@ Identity.importFromFullJson = function(str, password, opts, cb) {
var iden = new Identity(opts);
opts.failIfExists = true;
json.wallets = json.wallets || {};
async.map(json.wallets, function(walletData, callback) {
if (!walletData)
return callback();
iden.store(opts, function(err) {
if (err) return cb(err); //profile already exists
iden.importWalletFromObj(walletData, opts, function(err, w) {
if (err) return callback(err);
log.debug('Wallet ' + w.getId() + ' imported');
callback();
});
}, function(err, results) {
if (err) return cb(err);
opts.failIfExists = false;
async.map(json.wallets, function(walletData, callback) {
iden.store(null, function(err) {
return cb(err, iden);
if (!walletData)
return callback();
iden.importWalletFromObj(walletData, opts, function(err, w) {
if (err) return callback(err);
log.debug('Wallet ' + w.getId() + ' imported');
callback();
});
}, function(err, results) {
if (err) return cb(err);
iden.store(opts, function(err) {
return cb(err, iden);
});
});
});
};
Identity.prototype.bindWallet = function(w) {