From 2a417881bb5c67cf889d54932025badf5a85a9e0 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Thu, 20 Jan 2022 13:13:53 -0300 Subject: fix permission api, grouping all cta into same path --- packages/taler-wallet-webextension/src/wxBackend.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'packages/taler-wallet-webextension/src/wxBackend.ts') diff --git a/packages/taler-wallet-webextension/src/wxBackend.ts b/packages/taler-wallet-webextension/src/wxBackend.ts index 412f33f12..3feb232d6 100644 --- a/packages/taler-wallet-webextension/src/wxBackend.ts +++ b/packages/taler-wallet-webextension/src/wxBackend.ts @@ -40,7 +40,7 @@ import { import { BrowserCryptoWorkerFactory } from "./browserCryptoWorkerFactory"; import { BrowserHttpLib } from "./browserHttpLib"; import { getPermissionsApi, isFirefox } from "./compat"; -import { extendedPermissions } from "./permissions"; +import { getReadRequestPermissions } from "./permissions"; import { SynchronousCryptoWorkerFactory } from "./serviceWorkerCryptoWorkerFactory.js"; import { ServiceWorkerHttpLib } from "./serviceWorkerHttpLib"; @@ -128,7 +128,7 @@ async function dispatch( } case "wxGetExtendedPermissions": { const res = await new Promise((resolve, reject) => { - getPermissionsApi().contains(extendedPermissions, (result: boolean) => { + getPermissionsApi().contains(getReadRequestPermissions(), (result: boolean) => { resolve(result); }); }); @@ -143,7 +143,7 @@ async function dispatch( r = wrapResponse({ newValue: true }); } else { await new Promise((resolve, reject) => { - getPermissionsApi().remove(extendedPermissions, (rem) => { + getPermissionsApi().remove(getReadRequestPermissions(), (rem) => { console.log("permissions removed:", rem); resolve(); }); @@ -339,7 +339,7 @@ function headerListener( switch (uriType) { case TalerUriType.TalerWithdraw: return makeSyncWalletRedirect( - "/static/wallet.html#/withdraw", + "/static/wallet.html#/cta/withdraw", details.tabId, details.url, { @@ -348,7 +348,7 @@ function headerListener( ); case TalerUriType.TalerPay: return makeSyncWalletRedirect( - "/static/wallet.html#/pay", + "/static/wallet.html#/cta/pay", details.tabId, details.url, { @@ -357,7 +357,7 @@ function headerListener( ); case TalerUriType.TalerTip: return makeSyncWalletRedirect( - "/static/wallet.html#/tip", + "/static/wallet.html#/cta/tip", details.tabId, details.url, { @@ -366,7 +366,7 @@ function headerListener( ); case TalerUriType.TalerRefund: return makeSyncWalletRedirect( - "/static/wallet.html#/refund", + "/static/wallet.html#/cta/refund", details.tabId, details.url, { @@ -402,7 +402,7 @@ function setupHeaderListener(): void { } console.log("setting up header listener"); // Handlers for catching HTTP requests - getPermissionsApi().contains(extendedPermissions, (result: boolean) => { + getPermissionsApi().contains(getReadRequestPermissions(), (result: boolean) => { if ( "webRequest" in chrome && "onHeadersReceived" in chrome.webRequest && -- cgit v1.2.3