diff options
author | Florian Dold <florian.dold@gmail.com> | 2017-04-26 00:41:36 +0200 |
---|---|---|
committer | Florian Dold <florian.dold@gmail.com> | 2017-04-26 00:41:36 +0200 |
commit | 952ae929f797996fbc41b858dd2d43a0ef1467c0 (patch) | |
tree | 1146900d6ecd1d2df46212122c55e94a2abb165d | |
parent | d7e013594d15388b1a7342a44a0e9c8d4ecca82d (diff) | |
download | web-common-952ae929f797996fbc41b858dd2d43a0ef1467c0.tar.gz web-common-952ae929f797996fbc41b858dd2d43a0ef1467c0.tar.bz2 web-common-952ae929f797996fbc41b858dd2d43a0ef1467c0.zip |
substitutions aren't valid in fulfillment URL anymore
-rw-r--r-- | taler-wallet-lib.js | 7 | ||||
-rw-r--r-- | taler-wallet-lib.ts | 8 |
2 files changed, 2 insertions, 13 deletions
diff --git a/taler-wallet-lib.js b/taler-wallet-lib.js index b160918..2978d83 100644 --- a/taler-wallet-lib.js +++ b/taler-wallet-lib.js @@ -123,11 +123,6 @@ var taler; } taler.createReserve = createReserve; function handlePaymentResponse(resp) { - function subst(url, contractHash) { - url = url.replace("${H_contract}", contractHash); - url = url.replace("${$}", "$"); - return url; - } /** * Handle a failed payment. * @@ -172,7 +167,7 @@ var taler; case 200: logVerbose && console.log("got success from pay_url"); callWallet("taler-payment-succeeded", { H_contract: resp.H_contract }, function () { - var nextUrl = subst(resp.contract.fulfillment_url, resp.H_contract); + var nextUrl = resp.contract.fulfillment_url; logVerbose && console.log("taler-payment-succeeded done, going to", nextUrl); window.location.href = nextUrl; window.location.reload(true); diff --git a/taler-wallet-lib.ts b/taler-wallet-lib.ts index aca5395..a5694a9 100644 --- a/taler-wallet-lib.ts +++ b/taler-wallet-lib.ts @@ -138,12 +138,6 @@ namespace taler { function handlePaymentResponse(resp: any) { - function subst(url: string, contractHash: string) { - url = url.replace("${H_contract}", contractHash); - url = url.replace("${$}", "$"); - return url; - } - /** * Handle a failed payment. * @@ -190,7 +184,7 @@ namespace taler { case 200: logVerbose && console.log("got success from pay_url"); callWallet("taler-payment-succeeded", {H_contract: resp.H_contract}, () => { - let nextUrl = subst(resp.contract.fulfillment_url, resp.H_contract); + let nextUrl = resp.contract.fulfillment_url; logVerbose && console.log("taler-payment-succeeded done, going to", nextUrl); window.location.href = nextUrl; window.location.reload(true); |