[GNUnet-SVN] [taler-web-common] 01/02: substitutions aren't valid in fulfillment URL anymore

[gnunet]

This is an automated email from the git hooks/post-receive script.

dold pushed a commit to branch master
in repository web-common.

commit 952ae929f797996fbc41b858dd2d43a0ef1467c0
Author: Florian Dold <address@hidden>
AuthorDate: Wed Apr 26 00:41:36 2017 +0200

    substitutions aren't valid in fulfillment URL anymore
---
 taler-wallet-lib.js | 7 +------
 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);

-- 
To stop receiving notification emails like this one, please contact
address@hidden