new fulfillment protocol

1 files changed, 91 insertions, 80 deletions

diff --git a/extension/content_scripts/notify.js b/extension/content_scripts/notify.js
index d36ddb9a5..a38288d88 100644
--- a/extension/content_scripts/notify.js
+++ b/extension/content_scripts/notify.js
@@ -17,89 +17,100 @@
 // query the availability of Taler.
 /// <reference path="../lib/decl/chrome/chrome.d.ts" />
 "use strict";
-console.log("Taler injected");
-function subst(url, H_contract) {
-    url = url.replace("${H_contract}", H_contract);
-    url = url.replace("${$}", "$");
-    return url;
-}
-document.addEventListener("taler-probe", function (e) {
-    var evt = new Event("taler-wallet-present");
-    document.dispatchEvent(evt);
-    console.log("handshake done");
-});
-document.addEventListener("taler-create-reserve", function (e) {
-    var $ = function (x) { return document.getElementById(x); };
-    console.log("taler-create-reserve with " + JSON.stringify(e.detail));
-    var form_uri = $(e.detail.form_id).action;
-    // TODO: validate event fields
-    // TODO: also send extra bank-defined form fields
-    var params = {
-        post_url: URI(form_uri).absoluteTo(document.location.href).href(),
-        // TODO: This should change in the future, we should not deal with the
-        // amount as a bank-specific string here.
-        amount_str: $(e.detail.input_amount).value,
-        // TODO:  This double indirection is way too much ...
-        field_amount: $(e.detail.input_amount).name,
-        field_reserve_pub: $(e.detail.input_pub).name,
-        field_mint: $(e.detail.mint_rcv).name,
-    };
-    var uri = URI(chrome.extension.getURL("pages/confirm-create-reserve.html"));
-    document.location.href = uri.query(params).href();
-});
-document.addEventListener("taler-contract", function (e) {
-    // XXX: the merchant should just give us the parsed data ...
-    var offer = JSON.parse(e.detail);
-    var uri = URI(chrome.extension.getURL("pages/confirm-contract.html"));
-    var params = {
-        offer: JSON.stringify(offer),
-        merchantPageUrl: document.location.href,
-        cookie: document.cookie,
-    };
-    document.location.href = uri.query(params).href();
-});
-document.addEventListener('taler-execute-payment', function (e) {
-    console.log("got taler-execute-payment in content page");
-    if (!e.detail.pay_url) {
-        console.log("field 'pay_url' missing in taler-execute-payment event");
-        return;
+// Make sure we don't pollute the namespace too much.
+var TalerNotify;
+(function (TalerNotify) {
+    console.log("Taler injected");
+    function subst(url, H_contract) {
+        url = url.replace("${H_contract}", H_contract);
+        url = url.replace("${$}", "$");
+        return url;
     }
-    var payUrl = e.detail.pay_url;
-    var msg = {
-        type: "execute-payment",
-        detail: {
-            H_contract: e.detail.H_contract,
-        },
-    };
-    chrome.runtime.sendMessage(msg, function (resp) {
-        if (!resp.success) {
-            console.log("failure!");
+    var $ = function (x) { return document.getElementById(x); };
+    document.addEventListener("taler-probe", function (e) {
+        var evt = new Event("taler-wallet-present");
+        document.dispatchEvent(evt);
+        console.log("handshake done");
+    });
+    document.addEventListener("taler-create-reserve", function (e) {
+        console.log("taler-create-reserve with " + JSON.stringify(e.detail));
+        var form_uri = $(e.detail.form_id).action;
+        // TODO: validate event fields
+        // TODO: also send extra bank-defined form fields
+        var params = {
+            post_url: URI(form_uri).absoluteTo(document.location.href).href(),
+            // TODO: This should change in the future, we should not deal with the
+            // amount as a bank-specific string here.
+            amount_str: $(e.detail.input_amount).value,
+            // TODO:  This double indirection is way too much ...
+            field_amount: $(e.detail.input_amount).name,
+            field_reserve_pub: $(e.detail.input_pub).name,
+            field_mint: $(e.detail.mint_rcv).name,
+        };
+        var uri = URI(chrome.extension.getURL("pages/confirm-create-reserve.html"));
+        document.location.href = uri.query(params).href();
+    });
+    document.addEventListener("taler-contract", function (e) {
+        // XXX: the merchant should just give us the parsed data ...
+        var offer = JSON.parse(e.detail);
+        var uri = URI(chrome.extension.getURL("pages/confirm-contract.html"));
+        var params = {
+            offer: JSON.stringify(offer),
+            merchantPageUrl: document.location.href,
+        };
+        document.location.href = uri.query(params).href();
+    });
+    document.addEventListener('taler-execute-payment', function (e) {
+        console.log("got taler-execute-payment in content page");
+        if (!e.detail.pay_url) {
+            console.log("field 'pay_url' missing in taler-execute-payment event");
             return;
         }
-        var contract = resp.contract;
-        if (!contract) {
-            throw Error("contract missing");
-        }
-        var payReq = Object.assign({}, resp.payReq);
-        if (e.detail.require_contract) {
-            payReq.contract = contract;
-        }
-        console.log("Making request to ", payUrl);
-        var r = new XMLHttpRequest();
-        r.open('post', payUrl);
-        r.send(JSON.stringify(payReq));
-        r.onload = function () {
-            switch (r.status) {
-                case 200:
-                    console.log("going to", contract.fulfillment_url);
-                    window.location.href = subst(contract.fulfillment_url, e.detail.H_contract);
-                    window.location.reload(true);
-                    break;
-                default:
-                    console.log("Unexpected status code for $pay_url:", r.status);
-                    break;
-            }
+        var payUrl = e.detail.pay_url;
+        var msg = {
+            type: "execute-payment",
+            detail: {
+                H_contract: e.detail.H_contract,
+            },
         };
+        chrome.runtime.sendMessage(msg, function (resp) {
+            console.log("got resp");
+            console.dir(resp);
+            if (!resp.success) {
+                console.log("got event detial:");
+                console.dir(e.detail);
+                if (e.detail.offering_url) {
+                    console.log("offering url", e.detail.offering_url);
+                    window.location.href = e.detail.offering_url;
+                }
+                else {
+                    console.error("execute-payment failed");
+                }
+                return;
+            }
+            var contract = resp.contract;
+            if (!contract) {
+                throw Error("contract missing");
+            }
+            console.log("Making request to ", payUrl);
+            var r = new XMLHttpRequest();
+            r.open('post', payUrl);
+            r.send(JSON.stringify(resp.payReq));
+            r.onload = function () {
+                switch (r.status) {
+                    case 200:
+                        console.log("going to", contract.fulfillment_url);
+                        // TODO: Is this the right thing?  Does the reload
+                        // TODO: override setting location.href?
+                        window.location.href = subst(contract.fulfillment_url, e.detail.H_contract);
+                        window.location.reload(true);
+                        break;
+                    default:
+                        console.log("Unexpected status code for $pay_url:", r.status);
+                        break;
+                }
+            };
+        });
     });
-});
+})(TalerNotify || (TalerNotify = {}));
 //# sourceMappingURL=notify.js.map
\ No newline at end of file