aboutsummaryrefslogtreecommitdiff
path: root/extension
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2015-12-18 15:56:16 +0100
committerFlorian Dold <florian.dold@gmail.com>2015-12-18 15:56:16 +0100
commitd583dfb07364b955801dc4f8b3a46237c1fa6b7c (patch)
treee3cc6bbbd3136fb51ab7c153deff5429ea4dab4c /extension
parentc03100cc0d79f3b8504c6f41c32edcfdf5d17e57 (diff)
Change signaling.
The events are now sent through the document, instead of document.body.
Diffstat (limited to 'extension')
-rw-r--r--extension/content_scripts/notify.js55
-rw-r--r--extension/content_scripts/notify.ts54
-rw-r--r--extension/tsconfig.json1
3 files changed, 78 insertions, 32 deletions
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 = (<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();
+});
diff --git a/extension/tsconfig.json b/extension/tsconfig.json
index 94ea6f444..da6561ffe 100644
--- a/extension/tsconfig.json
+++ b/extension/tsconfig.json
@@ -8,6 +8,7 @@
"background/emscriptif.ts",
"background/db.ts",
"lib/util.ts",
+ "content_scripts/notify.ts",
"popup/balance-overview.tsx",
"pages/confirm-contract.tsx"
]