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

Merge pull request #3255 from cmgustavo/feat/non-backwards-compatible-uri

Browse source 
Adds non-backwards compatibility uri for payment protocol
This commit is contained in:
Matias Alejo Garcia 2015-09-29 12:54:31 -03:00
commit 504a8b10dd
1 changed files with 29 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

54
src/js/controllers/walletHome.js
View file

@ -1021,30 +1021,40 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
var satToUnit = 1 / this.unitToSatoshi; var satToUnit = 1 / this.unitToSatoshi;
uri = sanitizeUri(uri); // URI extensions for Payment Protocol with non-backwards-compatible request
if ((/^bitcoin:\?r=[\w+]/).exec(uri)) {
if (!bitcore.URI.isValid(uri)) { uri = decodeURIComponent(uri.replace('bitcoin:?r=', ''));
return uri; this.setFromPayPro(uri, function(err) {
} if (err) {
var parsed = new bitcore.URI(uri); return err;
var addr = parsed.address ? parsed.address.toString() : '';
var message = parsed.message;
var amount = parsed.amount ?
(parsed.amount.toFixed(0) * satToUnit).toFixed(this.unitDecimals) : 0;
if (parsed.r) {
this.setFromPayPro(parsed.r, function(err) {
if (err && addr && amount) {
self.setForm(addr, amount, message);
return addr;
} }
}); });
} else { } else {
this.setForm(addr, amount, message); uri = sanitizeUri(uri);
return addr;
if (!bitcore.URI.isValid(uri)) {
return uri;
}
var parsed = new bitcore.URI(uri);
var addr = parsed.address ? parsed.address.toString() : '';
var message = parsed.message;
var amount = parsed.amount ?
(parsed.amount.toFixed(0) * satToUnit).toFixed(this.unitDecimals) : 0;
if (parsed.r) {
this.setFromPayPro(parsed.r, function(err) {
if (err && addr && amount) {
self.setForm(addr, amount, message);
return addr;
}
});
} else {
this.setForm(addr, amount, message);
return addr;
}
} }
}; };