From d583dfb07364b955801dc4f8b3a46237c1fa6b7c Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Fri, 18 Dec 2015 15:56:16 +0100 Subject: Change signaling. The events are now sent through the document, instead of document.body. --- extension/content_scripts/notify.js | 55 ++++++++++++++++--------------------- extension/content_scripts/notify.ts | 54 ++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 32 deletions(-) create mode 100644 extension/content_scripts/notify.ts (limited to 'extension/content_scripts') diff --git a/extension/content_scripts/notify.js b/extension/content_scripts/notify.js index 3777f2e7c..4a014e853 100644 --- a/extension/content_scripts/notify.js +++ b/extension/content_scripts/notify.js @@ -1,57 +1,48 @@ // Script that is injected into pages in order to allow merchants pages to // query the availability of Taler. - 'use strict'; - -// Install our handshake handlers only once the -// document is loaded -// TODO: change the spec to do it on the body -document.addEventListener("DOMContentLoaded", function(e) { - console.log("DOM fully loaded and parsed"); - document.body.addEventListener('taler-checkout-probe', function(e) { +document.addEventListener('taler-checkout-probe', function (e) { let evt = new Event('taler-wallet-present'); - document.body.dispatchEvent(evt); + document.dispatchEvent(evt); console.log("merchant handshake done"); - }); - document.body.addEventListener('taler-wire-probe', function(e) { +}); +document.addEventListener('taler-wire-probe', function (e) { let evt = new Event('taler-wallet-present'); - document.body.dispatchEvent(evt); + document.dispatchEvent(evt); console.log("bank handshake done"); - }); - document.body.addEventListener('taler-checkout-probe', function(e) { +}); +document.addEventListener('taler-checkout-probe', function (e) { let evt = new Event('taler-wallet-present'); - document.body.dispatchEvent(evt); + document.dispatchEvent(evt); console.log("merchant handshake done"); - }); - document.body.addEventListener('taler-create-reserve', function(e) { +}); +document.addEventListener('taler-create-reserve', function (e) { let $ = (x) => document.getElementById(x); console.log("taler-create-reserve with " + JSON.stringify(e.detail)); let form_uri = $(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: $(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, + 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, }; let uri = URI(chrome.extension.getURL("pages/confirm-create-reserve.html")); document.location.href = uri.query(params).href(); - }); - document.body.addEventListener('taler-contract', function(e) { +}); +document.addEventListener('taler-contract', function (e) { // 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 + offer: JSON.stringify(offer), + merchantPageUrl: document.location.href, + cookie: document.cookie, }; document.location.href = uri.query(params).href(); - }); }); - -console.log("Taler wallet: content page loaded"); diff --git a/extension/content_scripts/notify.ts b/extension/content_scripts/notify.ts new file mode 100644 index 000000000..7a50582e8 --- /dev/null +++ b/extension/content_scripts/notify.ts @@ -0,0 +1,54 @@ +// Script that is injected into pages in order to allow merchants pages to +// query the availability of Taler. + +'use strict'; + +document.addEventListener('taler-checkout-probe', function(e) { + let evt = new Event('taler-wallet-present'); + document.dispatchEvent(evt); + console.log("merchant handshake done"); +}); + +document.addEventListener('taler-wire-probe', function(e) { + let evt = new Event('taler-wallet-present'); + document.dispatchEvent(evt); + console.log("bank handshake done"); +}); + +document.addEventListener('taler-checkout-probe', function(e) { + let evt = new Event('taler-wallet-present'); + document.dispatchEvent(evt); + console.log("merchant 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 = ($(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: ($(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, + }; + 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(); +}); -- cgit v1.2.3