taler/wallet-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

Change signaling.

Browse Source 
The events are now sent through the document, instead of document.body.
This commit is contained in:
Florian Dold 2015-12-18 15:56:16 +01:00
parent c03100cc0d
commit d583dfb073
3 changed files with 78 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
extension/content_scripts/notify.js
View File

@ -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");

54
extension/content_scripts/notify.ts Normal file
View File

@ -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();
});

1
extension/tsconfig.json
View File

@ -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"
]