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

always decode 'Taler-' headers

Browse Source
This commit is contained in:
Florian Dold 2019-08-24 19:31:24 +02:00
parent d454f7547d
commit 3247a45d97
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B
1 changed files with 195 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

250
src/webex/wxBackend.ts
View File

@ -20,7 +20,6 @@
* logic as possible. * logic as possible.
*/ */
/** /**
* Imports. * Imports.
*/ */
@ -36,20 +35,14 @@ import {
ReturnCoinsRequest, ReturnCoinsRequest,
} from "../walletTypes"; } from "../walletTypes";
import { import { Wallet } from "../wallet";
Wallet,
} from "../wallet";
import { isFirefox } from "./compat"; import { isFirefox } from "./compat";
import { import { PurchaseRecord, WALLET_DB_VERSION } from "../dbTypes";
PurchaseRecord,
WALLET_DB_VERSION,
} from "../dbTypes";
import { openTalerDb, exportDb, importDb, deleteDb } from "../db"; import { openTalerDb, exportDb, importDb, deleteDb } from "../db";
import { ChromeBadge } from "./chromeBadge"; import { ChromeBadge } from "./chromeBadge";
import { MessageType } from "./messages"; import { MessageType } from "./messages";
import * as wxApi from "./wxApi"; import * as wxApi from "./wxApi";
@ -62,8 +55,11 @@ import { BrowserCryptoWorkerFactory } from "../crypto/cryptoApi";
const NeedsWallet = Symbol("NeedsWallet"); const NeedsWallet = Symbol("NeedsWallet");
function handleMessage(sender: MessageSender, function handleMessage(
type: MessageType, detail: any): any { sender: MessageSender,
type: MessageType,
detail: any,
): any {
function assertNotFound(t: never): never { function assertNotFound(t: never): never {
console.error(`Request type ${t as string} unknown`); console.error(`Request type ${t as string} unknown`);
console.error(`Request detail was ${detail}`); console.error(`Request detail was ${detail}`);
@ -133,7 +129,10 @@ function handleMessage(sender: MessageSender,
if (typeof detail.contractTermsHash !== "string") { if (typeof detail.contractTermsHash !== "string") {
throw Error("contractTermsHash must be a string"); throw Error("contractTermsHash must be a string");
} }
return needsWallet().submitPay(detail.contractTermsHash, detail.sessionId); return needsWallet().submitPay(
detail.contractTermsHash,
detail.sessionId,
);
} }
case "check-pay": { case "check-pay": {
if (typeof detail.proposalId !== "number") { if (typeof detail.proposalId !== "number") {
@ -172,7 +171,9 @@ function handleMessage(sender: MessageSender,
if (!detail.contract) { if (!detail.contract) {
return Promise.resolve({ error: "contract missing" }); return Promise.resolve({ error: "contract missing" });
} }
return needsWallet().hashContract(detail.contract).then((hash) => { return needsWallet()
.hashContract(detail.contract)
.then(hash => {
return hash; return hash;
}); });
} }
@ -269,8 +270,10 @@ function handleMessage(sender: MessageSender,
return resp; return resp;
} }
case "log-and-display-error": case "log-and-display-error":
logging.storeReport(detail).then((reportUid) => { logging.storeReport(detail).then(reportUid => {
const url = chrome.extension.getURL(`/src/webex/pages/error.html?reportUid=${reportUid}`); const url = chrome.extension.getURL(
`/src/webex/pages/error.html?reportUid=${reportUid}`,
);
if (detail.sameTab && sender && sender.tab && sender.tab.id) { if (detail.sameTab && sender && sender.tab && sender.tab.id) {
chrome.tabs.update(detail.tabId, { url }); chrome.tabs.update(detail.tabId, { url });
} else { } else {
@ -343,7 +346,11 @@ function handleMessage(sender: MessageSender,
} }
} }
async function dispatch(req: any, sender: any, sendResponse: any): Promise<void> { async function dispatch(
req: any,
sender: any,
sendResponse: any,
): Promise<void> {
try { try {
const p = handleMessage(sender, req.type, req.detail); const p = handleMessage(sender, req.type, req.detail);
const r = await p; const r = await p;
@ -375,12 +382,11 @@ async function dispatch(req: any, sender: any, sendResponse: any): Promise<void>
} }
} }
class ChromeNotifier implements Notifier { class ChromeNotifier implements Notifier {
private ports: Port[] = []; private ports: Port[] = [];
constructor() { constructor() {
chrome.runtime.onConnect.addListener((port) => { chrome.runtime.onConnect.addListener(port => {
console.log("got connect!"); console.log("got connect!");
this.ports.push(port); this.ports.push(port);
port.onDisconnect.addListener(() => { port.onDisconnect.addListener(() => {
@ -401,8 +407,11 @@ class ChromeNotifier implements Notifier {
} }
} }
async function talerPay(
async function talerPay(fields: any, url: string, tabId: number): Promise<string | undefined> { fields: any,
url: string,
tabId: number,
): Promise<string | undefined> {
if (!currentWallet) { if (!currentWallet) {
console.log("can't handle payment, no wallet"); console.log("can't handle payment, no wallet");
return undefined; return undefined;
@ -422,13 +431,18 @@ async function talerPay(fields: any, url: string, tabId: number): Promise<string
if (fields.resource_url) { if (fields.resource_url) {
const p = await w.queryPaymentByFulfillmentUrl(fields.resource_url); const p = await w.queryPaymentByFulfillmentUrl(fields.resource_url);
console.log("query for resource url", fields.resource_url, "result", p); console.log("query for resource url", fields.resource_url, "result", p);
if (p && (fields.session_id === undefined || fields.session_id === p.lastSessionId)) { if (
p &&
(fields.session_id === undefined || fields.session_id === p.lastSessionId)
) {
return goToPayment(p); return goToPayment(p);
} }
} }
if (fields.contract_url) { if (fields.contract_url) {
const proposalId = await w.downloadProposal(fields.contract_url); const proposalId = await w.downloadProposal(fields.contract_url);
const uri = new URI(chrome.extension.getURL("/src/webex/pages/confirm-contract.html")); const uri = new URI(
chrome.extension.getURL("/src/webex/pages/confirm-contract.html"),
);
if (fields.session_id) { if (fields.session_id) {
uri.addSearch("sessionId", fields.session_id); uri.addSearch("sessionId", fields.session_id);
} }
@ -441,7 +455,9 @@ async function talerPay(fields: any, url: string, tabId: number): Promise<string
} }
if (fields.refund_url) { if (fields.refund_url) {
console.log("processing refund"); console.log("processing refund");
const uri = new URI(chrome.extension.getURL("/src/webex/pages/refund.html")); const uri = new URI(
chrome.extension.getURL("/src/webex/pages/refund.html"),
);
return uri.query({ refundUrl: fields.refund_url }).href(); return uri.query({ refundUrl: fields.refund_url }).href();
} }
if (fields.tip) { if (fields.tip) {
@ -451,14 +467,12 @@ async function talerPay(fields: any, url: string, tabId: number): Promise<string
return undefined; return undefined;
} }
function getTab(tabId: number): Promise<chrome.tabs.Tab> { function getTab(tabId: number): Promise<chrome.tabs.Tab> {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
chrome.tabs.get(tabId, (tab: chrome.tabs.Tab) => resolve(tab)); chrome.tabs.get(tabId, (tab: chrome.tabs.Tab) => resolve(tab));
}); });
} }
function setBadgeText(options: chrome.browserAction.BadgeTextDetails) { function setBadgeText(options: chrome.browserAction.BadgeTextDetails) {
// not supported by all browsers ... // not supported by all browsers ...
if (chrome && chrome.browserAction && chrome.browserAction.setBadgeText) { if (chrome && chrome.browserAction && chrome.browserAction.setBadgeText) {
@ -468,18 +482,20 @@ function setBadgeText(options: chrome.browserAction.BadgeTextDetails) {
} }
} }
function waitMs(timeoutMs: number): Promise<void> { function waitMs(timeoutMs: number): Promise<void> {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
chrome.extension.getBackgroundPage()!.setTimeout(() => resolve(), timeoutMs); chrome.extension
.getBackgroundPage()!
.setTimeout(() => resolve(), timeoutMs);
}); });
} }
function makeSyncWalletRedirect(
function makeSyncWalletRedirect(url: string, url: string,
tabId: number, tabId: number,
oldUrl: string, oldUrl: string,
params?: {[name: string]: string | undefined}): object { params?: { [name: string]: string | undefined },
): object {
const innerUrl = new URI(chrome.extension.getURL("/src/webex/pages/" + url)); const innerUrl = new URI(chrome.extension.getURL("/src/webex/pages/" + url));
if (params) { if (params) {
for (const key in params) { for (const key in params) {
@ -488,7 +504,9 @@ function makeSyncWalletRedirect(url: string,
} }
} }
} }
const outerUrl = new URI(chrome.extension.getURL("/src/webex/pages/redirect.html")); const outerUrl = new URI(
chrome.extension.getURL("/src/webex/pages/redirect.html"),
);
outerUrl.addSearch("url", innerUrl); outerUrl.addSearch("url", innerUrl);
if (isFirefox()) { if (isFirefox()) {
// Some platforms don't support the sync redirect (yet), so fall back to // Some platforms don't support the sync redirect (yet), so fall back to
@ -505,14 +523,17 @@ function makeSyncWalletRedirect(url: string,
return { redirectUrl: outerUrl.href() }; return { redirectUrl: outerUrl.href() };
} }
/** /**
* Handle a HTTP response that has the "402 Payment Required" status. * Handle a HTTP response that has the "402 Payment Required" status.
* In this callback we don't have access to the body, and must communicate via * In this callback we don't have access to the body, and must communicate via
* shared state with the content script that will later be run later * shared state with the content script that will later be run later
* in this tab. * in this tab.
*/ */
function handleHttpPayment(headerList: chrome.webRequest.HttpHeader[], url: string, tabId: number): any { function handleHttpPayment(
headerList: chrome.webRequest.HttpHeader[],
url: string,
tabId: number,
): any {
if (!currentWallet) { if (!currentWallet) {
console.log("can't handle payment, no wallet"); console.log("can't handle payment, no wallet");
return; return;
@ -525,16 +546,30 @@ function handleHttpPayment(headerList: chrome.webRequest.HttpHeader[], url: stri
} }
} }
const decodeIfDefined = (url?: string) =>
url ? decodeURIComponent(url) : undefined;
const fields = { const fields = {
contract_url: headers["x-taler-contract-url"] || headers["taler-contract-url"], contract_url: decodeIfDefined(
offer_url: headers["x-taler-offer-url"] || headers["taler-offer-url"], headers["x-taler-contract-url"] || headers["taler-contract-url"],
refund_url: headers["x-taler-refund-url"] || headers["taler-refund-url"], ),
resource_url: headers["x-taler-resource-url"] || headers["taler-resource-url"], offer_url: decodeIfDefined(
session_id: headers["x-taler-session-id"] || headers["taler-session-id"], headers["x-taler-offer-url"] || headers["taler-offer-url"],
tip: headers["x-taler-tip"] || headers["taler-tip"], ),
refund_url: decodeIfDefined(
headers["x-taler-refund-url"] || headers["taler-refund-url"],
),
resource_url: decodeIfDefined(
headers["x-taler-resource-url"] || headers["taler-resource-url"],
),
session_id: decodeIfDefined(
headers["x-taler-session-id"] || headers["taler-session-id"],
),
tip: decodeIfDefined(headers["x-taler-tip"] || headers["taler-tip"]),
}; };
const talerHeaderFound = Object.keys(fields).filter((x: any) => (fields as any)[x]).length !== 0; const talerHeaderFound =
Object.keys(fields).filter((x: any) => (fields as any)[x]).length !== 0;
if (!talerHeaderFound) { if (!talerHeaderFound) {
// looks like it's not a taler request, it might be // looks like it's not a taler request, it might be
@ -548,7 +583,11 @@ function handleHttpPayment(headerList: chrome.webRequest.HttpHeader[], url: stri
// Synchronous fast path for existing payment // Synchronous fast path for existing payment
if (fields.resource_url) { if (fields.resource_url) {
const result = currentWallet.getNextUrlFromResourceUrl(fields.resource_url); const result = currentWallet.getNextUrlFromResourceUrl(fields.resource_url);
if (result && (fields.session_id === undefined || fields.session_id === result.lastSessionId)) { if (
result &&
(fields.session_id === undefined ||
fields.session_id === result.lastSessionId)
) {
return { redirectUrl: result.nextUrl }; return { redirectUrl: result.nextUrl };
} }
} }
@ -563,23 +602,29 @@ function handleHttpPayment(headerList: chrome.webRequest.HttpHeader[], url: stri
// Synchronous fast path for tip // Synchronous fast path for tip
if (fields.tip) { if (fields.tip) {
return makeSyncWalletRedirect("tip.html", tabId, url, { tip_token: fields.tip }); return makeSyncWalletRedirect("tip.html", tabId, url, {
tip_token: fields.tip,
});
} }
// Synchronous fast path for refund // Synchronous fast path for refund
if (fields.refund_url) { if (fields.refund_url) {
console.log("processing refund"); console.log("processing refund");
return makeSyncWalletRedirect("refund.html", tabId, url, { refundUrl: fields.refund_url }); return makeSyncWalletRedirect("refund.html", tabId, url, {
refundUrl: fields.refund_url,
});
} }
// We need to do some asynchronous operation, we can't directly redirect // We need to do some asynchronous operation, we can't directly redirect
talerPay(fields, url, tabId).then((nextUrl) => { talerPay(fields, url, tabId).then(nextUrl => {
if (nextUrl) { if (nextUrl) {
// We use chrome.tabs.executeScript instead of chrome.tabs.update // We use chrome.tabs.executeScript instead of chrome.tabs.update
// because the latter is buggy when it does not execute in the same // because the latter is buggy when it does not execute in the same
// (micro-?)task as the header callback. // (micro-?)task as the header callback.
chrome.tabs.executeScript({ chrome.tabs.executeScript({
code: `document.location.href = decodeURIComponent("${encodeURI(nextUrl)}");`, code: `document.location.href = decodeURIComponent("${encodeURI(
nextUrl,
)}");`,
runAt: "document_start", runAt: "document_start",
}); });
} }
@ -588,9 +633,12 @@ function handleHttpPayment(headerList: chrome.webRequest.HttpHeader[], url: stri
return; return;
} }
function handleBankRequest(
function handleBankRequest(wallet: Wallet, headerList: chrome.webRequest.HttpHeader[], wallet: Wallet,
url: string, tabId: number): any { headerList: chrome.webRequest.HttpHeader[],
url: string,
tabId: number,
): any {
const headers: { [s: string]: string } = {}; const headers: { [s: string]: string } = {};
for (const kv of headerList) { for (const kv of headerList) {
if (kv.value) { if (kv.value) {
@ -611,7 +659,9 @@ function handleBankRequest(wallet: Wallet, headerList: chrome.webRequest.HttpHea
console.log(`confirming reserve ${reservePub} via 201`); console.log(`confirming reserve ${reservePub} via 201`);
wallet.confirmReserve({ reservePub }); wallet.confirmReserve({ reservePub });
} else { } else {
console.warn("got 'X-Taler-Operation: confirm-reserve' without 'X-Taler-Reserve-Pub'"); console.warn(
"got 'X-Taler-Operation: confirm-reserve' without 'X-Taler-Reserve-Pub'",
);
} }
return; return;
} }
@ -622,7 +672,8 @@ function handleBankRequest(wallet: Wallet, headerList: chrome.webRequest.HttpHea
console.log("202 not understood (X-Taler-Amount missing)"); console.log("202 not understood (X-Taler-Amount missing)");
return; return;
} }
const callbackUrl = headers["x-taler-callback-url"] || headers["taler-callback-url"]; const callbackUrl =
headers["x-taler-callback-url"] || headers["taler-callback-url"];
if (!callbackUrl) { if (!callbackUrl) {
console.log("202 not understood (X-Taler-Callback-Url missing)"); console.log("202 not understood (X-Taler-Callback-Url missing)");
return; return;
@ -630,7 +681,9 @@ function handleBankRequest(wallet: Wallet, headerList: chrome.webRequest.HttpHea
try { try {
JSON.parse(amount); JSON.parse(amount);
} catch (e) { } catch (e) {
const errUri = new URI(chrome.extension.getURL("/src/webex/pages/error.html")); const errUri = new URI(
chrome.extension.getURL("/src/webex/pages/error.html"),
);
const p = { const p = {
message: `Can't parse amount ("${amount}"): ${e.message}`, message: `Can't parse amount ("${amount}"): ${e.message}`,
}; };
@ -648,11 +701,16 @@ function handleBankRequest(wallet: Wallet, headerList: chrome.webRequest.HttpHea
amount, amount,
bank_url: url, bank_url: url,
callback_url: new URI(callbackUrl).absoluteTo(url), callback_url: new URI(callbackUrl).absoluteTo(url),
sender_wire: headers["x-taler-sender-wire"] || headers["taler-sender-wire"], sender_wire:
suggested_exchange_url: headers["x-taler-suggested-exchange"] || headers["taler-suggested-exchange"], headers["x-taler-sender-wire"] || headers["taler-sender-wire"],
suggested_exchange_url:
headers["x-taler-suggested-exchange"] ||
headers["taler-suggested-exchange"],
wt_types: wtTypes, wt_types: wtTypes,
}; };
const uri = new URI(chrome.extension.getURL("/src/webex/pages/confirm-create-reserve.html")); const uri = new URI(
chrome.extension.getURL("/src/webex/pages/confirm-create-reserve.html"),
);
const redirectUrl = uri.query(params).href(); const redirectUrl = uri.query(params).href();
console.log("redirecting to", redirectUrl); console.log("redirecting to", redirectUrl);
// FIXME: use direct redirect when https://bugzilla.mozilla.org/show_bug.cgi?id=707624 is fixed // FIXME: use direct redirect when https://bugzilla.mozilla.org/show_bug.cgi?id=707624 is fixed
@ -663,7 +721,6 @@ function handleBankRequest(wallet: Wallet, headerList: chrome.webRequest.HttpHea
console.log("Ignoring unknown (X-)Taler-Operation:", operation); console.log("Ignoring unknown (X-)Taler-Operation:", operation);
} }
// Rate limit cache for executePayment operations, to break redirect loops // Rate limit cache for executePayment operations, to break redirect loops
let rateLimitCache: { [n: number]: number } = {}; let rateLimitCache: { [n: number]: number } = {};
@ -671,7 +728,6 @@ function clearRateLimitCache() {
rateLimitCache = {}; rateLimitCache = {};
} }
/** /**
* Currently active wallet instance. Might be unloaded and * Currently active wallet instance. Might be unloaded and
* re-instantiated when the database is reset. * re-instantiated when the database is reset.
@ -686,15 +742,12 @@ let oldDbVersion: number|undefined;
function handleUpgradeUnsupported(oldDbVersion: number, newDbVersion: number) { function handleUpgradeUnsupported(oldDbVersion: number, newDbVersion: number) {
console.log("DB migration not supported"); console.log("DB migration not supported");
chrome.tabs.create({ chrome.tabs.create({
url: chrome.extension.getURL( url: chrome.extension.getURL("/src/webex/pages/reset-required.html"),
"/src/webex/pages/reset-required.html",
),
}); });
setBadgeText({ text: "err" }); setBadgeText({ text: "err" });
chrome.browserAction.setBadgeBackgroundColor({ color: "#F00" }); chrome.browserAction.setBadgeBackgroundColor({ color: "#F00" });
} }
async function reinitWallet() { async function reinitWallet() {
if (currentWallet) { if (currentWallet) {
currentWallet.stop(); currentWallet.stop();
@ -712,31 +765,43 @@ async function reinitWallet() {
const http = new BrowserHttpLib(); const http = new BrowserHttpLib();
const notifier = new ChromeNotifier(); const notifier = new ChromeNotifier();
console.log("setting wallet"); console.log("setting wallet");
const wallet = new Wallet(db, http, badge, notifier, new BrowserCryptoWorkerFactory()); const wallet = new Wallet(
db,
http,
badge,
notifier,
new BrowserCryptoWorkerFactory(),
);
// Useful for debugging in the background page. // Useful for debugging in the background page.
(window as any).talerWallet = wallet; (window as any).talerWallet = wallet;
currentWallet = wallet; currentWallet = wallet;
} }
/** /**
* Inject a script into a tab. Gracefully logs errors * Inject a script into a tab. Gracefully logs errors
* and works around a bug where the tab's URL does not match the internal URL, * and works around a bug where the tab's URL does not match the internal URL,
* making the injection fail in a confusing way. * making the injection fail in a confusing way.
*/ */
function injectScript(tabId: number, details: chrome.tabs.InjectDetails, actualUrl: string): void { function injectScript(
tabId: number,
details: chrome.tabs.InjectDetails,
actualUrl: string,
): void {
chrome.tabs.executeScript(tabId, details, () => { chrome.tabs.executeScript(tabId, details, () => {
// Required to squelch chrome's "unchecked lastError" warning. // Required to squelch chrome's "unchecked lastError" warning.
// Sometimes chrome reports the URL of a tab as http/https but // Sometimes chrome reports the URL of a tab as http/https but
// injection fails. This can happen when a page is unloaded or // injection fails. This can happen when a page is unloaded or
// shows a "no internet" page etc. // shows a "no internet" page etc.
if (chrome.runtime.lastError) { if (chrome.runtime.lastError) {
console.warn("injection failed on page", actualUrl, chrome.runtime.lastError.message); console.warn(
"injection failed on page",
actualUrl,
chrome.runtime.lastError.message,
);
} }
}); });
} }
/** /**
* Main function to run for the WebExtension backend. * Main function to run for the WebExtension backend.
* *
@ -745,16 +810,23 @@ function injectScript(tabId: number, details: chrome.tabs.InjectDetails, actualU
export async function wxMain() { export async function wxMain() {
// Explicitly unload the extension page as soon as an update is available, // Explicitly unload the extension page as soon as an update is available,
// so the update gets installed as soon as possible. // so the update gets installed as soon as possible.
chrome.runtime.onUpdateAvailable.addListener((details) => { chrome.runtime.onUpdateAvailable.addListener(details => {
console.log("update available:", details); console.log("update available:", details);
chrome.runtime.reload(); chrome.runtime.reload();
}); });
window.onerror = (m, source, lineno, colno, error) => { window.onerror = (m, source, lineno, colno, error) => {
logging.record("error", "".concat(m as any, error as any), undefined, source || "(unknown)", lineno || 0, colno || 0); logging.record(
"error",
"".concat(m as any, error as any),
undefined,
source || "(unknown)",
lineno || 0,
colno || 0,
);
}; };
chrome.tabs.query({}, (tabs) => { chrome.tabs.query({}, tabs => {
console.log("got tabs", tabs); console.log("got tabs", tabs);
for (const tab of tabs) { for (const tab of tabs) {
if (!tab.url || !tab.id) { if (!tab.url || !tab.id) {
@ -764,8 +836,19 @@ export async function wxMain() {
if (uri.protocol() !== "http" && uri.protocol() !== "https") { if (uri.protocol() !== "http" && uri.protocol() !== "https") {
continue; continue;
} }
console.log("injecting into existing tab", tab.id, "with url", uri.href(), "protocol", uri.protocol()); console.log(
injectScript(tab.id, { file: "/dist/contentScript-bundle.js", runAt: "document_start" }, uri.href()); "injecting into existing tab",
tab.id,
"with url",
uri.href(),
"protocol",
uri.protocol(),
);
injectScript(
tab.id,
{ file: "/dist/contentScript-bundle.js", runAt: "document_start" },
uri.href(),
);
const code = ` const code = `
if (("taler" in window) || document.documentElement.getAttribute("data-taler-nojs")) { if (("taler" in window) || document.documentElement.getAttribute("data-taler-nojs")) {
document.dispatchEvent(new Event("taler-probe-result")); document.dispatchEvent(new Event("taler-probe-result"));
@ -796,7 +879,7 @@ export async function wxMain() {
const run = () => { const run = () => {
timers.shift(); timers.shift();
chrome.tabs.get(tabId, (tab) => { chrome.tabs.get(tabId, tab => {
if (chrome.runtime.lastError) { if (chrome.runtime.lastError) {
return; return;
} }
@ -838,10 +921,9 @@ export async function wxMain() {
return true; return true;
}); });
// Clear notifications both when the popop opens, // Clear notifications both when the popop opens,
// as well when it closes. // as well when it closes.
chrome.runtime.onConnect.addListener((port) => { chrome.runtime.onConnect.addListener(port => {
if (port.name === "popup") { if (port.name === "popup") {
if (currentWallet) { if (currentWallet) {
currentWallet.clearNotification(); currentWallet.clearNotification();
@ -854,22 +936,30 @@ export async function wxMain() {
} }
}); });
// Handlers for catching HTTP requests // Handlers for catching HTTP requests
chrome.webRequest.onHeadersReceived.addListener((details) => { chrome.webRequest.onHeadersReceived.addListener(
details => {
const wallet = currentWallet; const wallet = currentWallet;
if (!wallet) { if (!wallet) {
console.warn("wallet not available while handling header"); console.warn("wallet not available while handling header");
} }
if (details.statusCode === 402) { if (details.statusCode === 402) {
console.log(`got 402 from ${details.url}`); console.log(`got 402 from ${details.url}`);
return handleHttpPayment(details.responseHeaders || [], return handleHttpPayment(
details.responseHeaders || [],
details.url, details.url,
details.tabId); details.tabId,
);
} else if (details.statusCode === 202) { } else if (details.statusCode === 202) {
return handleBankRequest(wallet!, details.responseHeaders || [], return handleBankRequest(
wallet!,
details.responseHeaders || [],
details.url, details.url,
details.tabId); details.tabId,
);
} }
}, { urls: ["<all_urls>"] }, ["responseHeaders", "blocking"]); },
{ urls: ["<all_urls>"] },
["responseHeaders", "blocking"],
);
} }