diff options
author | Florian Dold <florian.dold@gmail.com> | 2017-02-12 23:34:28 +0100 |
---|---|---|
committer | Florian Dold <florian.dold@gmail.com> | 2017-02-12 23:34:28 +0100 |
commit | d7997747f88c931a495a8fd7ef66fda1071e97ef (patch) | |
tree | 2939deb99441d94f7cc829718a508d57a75a8f01 | |
parent | 77d1800ba4e026511068a0ae64753f4ec4f1d01c (diff) | |
download | web-common-d7997747f88c931a495a8fd7ef66fda1071e97ef.tar.gz web-common-d7997747f88c931a495a8fd7ef66fda1071e97ef.tar.bz2 web-common-d7997747f88c931a495a8fd7ef66fda1071e97ef.zip |
remove obsolete functionality
-rw-r--r-- | taler-wallet-lib.ts | 84 |
1 files changed, 1 insertions, 83 deletions
diff --git a/taler-wallet-lib.ts b/taler-wallet-lib.ts index 1b2f83a..b3a8309 100644 --- a/taler-wallet-lib.ts +++ b/taler-wallet-lib.ts @@ -137,18 +137,6 @@ namespace taler { } - export function executePayment(contractHash: string, payUrl: string, offeringUrl: string, onError?: any) { - if (!installed) { - logVerbose && console.log("delaying executePayment"); - taler.onPresent(() => { - executePayment(contractHash, payUrl, offeringUrl); - }); - return; - } - internalExecutePayment(contractHash, payUrl, offeringUrl); - } - - function handlePaymentResponse(resp: any, payUrl: string) { function subst(url: string, contractHash: string) { url = url.replace("${H_contract}", contractHash); @@ -193,7 +181,7 @@ namespace taler { r = new XMLHttpRequest(); r.open("post", payUrl); r.setRequestHeader("Content-Type", "application/json;charset=UTF-8"); - r.send(JSON.stringify(resp.payment)); + r.send(JSON.stringify(resp.payReq)); r.onload = function() { if (!r) { return; @@ -231,20 +219,6 @@ namespace taler { } - export function internalExecutePayment(contractHash: string, payUrl: string, offeringUrl: string, onError?: any) { - if (!contractHash) { - raise_error("protocol-violation", {hint: "contract hash not given"}); - } - - let args = { - H_contract: contractHash, - offering_url: offeringUrl - }; - - callWallet("taler-get-payment", args, (r: any) => handlePaymentResponse(r, payUrl)); - } - - export function onPresent(f: any) { presentHandlers.push(f); } @@ -253,62 +227,6 @@ namespace taler { absentHandlers.push(f); } - export function offerContractFrom(url: string) { - if (!installed) { - logVerbose && console.log("delaying offerContractFrom until GNU Taler wallet is present"); - taler.onPresent(() => { - offerContractFrom(url); - }); - return; - } - internalOfferContractFrom(url); - } - - /** - * Offer a contract to the wallet after - * downloading it from the given URL. - */ - export function internalOfferContractFrom(url: string) { - function handle_contract(contract_wrapper: any) { - let args = { - contract_wrapper: contract_wrapper, - replace_navigation: true - } - callWallet("taler-confirm-contract", args); - }; - - var contract_request = new XMLHttpRequest(); - logVerbose && 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) { - logVerbose && 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"); - let detail = {hint: "invalid json", status: contract_request.status, body: contract_request.responseText}; - raise_error("contract-failed", detail); - return; - } - handle_contract(contract_wrapper); - } else { - let detail = {hint: "contract download failed", status: contract_request.status, body: contract_request.responseText}; - raise_error("contract-failed", detail); - return; - } - } - }; - contract_request.onerror = function (e) { - let detail = {hint: "contract download failed", status: contract_request.status, body: contract_request.responseText}; - raise_error("contract-failed", detail); - return; - }; - contract_request.send(); - } - - interface FulfillmentQuery { type: "fulfillment_url"; } |