From 984cbb7ab79b50eab38bb6a05ab56ccc278ac835 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 15 Mar 2022 00:24:39 -0300 Subject: save tos etag after forced refresh --- packages/taler-util/src/walletTypes.ts | 4 +- packages/taler-wallet-cli/src/harness/harness.ts | 18 ++++---- .../taler-wallet-core/src/operations/exchanges.ts | 54 +++++++++------------- .../src/cta/TermsOfServiceSection.tsx | 11 +++-- .../taler-wallet-webextension/src/cta/Withdraw.tsx | 9 ++-- .../src/popup/DeveloperPage.tsx | 9 +++- .../taler-wallet-webextension/src/wxBackend.ts | 3 -- 7 files changed, 53 insertions(+), 55 deletions(-) (limited to 'packages') diff --git a/packages/taler-util/src/walletTypes.ts b/packages/taler-util/src/walletTypes.ts index 444fac154..1c2037977 100644 --- a/packages/taler-util/src/walletTypes.ts +++ b/packages/taler-util/src/walletTypes.ts @@ -731,14 +731,14 @@ export const codecForGetWithdrawalDetailsForAmountRequest = export interface AcceptExchangeTosRequest { exchangeBaseUrl: string; - etag: string; + etag: string | undefined; } export const codecForAcceptExchangeTosRequest = (): Codec => buildCodecForObject() .property("exchangeBaseUrl", codecForString()) - .property("etag", codecForString()) + .property("etag", codecOptional(codecForString())) .build("AcceptExchangeTosRequest"); export interface ApplyRefundRequest { diff --git a/packages/taler-wallet-cli/src/harness/harness.ts b/packages/taler-wallet-cli/src/harness/harness.ts index 63bb17fcc..1500d7743 100644 --- a/packages/taler-wallet-cli/src/harness/harness.ts +++ b/packages/taler-wallet-cli/src/harness/harness.ts @@ -478,7 +478,7 @@ class BankServiceBase { protected globalTestState: GlobalTestState, protected bankConfig: BankConfig, protected configFile: string, - ) {} + ) { } } /** @@ -920,7 +920,7 @@ export class FakeBankService { private globalTestState: GlobalTestState, private bankConfig: FakeBankConfig, private configFile: string, - ) {} + ) { } async start(): Promise { this.proc = this.globalTestState.spawnService( @@ -1175,7 +1175,7 @@ export class ExchangeService implements ExchangeServiceInterface { private exchangeConfig: ExchangeConfig, private configFilename: string, private keyPair: EddsaKeyPair, - ) {} + ) { } get name() { return this.exchangeConfig.name; @@ -1276,7 +1276,7 @@ export class ExchangeService implements ExchangeServiceInterface { accTargetType, `${this.exchangeConfig.currency}:0.01`, `${this.exchangeConfig.currency}:0.01`, - `${this.exchangeConfig.currency}:0.01`, + // `${this.exchangeConfig.currency}:0.01`, "upload", ], ); @@ -1398,7 +1398,7 @@ export class MerchantApiClient { constructor( private baseUrl: string, public readonly auth: MerchantAuthConfiguration, - ) {} + ) { } async changeAuth(auth: MerchantAuthConfiguration): Promise { const url = new URL("private/auth", this.baseUrl); @@ -1591,7 +1591,7 @@ export class MerchantService implements MerchantServiceInterface { private globalState: GlobalTestState, private merchantConfig: MerchantConfig, private configFilename: string, - ) {} + ) { } private currentTimetravel: Duration | undefined; @@ -1888,10 +1888,8 @@ export class WalletCli { const resp = await sh( self.globalTestState, `wallet-${self.name}`, - `taler-wallet-cli ${ - self.timetravelArg ?? "" - } --no-throttle -LTRACE --wallet-db '${ - self.dbfile + `taler-wallet-cli ${self.timetravelArg ?? "" + } --no-throttle -LTRACE --wallet-db '${self.dbfile }' api '${op}' ${shellWrap(JSON.stringify(payload))}`, ); console.log("--- wallet core response ---"); diff --git a/packages/taler-wallet-core/src/operations/exchanges.ts b/packages/taler-wallet-core/src/operations/exchanges.ts index 2006b792f..536d4e3bf 100644 --- a/packages/taler-wallet-core/src/operations/exchanges.ts +++ b/packages/taler-wallet-core/src/operations/exchanges.ts @@ -363,13 +363,20 @@ async function provideExchangeRecord( ws: InternalWalletState, baseUrl: string, now: Timestamp, -): Promise { +): Promise<{ + exchange: ExchangeRecord; + exchangeDetails: ExchangeDetailsRecord | undefined; +}> { + return await ws.db - .mktx((x) => ({ exchanges: x.exchanges })) + .mktx((x) => ({ + exchanges: x.exchanges, + exchangeDetails: x.exchangeDetails, + })) .runReadWrite(async (tx) => { - let r = await tx.exchanges.get(baseUrl); - if (!r) { - r = { + let exchange = await tx.exchanges.get(baseUrl); + if (!exchange) { + const r = { permanent: true, baseUrl: baseUrl, retryInfo: initRetryInfo(), @@ -379,8 +386,10 @@ async function provideExchangeRecord( nextRefreshCheck: now, }; await tx.exchanges.put(r); + exchange = r; } - return r; + const exchangeDetails = await getExchangeDetails(tx, baseUrl); + return { exchange, exchangeDetails }; }); } @@ -519,33 +528,15 @@ async function updateExchangeFromUrlImpl( exchange: ExchangeRecord; exchangeDetails: ExchangeDetailsRecord; }> { - logger.trace(`updating exchange info for ${baseUrl}`); + logger.info(`updating exchange info for ${baseUrl}, forced: ${forceNow}`); const now = getTimestampNow(); baseUrl = canonicalizeBaseUrl(baseUrl); - const r = await provideExchangeRecord(ws, baseUrl, now); - - if (!forceNow && r && !isTimestampExpired(r.nextUpdate)) { - const res = await ws.db - .mktx((x) => ({ - exchanges: x.exchanges, - exchangeDetails: x.exchangeDetails, - })) - .runReadOnly(async (tx) => { - const exchange = await tx.exchanges.get(baseUrl); - if (!exchange) { - return; - } - const exchangeDetails = await getExchangeDetails(tx, baseUrl); - if (!exchangeDetails) { - return; - } - return { exchange, exchangeDetails }; - }); - if (res) { - logger.info("using existing exchange info"); - return res; - } + const { exchange, exchangeDetails } = await provideExchangeRecord(ws, baseUrl, now); + + if (!forceNow && exchangeDetails !== undefined && !isTimestampExpired(exchange.nextUpdate)) { + logger.info("using existing exchange info"); + return { exchange, exchangeDetails }; } logger.info("updating exchange /keys info"); @@ -584,6 +575,7 @@ async function updateExchangeFromUrlImpl( timeout, acceptedFormat, ); + const tosHasBeenAccepted = exchangeDetails?.termsOfServiceAcceptedEtag === tosDownload.tosEtag let recoupGroupId: string | undefined; @@ -619,7 +611,7 @@ async function updateExchangeFromUrlImpl( exchangeBaseUrl: r.baseUrl, wireInfo, termsOfServiceText: tosDownload.tosText, - termsOfServiceAcceptedEtag: undefined, + termsOfServiceAcceptedEtag: tosHasBeenAccepted ? tosDownload.tosEtag : undefined, termsOfServiceContentType: tosDownload.tosContentType, termsOfServiceLastEtag: tosDownload.tosEtag, termsOfServiceAcceptedTimestamp: getTimestampNow(), diff --git a/packages/taler-wallet-webextension/src/cta/TermsOfServiceSection.tsx b/packages/taler-wallet-webextension/src/cta/TermsOfServiceSection.tsx index cafc43c6f..2073ef775 100644 --- a/packages/taler-wallet-webextension/src/cta/TermsOfServiceSection.tsx +++ b/packages/taler-wallet-webextension/src/cta/TermsOfServiceSection.tsx @@ -27,9 +27,10 @@ export function TermsOfServiceSection({ onReview, }: Props): VNode { const { i18n } = useTranslationContext(); + const ableToReviewTermsOfService = onReview !== undefined; if (!reviewing) { if (!reviewed) { - if (!onReview) { + if (!ableToReviewTermsOfService) { return ( {terms.status === "notfound" && ( @@ -78,7 +79,7 @@ export function TermsOfServiceSection({ } return ( - {onReview && ( + {ableToReviewTermsOfService && (
onReview(true)}> Show terms of service @@ -96,7 +97,7 @@ export function TermsOfServiceSection({ } onToggle={() => { onAccept(!reviewed); - if (onReview) onReview(false); + if (ableToReviewTermsOfService) onReview(false); }} />
@@ -136,7 +137,7 @@ export function TermsOfServiceSection({ )} )} - {reviewed && onReview && ( + {reviewed && ableToReviewTermsOfService && (
onReview(false)}> Hide terms of service @@ -155,7 +156,7 @@ export function TermsOfServiceSection({ } onToggle={() => { onAccept(!reviewed); - if (onReview) onReview(false); + if (ableToReviewTermsOfService) onReview(false); }} />
diff --git a/packages/taler-wallet-webextension/src/cta/Withdraw.tsx b/packages/taler-wallet-webextension/src/cta/Withdraw.tsx index 8535c67eb..f19da3960 100644 --- a/packages/taler-wallet-webextension/src/cta/Withdraw.tsx +++ b/packages/taler-wallet-webextension/src/cta/Withdraw.tsx @@ -293,11 +293,14 @@ export function WithdrawPageWithParsedURI({ const details = detailsHook.response; - const onAccept = async (): Promise => { + const onAccept = async (accepted: boolean): Promise => { if (!exchange) return; try { - await wxApi.setExchangeTosAccepted(exchange, details.tos.version); - setReviewed(true); + await wxApi.setExchangeTosAccepted( + exchange, + accepted ? details.tos.version : undefined, + ); + setReviewed(accepted); } catch (e) { if (e instanceof Error) { //FIXME: uncomment this and display error diff --git a/packages/taler-wallet-webextension/src/popup/DeveloperPage.tsx b/packages/taler-wallet-webextension/src/popup/DeveloperPage.tsx index 3144a9ce3..738ece2f1 100644 --- a/packages/taler-wallet-webextension/src/popup/DeveloperPage.tsx +++ b/packages/taler-wallet-webextension/src/popup/DeveloperPage.tsx @@ -20,6 +20,7 @@ import { CoinDumpJson, ExchangeListItem, NotificationType, + Timestamp, Translate, } from "@gnu-taler/taler-util"; import { PendingTaskInfo } from "@gnu-taler/taler-wallet-core"; @@ -246,7 +247,13 @@ export function View({ {operations.reverse().map((o) => { return ( -
{o.type}
+
+ {o.type}{" "} + 
{JSON.stringify(o, undefined, 2)}
diff --git a/packages/taler-wallet-webextension/src/wxBackend.ts b/packages/taler-wallet-webextension/src/wxBackend.ts index 52187936b..66debf266 100644 --- a/packages/taler-wallet-webextension/src/wxBackend.ts +++ b/packages/taler-wallet-webextension/src/wxBackend.ts @@ -319,7 +319,6 @@ try { function headerListener( details: chrome.webRequest.WebResponseHeadersDetails, ): chrome.webRequest.BlockingResponse | undefined { - console.log("header listener"); if (chrome.runtime.lastError) { console.error(chrome.runtime.lastError); return; @@ -329,13 +328,11 @@ function headerListener( console.warn("wallet not available while handling header"); return; } - console.log("in header listener"); if ( details.statusCode === 402 || details.statusCode === 202 || details.statusCode === 200 ) { - console.log(`got 402/202 from ${details.url}`); for (const header of details.responseHeaders || []) { if (header.name.toLowerCase() === "taler") { const talerUri = header.value || ""; -- cgit v1.2.3