diff --git a/lib/model/wallet.js b/lib/model/wallet.js index 3c60374..ab22577 100644 --- a/lib/model/wallet.js +++ b/lib/model/wallet.js @@ -108,7 +108,7 @@ Wallet.prototype.addCopayer = function(copayer) { this._updatePublicKeyRing(); }; -Wallet.prototype.addCopayerRequestKey = function(copayerId, requestPubKey, signature, restrictions) { +Wallet.prototype.addCopayerRequestKey = function(copayerId, requestPubKey, signature, restrictions, name) { $.checkState(this.copayers.length == this.n); var c = this.getCopayer(copayerId); @@ -118,7 +118,8 @@ Wallet.prototype.addCopayerRequestKey = function(copayerId, requestPubKey, signa key: requestPubKey.toString(), signature: signature, selfSigned: true, - restrictions: restrictions, + restrictions: restrictions || {}, + name: name || null, }); }; diff --git a/lib/server.js b/lib/server.js index 4bc5c3f..b7d1d7a 100644 --- a/lib/server.js +++ b/lib/server.js @@ -391,7 +391,7 @@ WalletService.prototype._addCopayerToWallet = function(wallet, opts, cb) { WalletService.prototype._addKeyToCopayer = function(wallet, copayer, opts, cb) { var self = this; - wallet.addCopayerRequestKey(copayer.copayerId, opts.requestPubKey, opts.signature, opts.restrictions); + wallet.addCopayerRequestKey(copayer.copayerId, opts.requestPubKey, opts.signature, opts.restrictions, opts.name); self.storage.storeWalletAndUpdateCopayersLookup(wallet, function(err) { if (err) return cb(err); @@ -412,6 +412,7 @@ WalletService.prototype._addKeyToCopayer = function(wallet, copayer, opts, cb) { * @param {string} opts.restrictions * - cannotProposeTXs * - cannotXXX TODO + * @param {string} opts.name (name for the new access) */ WalletService.prototype.addAccess = function(opts, cb) { var self = this; @@ -429,7 +430,8 @@ WalletService.prototype.addAccess = function(opts, cb) { var xPubKey = _.find(wallet.copayers, { id: opts.copayerId }).xPubKey; - if (!WalletUtils.checkRequestPubKey(opts.requestPubKey, opts.signature, xPubKey)) { + + if (!WalletUtils.verifyRequestPubKey(opts.requestPubKey, opts.signature, xPubKey)) { return cb(Errors.NOT_AUTHORIZED); }