aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/shopApi.ts130
-rw-r--r--lib/wallet/wxMessaging.ts35
2 files changed, 148 insertions, 17 deletions
diff --git a/lib/shopApi.ts b/lib/shopApi.ts
new file mode 100644
index 000000000..b110e2e75
--- /dev/null
+++ b/lib/shopApi.ts
@@ -0,0 +1,130 @@
+/*
+ This file is part of TALER
+ (C) 2015 GNUnet e.V.
+
+ TALER is free software; you can redistribute it and/or modify it under the
+ terms of the GNU General Public License as published by the Free Software
+ Foundation; either version 3, or (at your option) any later version.
+
+ TALER is distributed in the hope that it will be useful, but WITHOUT ANY
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along with
+ TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
+ */
+
+
+/**
+ * Implementation of the shop API, either invoked via HTTP or
+ * via a JS DOM Events.
+ *
+ * @author Florian Dold
+ */
+
+
+
+function subst(url: string, H_contract) {
+ url = url.replace("${H_contract}", H_contract);
+ url = url.replace("${$}", "$");
+ return url;
+}
+
+export function createReserve(amount: any, callback_url: any, wt_types: any) {
+ let params = {
+ amount: JSON.stringify(amount),
+ callback_url: URI(callback_url)
+ .absoluteTo(document.location.href),
+ bank_url: document.location.href,
+ wt_types: JSON.stringify(wt_types),
+ };
+ let uri = URI(chrome.extension.getURL("pages/confirm-create-reserve.html"));
+ document.location.href = uri.query(params).href();
+}
+
+export function confirmContract(contract_wrapper: any, replace_navigation: any) {
+ if (contract_wrapper) {
+ console.error("contract wrapper missing");
+ return;
+ }
+
+ const offer = contract_wrapper;
+
+ if (!offer.contract) {
+ console.error("contract field missing");
+ return;
+ }
+
+ const msg = {
+ type: "check-repurchase",
+ detail: {
+ contract: offer.contract
+ },
+ };
+
+ chrome.runtime.sendMessage(msg, (resp) => {
+ if (resp.error) {
+ console.error("wallet backend error", resp);
+ return;
+ }
+ if (resp.isRepurchase) {
+ console.log("doing repurchase");
+ console.assert(resp.existingFulfillmentUrl);
+ console.assert(resp.existingContractHash);
+ window.location.href = subst(resp.existingFulfillmentUrl,
+ resp.existingContractHash);
+
+ } else {
+ const uri = URI(chrome.extension.getURL("pages/confirm-contract.html"));
+ const params = {
+ offer: JSON.stringify(offer),
+ merchantPageUrl: document.location.href,
+ };
+ const target = uri.query(params).href();
+ if (replace_navigation === true) {
+ document.location.replace(target);
+ } else {
+ document.location.href = target;
+ }
+ }
+ });
+}
+
+
+export function executeContract(H_contract: any, offering_url: any) {
+ console.log("got taler-execute-contract in content page");
+ const msg = {
+ type: "execute-payment",
+ detail: {H_contract},
+ };
+
+ chrome.runtime.sendMessage(msg, (resp) => {
+ console.log("got resp");
+ console.dir(resp);
+ if (!resp.success) {
+ if (offering_url) {
+ console.log("offering url", offering_url);
+ window.location.href = offering_url;
+ } else {
+ console.error("execute-payment failed");
+ }
+ return;
+ }
+ let contract = resp.contract;
+ if (!contract) {
+ throw Error("contract missing");
+ }
+
+ // We have the details for then payment, the merchant page
+ // is responsible to give it to the merchant.
+
+ let evt = new CustomEvent("taler-notify-payment", {
+ detail: {
+ H_contract: H_contract,
+ contract: resp.contract,
+ payment: resp.payReq,
+ }
+ });
+ document.dispatchEvent(evt);
+ });
+} \ No newline at end of file
diff --git a/lib/wallet/wxMessaging.ts b/lib/wallet/wxMessaging.ts
index 68c744901..faff0d220 100644
--- a/lib/wallet/wxMessaging.ts
+++ b/lib/wallet/wxMessaging.ts
@@ -15,7 +15,13 @@
*/
-import {Wallet, Offer, Badge, ConfirmReserveRequest, CreateReserveRequest} from "./wallet";
+import {
+ Wallet,
+ Offer,
+ Badge,
+ ConfirmReserveRequest,
+ CreateReserveRequest
+} from "./wallet";
import {deleteDb, exportDb, openTalerDb} from "./db";
import {BrowserHttpLib} from "./http";
import {Checkable} from "./checkable";
@@ -230,16 +236,9 @@ class ChromeNotifier implements Notifier {
}
}
-function executePayment(contractHash: string, payUrl: string, offerUrl: string) {
-}
-
-function offerContractFromUrl(contractUrl: string) {
-
-}
-
-
-function handleHttpPayment(headerList: chrome.webRequest.HttpHeader[], url) {
+function handleHttpPayment(headerList: chrome.webRequest.HttpHeader[],
+ url): any {
const headers = {};
for (let kv of headerList) {
headers[kv.name.toLowerCase()] = kv.value;
@@ -249,8 +248,10 @@ function handleHttpPayment(headerList: chrome.webRequest.HttpHeader[], url) {
if (contractUrl !== undefined) {
// The web shop is proposing a contract, we need to fetch it
// and show it to the user
- offerContractFromUrl(contractUrl);
- return;
+ const walletUrl = URI(chrome.extension.getURL(
+ "pages/offer-contract-from.html"));
+ walletUrl.query({contractUrl});
+ return {redirectUrl: walletUrl.href()};
}
const contractHash = headers["x-taler-contract-hash"];
@@ -264,14 +265,15 @@ function handleHttpPayment(headerList: chrome.webRequest.HttpHeader[], url) {
// Offer URL is optional
const offerUrl = headers["x-taler-offer-url"];
- executePayment(contractHash, payUrl, offerUrl);
- return;
+ const walletUrl = URI(chrome.extension.getURL(
+ "pages/execute-payment.html"));
+ walletUrl.query({contractHash, offerUrl, payUrl});
+ return {redirectUrl: walletUrl.href()};
}
// looks like it's not a taler request, it might be
// for a different payment system (or the shop is buggy)
console.log("ignoring non-taler 402 response");
-
}
@@ -330,8 +332,7 @@ export function wxMain() {
return;
}
return handleHttpPayment(details.responseHeaders, details.url);
- details.responseHeaders
- }, {urls: ["<all_urls>"]}, ["responseHeaders"]);
+ }, {urls: ["<all_urls>"]}, ["responseHeaders", "blocking"]);
})