[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-wallet-webex] branch master updated: support headers
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-wallet-webex] branch master updated: support headers without 'X-' prefix |
Date: |
Fri, 23 Aug 2019 18:50:21 +0200 |
This is an automated email from the git hooks/post-receive script.
dold pushed a commit to branch master
in repository wallet-webex.
The following commit(s) were added to refs/heads/master by this push:
new 87fdafb1 support headers without 'X-' prefix
87fdafb1 is described below
commit 87fdafb1a521080b4c6014ad0df17c2ad6934843
Author: Florian Dold <address@hidden>
AuthorDate: Fri Aug 23 18:50:14 2019 +0200
support headers without 'X-' prefix
---
src/webex/wxBackend.ts | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/webex/wxBackend.ts b/src/webex/wxBackend.ts
index e7ce39ec..b9c0db87 100644
--- a/src/webex/wxBackend.ts
+++ b/src/webex/wxBackend.ts
@@ -526,12 +526,12 @@ function handleHttpPayment(headerList:
chrome.webRequest.HttpHeader[], url: stri
}
const fields = {
- contract_url: headers["x-taler-contract-url"],
- offer_url: headers["x-taler-offer-url"],
- refund_url: headers["x-taler-refund-url"],
- resource_url: headers["x-taler-resource-url"],
- session_id: headers["x-taler-session-id"],
- tip: headers["x-taler-tip"],
+ contract_url: headers["x-taler-contract-url"] ||
headers["taler-contract-url"],
+ offer_url: headers["x-taler-offer-url"] || headers["taler-offer-url"],
+ refund_url: headers["x-taler-refund-url"] || headers["taler-refund-url"],
+ resource_url: headers["x-taler-resource-url"] ||
headers["taler-resource-url"],
+ session_id: headers["x-taler-session-id"] || headers["taler-session-id"],
+ tip: headers["x-taler-tip"] || headers["taler-tip"],
};
const talerHeaderFound = Object.keys(fields).filter((x: any) => (fields as
any)[x]).length !== 0;
@@ -598,7 +598,7 @@ function handleBankRequest(wallet: Wallet, headerList:
chrome.webRequest.HttpHea
}
}
- const operation = headers["x-taler-operation"];
+ const operation = headers["x-taler-operation"] || headers["taler-operation"];
if (!operation) {
// Not a taler related request.
@@ -617,12 +617,12 @@ function handleBankRequest(wallet: Wallet, headerList:
chrome.webRequest.HttpHea
}
if (operation === "create-reserve") {
- const amount = headers["x-taler-amount"];
+ const amount = headers["x-taler-amount"] || headers["taler-amount"];
if (!amount) {
console.log("202 not understood (X-Taler-Amount missing)");
return;
}
- const callbackUrl = headers["x-taler-callback-url"];
+ const callbackUrl = headers["x-taler-callback-url"] ||
headers["taler-callback-url"];
if (!callbackUrl) {
console.log("202 not understood (X-Taler-Callback-Url missing)");
return;
@@ -639,7 +639,7 @@ function handleBankRequest(wallet: Wallet, headerList:
chrome.webRequest.HttpHea
chrome.tabs.update(tabId, {url: errRedirectUrl});
return;
}
- const wtTypes = headers["x-taler-wt-types"];
+ const wtTypes = headers["x-taler-wt-types"] || headers["taler-wt-types"];
if (!wtTypes) {
console.log("202 not understood (X-Taler-Wt-Types missing)");
return;
@@ -648,8 +648,8 @@ function handleBankRequest(wallet: Wallet, headerList:
chrome.webRequest.HttpHea
amount,
bank_url: url,
callback_url: new URI(callbackUrl) .absoluteTo(url),
- sender_wire: headers["x-taler-sender-wire"],
- suggested_exchange_url: headers["x-taler-suggested-exchange"],
+ sender_wire: headers["x-taler-sender-wire"] ||
headers["taler-sender-wire"],
+ suggested_exchange_url: headers["x-taler-suggested-exchange"] ||
headers["taler-suggested-exchange"],
wt_types: wtTypes,
};
const uri = new
URI(chrome.extension.getURL("/src/webex/pages/confirm-create-reserve.html"));
@@ -660,7 +660,7 @@ function handleBankRequest(wallet: Wallet, headerList:
chrome.webRequest.HttpHea
return;
}
- console.log("Ignoring unknown X-Taler-Operation:", operation);
+ console.log("Ignoring unknown (X-)Taler-Operation:", operation);
}
--
To stop receiving notification emails like this one, please contact
address@hidden.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [taler-wallet-webex] branch master updated: support headers without 'X-' prefix,
gnunet <=