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

Merge pull request #1946 from isocolsky/prevent_multijoin

Browse source 
returning error when allet already exists in profile
This commit is contained in:
Matias Alejo Garcia 2014-12-04 14:47:11 -03:00
commit db429a3dc5
4 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
js/controllers/join.js
View file

@ -130,6 +130,8 @@ angular.module('copayApp.controllers').controller('JoinController',
notification.error('Fatal error connecting to Insight server'); notification.error('Fatal error connecting to Insight server');
else if (err === 'walletFull') else if (err === 'walletFull')
notification.error('The wallet is full'); notification.error('The wallet is full');
else if (err === 'walletAlreadyExists')
notification.error('Wallet already exists', 'Cannot join again from the same profile');
else if (err === 'badNetwork') else if (err === 'badNetwork')
notification.error('Network Error', 'Wallet network configuration missmatch'); notification.error('Network Error', 'Wallet network configuration missmatch');
else if (err === 'badSecret') else if (err === 'badSecret')
@ -138,6 +140,7 @@ angular.module('copayApp.controllers').controller('JoinController',
notification.error('Error', err.message || err); notification.error('Error', err.message || err);
} }
} }
$timeout(function () { $scope.$digest(); }, 1);
}); });
} }
}); });

7
js/models/Identity.js
View file

@ -575,6 +575,13 @@ Identity.prototype.createWallet = function(opts, cb) {
var self = this; var self = this;
var w = new walletClass(opts); var w = new walletClass(opts);
console.log(_.keys(self.wallets));
console.log(w.getId());
if (_.contains(_.keys(self.wallets), w.getId())) {
return cb('walletAlreadyExists');
}
self.wallets[w.getId()] = w; self.wallets[w.getId()] = w;
self.updateFocusedTimestamp(w.getId()); self.updateFocusedTimestamp(w.getId());
self.bindWallet(w); self.bindWallet(w);

5
js/models/Wallet.js
View file

@ -2550,7 +2550,10 @@ Wallet.prototype.isComplete = function() {
* @param {string} version - the new version for the wallet * @param {string} version - the new version for the wallet
*/ */
Wallet.prototype.setVersion = function(version) { Wallet.prototype.setVersion = function(version) {
this.version = this.opts.version = version; this.version = version;
if (this.opts) {
this.opts.version = version;
}
}; };
/** /**

3
test/Identity.js
View file

@ -77,9 +77,10 @@ describe('Identity model', function() {
return params; return params;
} }
var wid = 0;
function getNewWallet(args) { function getNewWallet(args) {
var w = sinon.stub(); var w = sinon.stub();
w.getId = sinon.stub().returns('wid'); w.getId = sinon.stub().returns('wid' + (++wid));
w.getStorageKey = sinon.stub().returns('wkey'); w.getStorageKey = sinon.stub().returns('wkey');
w.toObj = sinon.stub().returns({ w.toObj = sinon.stub().returns({
obj: 1 obj: 1