mirror of https://github.com/BTCPrivate/copay.git
fix Identity
This commit is contained in:
parent
cfa5748f74
commit
65d5f32309
|
@ -3,7 +3,6 @@ var _ = require('lodash');
|
||||||
var preconditions = require('preconditions').singleton();
|
var preconditions = require('preconditions').singleton();
|
||||||
var inherits = require('inherits');
|
var inherits = require('inherits');
|
||||||
var events = require('events');
|
var events = require('events');
|
||||||
var log = require('../util/log');
|
|
||||||
var async = require('async');
|
var async = require('async');
|
||||||
|
|
||||||
var bitcore = require('bitcore');
|
var bitcore = require('bitcore');
|
||||||
|
@ -14,9 +13,9 @@ var PrivateKey = require('./PrivateKey');
|
||||||
var Wallet = require('./Wallet');
|
var Wallet = require('./Wallet');
|
||||||
var PluginManager = require('./PluginManager');
|
var PluginManager = require('./PluginManager');
|
||||||
var Async = require('./Async');
|
var Async = require('./Async');
|
||||||
|
|
||||||
var version = require('../../version').version;
|
|
||||||
var cryptoUtil = require('../util/crypto');
|
var cryptoUtil = require('../util/crypto');
|
||||||
|
var log = require('../util/log');
|
||||||
|
var version = require('../../version').version;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @desc
|
* @desc
|
||||||
|
@ -122,7 +121,7 @@ Identity.open = function(opts, cb) {
|
||||||
|
|
||||||
var storage = opts.storage || opts.pluginManager.get('DB');
|
var storage = opts.storage || opts.pluginManager.get('DB');
|
||||||
storage.setCredentials(opts.email, opts.password, opts);
|
storage.setCredentials(opts.email, opts.password, opts);
|
||||||
storage.getItem(Identity.getKeyForEmail(opts.email), function(err, data) {
|
storage.getItem(Identity.getKeyForEmail(opts.email), function(err, data, headers) {
|
||||||
var exported;
|
var exported;
|
||||||
if (err) {
|
if (err) {
|
||||||
return cb(err);
|
return cb(err);
|
||||||
|
@ -132,7 +131,7 @@ Identity.open = function(opts, cb) {
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
return cb(e);
|
return cb(e);
|
||||||
}
|
}
|
||||||
return cb(null, new Identity(_.extend(opts, exported)));
|
return cb(null, new Identity(_.extend(opts, exported)), headers);
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -553,8 +552,8 @@ Identity.prototype.createWallet = function(opts, cb) {
|
||||||
var self = this;
|
var self = this;
|
||||||
|
|
||||||
var w = new walletClass(opts);
|
var w = new walletClass(opts);
|
||||||
self.updateFocusedTimestamp(w.getId());
|
|
||||||
self.bindWallet(w);
|
self.bindWallet(w);
|
||||||
|
self.updateFocusedTimestamp(w.getId());
|
||||||
self.storeWallet(w, function(err) {
|
self.storeWallet(w, function(err) {
|
||||||
if (err) return cb(err);
|
if (err) return cb(err);
|
||||||
self.store({
|
self.store({
|
||||||
|
@ -619,11 +618,10 @@ Identity.prototype.deleteWallet = function(walletId, cb) {
|
||||||
delete this.focusedTimestamps[walletId];
|
delete this.focusedTimestamps[walletId];
|
||||||
|
|
||||||
this.storage.removeItem(Wallet.getStorageKey(walletId), function(err) {
|
this.storage.removeItem(Wallet.getStorageKey(walletId), function(err) {
|
||||||
if (err) {
|
if (err) return cb(err);
|
||||||
return cb(err);
|
|
||||||
}
|
|
||||||
self.emitAndKeepAlive('deletedWallet', walletId);
|
self.emitAndKeepAlive('deletedWallet', walletId);
|
||||||
self.store(null, cb);
|
self.store(null, cb);
|
||||||
|
return cb();
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue