1 files changed, 97 insertions, 88 deletions

diff --git a/extension/content_scripts/notify.ts b/extension/content_scripts/notify.ts
index ddd77ddff..fac289d7f 100644
--- a/extension/content_scripts/notify.ts
+++ b/extension/content_scripts/notify.ts
@@ -21,99 +21,108 @@
 
 "use strict";
 
-console.log("Taler injected");
 
-function subst(url: string, H_contract) {
-  url = url.replace("${H_contract}", H_contract);
-  url = url.replace("${$}", "$");
-  return url;
-}
+// Make sure we don't pollute the namespace too much.
+namespace TalerNotify {
+  console.log("Taler injected");
 
+  function subst(url: string, H_contract) {
+    url = url.replace("${H_contract}", H_contract);
+    url = url.replace("${$}", "$");
+    return url;
+  }
 
-document.addEventListener("taler-probe", function(e) {
-  let evt = new Event("taler-wallet-present");
-  document.dispatchEvent(evt);
-  console.log("handshake done");
-});
-
-document.addEventListener("taler-create-reserve", function(e: CustomEvent) {
   let $ = (x) => document.getElementById(x);
-  console.log("taler-create-reserve with " + JSON.stringify(e.detail));
-  let form_uri = (<HTMLFormElement>$(e.detail.form_id)).action;
-  // TODO: validate event fields
-  // TODO: also send extra bank-defined form fields
-  let 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: (<HTMLInputElement>$(e.detail.input_amount)).value,
-    // TODO:  This double indirection is way too much ...
-    field_amount: (<HTMLInputElement>$(e.detail.input_amount)).name,
-    field_reserve_pub: (<HTMLInputElement>$(e.detail.input_pub)).name,
-    field_mint: (<HTMLInputElement>$(e.detail.mint_rcv)).name,
-  };
-  let uri = URI(chrome.extension.getURL("pages/confirm-create-reserve.html"));
-  document.location.href = uri.query(params).href();
-});
-
-
-document.addEventListener("taler-contract", function(e: CustomEvent) {
-  // XXX: the merchant should just give us the parsed data ...
-  let offer = JSON.parse(e.detail);
-  let uri = URI(chrome.extension.getURL("pages/confirm-contract.html"));
-  let 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: CustomEvent) {
-  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;
-  }
-  let payUrl = e.detail.pay_url;
-  let msg = {
-    type: "execute-payment",
-    detail: {
-      H_contract: e.detail.H_contract,
-    },
-  };
-  chrome.runtime.sendMessage(msg, (resp) => {
-    if (!resp.success) {
-      console.log("failure!");
-      return;
-    }
-    let contract = resp.contract;
-    if (!contract) {
-      throw Error("contract missing");
-    }
 
-    let payReq = Object.assign({}, resp.payReq);
-    if (e.detail.require_contract) {
-      payReq.contract = contract;
-    }
+  document.addEventListener("taler-probe", function(e) {
+    let evt = new Event("taler-wallet-present");
+    document.dispatchEvent(evt);
+    console.log("handshake done");
+  });
 
-    console.log("Making request to ", payUrl);
-    let r = new XMLHttpRequest();
-    r.open('post', payUrl);
-    r.send(JSON.stringify(payReq));
-    r.onload = () => {
-      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;
-      }
+  document.addEventListener("taler-create-reserve", function(e: CustomEvent) {
+    console.log("taler-create-reserve with " + JSON.stringify(e.detail));
+    let form_uri = (<HTMLFormElement>$(e.detail.form_id)).action;
+    // TODO: validate event fields
+    // TODO: also send extra bank-defined form fields
+    let 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: (<HTMLInputElement>$(e.detail.input_amount)).value,
+      // TODO:  This double indirection is way too much ...
+      field_amount: (<HTMLInputElement>$(e.detail.input_amount)).name,
+      field_reserve_pub: (<HTMLInputElement>$(e.detail.input_pub)).name,
+      field_mint: (<HTMLInputElement>$(e.detail.mint_rcv)).name,
+    };
+    let uri = URI(chrome.extension.getURL("pages/confirm-create-reserve.html"));
+    document.location.href = uri.query(params).href();
+  });
+
+
+  document.addEventListener("taler-contract", function(e: CustomEvent) {
+    // XXX: the merchant should just give us the parsed data ...
+    let offer = JSON.parse(e.detail);
+    let uri = URI(chrome.extension.getURL("pages/confirm-contract.html"));
+    let params = {
+      offer: JSON.stringify(offer),
+      merchantPageUrl: document.location.href,
     };
+    document.location.href = uri.query(params).href();
+  });
+
+
+  document.addEventListener('taler-execute-payment', function(e: CustomEvent) {
+    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;
+    }
+    let payUrl = e.detail.pay_url;
+    let msg = {
+      type: "execute-payment",
+      detail: {
+        H_contract: e.detail.H_contract,
+      },
+    };
+    chrome.runtime.sendMessage(msg, (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;
+      }
+      let contract = resp.contract;
+      if (!contract) {
+        throw Error("contract missing");
+      }
+
+      console.log("Making request to ", payUrl);
+      let r = new XMLHttpRequest();
+      r.open('post', payUrl);
+      r.send(JSON.stringify(resp.payReq));
+      r.onload = () => {
+        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;
+        }
+      };
+    });
   });
-});
\ No newline at end of file
+}
\ No newline at end of file