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

rename event, move logic into wallet

Browse Source
This commit is contained in:
Florian Dold 2016-09-06 15:03:34 +02:00
parent 356a2eb01a
commit a83e60e605
2 changed files with 46 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
content_scripts/notify.ts
View File

@ -27,7 +27,7 @@
"use strict"; "use strict";
import {createReserve, confirmContract, executeContract} from "../lib/shopApi"; import {createReserve, confirmContract, fetchPayment} from "../lib/shopApi";
// Make sure we don't pollute the namespace too much. // Make sure we don't pollute the namespace too much.
namespace TalerNotify { namespace TalerNotify {
@ -118,8 +118,8 @@ namespace TalerNotify {
}); });
}); });
addHandler("taler-execute-contract", (e: CustomEvent) => { addHandler("taler-fetch-payment", (e: CustomEvent) => {
executeContract(e.detail.H_contract, e.detail.offering_url); fetchPayment(e.detail.H_contract, e.detail.offering_url);
}); });
} }
} }

47
lib/shopApi.ts
View File

@ -91,10 +91,14 @@ export function confirmContract(contract_wrapper: any, replace_navigation: any)
} }
export function executeContract(H_contract: any, offering_url: any) { /**
console.log("got taler-execute-contract in content page"); * Fetch a payment (coin deposit permissions) for a given contract.
* If we don't have the payment for the contract, redirect to
* offering url instead.
*/
export function fetchPayment(H_contract: any, offering_url: any) {
const msg = { const msg = {
type: "execute-payment", type: "fetch-payment",
detail: {H_contract}, detail: {H_contract},
}; };
@ -106,7 +110,7 @@ export function executeContract(H_contract: any, offering_url: any) {
console.log("offering url", offering_url); console.log("offering url", offering_url);
window.location.href = offering_url; window.location.href = offering_url;
} else { } else {
console.error("execute-payment failed"); console.error("fetch-payment failed");
} }
return; return;
} }
@ -128,3 +132,38 @@ export function executeContract(H_contract: any, offering_url: any) {
document.dispatchEvent(evt); document.dispatchEvent(evt);
}); });
} }
/**
* Offer a contract to the wallet after
* downloading it from the given URL.
*/
function offerContractFrom(url) {
var contract_request = new XMLHttpRequest();
console.log("downloading contract from '" + url + "'");
contract_request.open("GET", url, true);
contract_request.onload = function (e) {
if (contract_request.readyState == 4) {
if (contract_request.status == 200) {
console.log("response text:",
contract_request.responseText);
var contract_wrapper = JSON.parse(contract_request.responseText);
if (!contract_wrapper) {
console.error("response text was invalid json");
alert("Failure to download contract (invalid json)");
return;
}
confirmContract(contract_wrapper, true);
} else {
alert("Failure to download contract from merchant " +
"(" + contract_request.status + "):\n" +
contract_request.responseText);
}
}
};
contract_request.onerror = function (e) {
alert("Failure requesting the contract:\n"
+ contract_request.statusText);
};
contract_request.send();
}