fix: cta header, fix: do not reset ToS ETAG when getting the exchange ToS
This commit is contained in:
parent
2a417881bb
commit
0aa26448d4
@ -14,11 +14,7 @@
|
||||
GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
|
||||
*/
|
||||
|
||||
export const getReadRequestPermissions = () =>
|
||||
chrome.runtime.getManifest().manifest_version === 3 ? ({
|
||||
permissions: ["webRequest"],
|
||||
origins: ["http://*/*", "https://*/*"],
|
||||
}) : ({
|
||||
permissions: ["webRequest", "webRequestBlocking"],
|
||||
origins: ["http://*/*", "https://*/*"],
|
||||
});
|
||||
export const getReadRequestPermissions = () => ({
|
||||
permissions: ["webRequest"],
|
||||
origins: ["http://*/*", "https://*/*"],
|
||||
})
|
@ -22,7 +22,7 @@
|
||||
|
||||
import { setupI18n } from "@gnu-taler/taler-util";
|
||||
import { createHashHistory } from "history";
|
||||
import { h, render, VNode } from "preact";
|
||||
import { Fragment, h, render, VNode } from "preact";
|
||||
import Router, { route, Route } from "preact-router";
|
||||
import Match from "preact-router/match";
|
||||
import { useEffect, useState } from "preact/hooks";
|
||||
@ -86,14 +86,19 @@ function Application(): VNode {
|
||||
<DevContextProvider>
|
||||
{({ devMode }: { devMode: boolean }) => (
|
||||
<IoCProviderForRuntime>
|
||||
<LogoHeader />
|
||||
{/* <Match/> won't work in the first render if <Router /> is not called first */}
|
||||
{/* https://github.com/preactjs/preact-router/issues/415 */}
|
||||
<Router history={hash_history} />
|
||||
<Match>
|
||||
{({ path }: { path: string }) => (
|
||||
<NavBar devMode={devMode} path={path} />
|
||||
)}
|
||||
{({ path }: { path: string }) => {
|
||||
if (path && path.startsWith("/cta")) return;
|
||||
return (
|
||||
<Fragment>
|
||||
<LogoHeader />
|
||||
<NavBar devMode={devMode} path={path} />
|
||||
</Fragment>
|
||||
);
|
||||
}}
|
||||
</Match>
|
||||
<WalletBox>
|
||||
{globalNotification && (
|
||||
|
@ -396,10 +396,10 @@ function headerListener(
|
||||
}
|
||||
|
||||
function setupHeaderListener(): void {
|
||||
if (chrome.runtime.getManifest().manifest_version === 3) {
|
||||
console.error("cannot block request on manfest v3")
|
||||
return
|
||||
}
|
||||
// if (chrome.runtime.getManifest().manifest_version === 3) {
|
||||
// console.error("cannot block request on manfest v3")
|
||||
// return
|
||||
// }
|
||||
console.log("setting up header listener");
|
||||
// Handlers for catching HTTP requests
|
||||
getPermissionsApi().contains(getReadRequestPermissions(), (result: boolean) => {
|
||||
@ -415,7 +415,7 @@ function setupHeaderListener(): void {
|
||||
chrome.webRequest.onHeadersReceived.addListener(
|
||||
headerListener,
|
||||
{ urls: ["<all_urls>"] },
|
||||
["responseHeaders", "blocking"],
|
||||
["responseHeaders"]
|
||||
);
|
||||
}
|
||||
if ("webRequest" in chrome) {
|
||||
|
Loading…
Reference in New Issue
Block a user