From 9f009873809d5b7e8d1d95d77f009862724c577b Mon Sep 17 00:00:00 2001 From: Sebastian Date: Mon, 13 Sep 2021 15:32:06 -0300 Subject: added integration with the wallet-core to get info about the last tos approved --- .../src/cta/Withdraw.stories.tsx | 4 +- .../taler-wallet-webextension/src/cta/Withdraw.tsx | 46 +++++++++++++++++++--- packages/taler-wallet-webextension/src/wxApi.ts | 13 +++++- 3 files changed, 54 insertions(+), 9 deletions(-) (limited to 'packages/taler-wallet-webextension/src') diff --git a/packages/taler-wallet-webextension/src/cta/Withdraw.stories.tsx b/packages/taler-wallet-webextension/src/cta/Withdraw.stories.tsx index 022b92454..94fdea8fb 100644 --- a/packages/taler-wallet-webextension/src/cta/Withdraw.stories.tsx +++ b/packages/taler-wallet-webextension/src/cta/Withdraw.stories.tsx @@ -35,6 +35,8 @@ export default { }; const termsXml = ` + +
Terms Of Service @@ -234,7 +236,6 @@ const termsXml = ` any lost profits, data loss, cost of procurement of substitute goods or -* TLSv1.3 (IN), TLS Unknown, Unknown (23): services, or direct, indirect, incidental, special, punitive, compensatory, or consequential damages of any kind whatsoever resulting from: @@ -377,7 +378,6 @@ const termsXml = `
- `; export const WithdrawNewTermsXML = createExample(TestedComponent, { diff --git a/packages/taler-wallet-webextension/src/cta/Withdraw.tsx b/packages/taler-wallet-webextension/src/cta/Withdraw.tsx index c0347000d..ac25bcd15 100644 --- a/packages/taler-wallet-webextension/src/cta/Withdraw.tsx +++ b/packages/taler-wallet-webextension/src/cta/Withdraw.tsx @@ -30,7 +30,7 @@ import { LogoHeader } from '../components/LogoHeader'; import { Part } from '../components/Part'; import { ButtonDestructive, ButtonSuccess, ButtonWarning, LinkSuccess, TermsOfService, WalletAction } from '../components/styled'; import { - acceptWithdrawal, getExchangeWithdrawalInfo, getWithdrawalDetailsForUri, onUpdateNotification + acceptWithdrawal, getExchangeWithdrawalInfo, getWithdrawalDetailsForUri, onUpdateNotification, setExchangeTosAccepted } from "../wxApi"; import { h } from 'preact'; @@ -48,6 +48,7 @@ export interface ViewProps { onAccept: (b: boolean) => void; reviewing: boolean; accepted: boolean; + confirmed: boolean; terms: { value?: TermsDocument; status: TermsStatus; @@ -75,7 +76,7 @@ function amountToString(text: AmountLike) { return `${amount} ${aj.currency}` } -export function View({ details, amount, onWithdraw, terms, reviewing, onReview, onAccept, accepted }: ViewProps) { +export function View({ details, amount, onWithdraw, terms, reviewing, onReview, onAccept, accepted, confirmed }: ViewProps) { const needsReview = terms.status === 'changed' || terms.status === 'new' return ( @@ -172,7 +173,7 @@ export function View({ details, amount, onWithdraw, terms, reviewing, onReview,
{i18n.str`Confirm withdrawal`} @@ -203,6 +204,7 @@ export function WithdrawPage({ talerWithdrawUri, ...rest }: Props): JSX.Element const [updateCounter, setUpdateCounter] = useState(1); const [reviewing, setReviewing] = useState(false) const [accepted, setAccepted] = useState(false) + const [confirmed, setConfirmed] = useState(false) useEffect(() => { return onUpdateNotification(() => { @@ -231,7 +233,8 @@ export function WithdrawPage({ talerWithdrawUri, ...rest }: Props): JSX.Element if (!uriInfo || !uriInfo.defaultExchangeBaseUrl) return const res = await getExchangeWithdrawalInfo({ exchangeBaseUrl: uriInfo.defaultExchangeBaseUrl, - amount: Amounts.parseOrThrow(uriInfo.amount) + amount: Amounts.parseOrThrow(uriInfo.amount), + tosAcceptedFormat: ['text/json', 'text/xml', 'text/pdf'] }) setDetails(res) } @@ -242,10 +245,19 @@ export function WithdrawPage({ talerWithdrawUri, ...rest }: Props): JSX.Element return missing withdraw uri; } + const onAccept = async (): Promise => { + if (!details) { + throw Error("can't accept, no exchange selected"); + } + await setExchangeTosAccepted(details.exchangeDetails.exchangeBaseUrl, details.tosRequested?.tosEtag) + setAccepted(true) + } + const onWithdraw = async (): Promise => { if (!details) { throw Error("can't accept, no exchange selected"); } + setConfirmed(true) console.log("accepting exchange", details.exchangeInfo.baseUrl); const res = await acceptWithdrawal(talerWithdrawUri, details.exchangeInfo.baseUrl); console.log("accept withdrawal response", res); @@ -267,11 +279,33 @@ export function WithdrawPage({ talerWithdrawUri, ...rest }: Props): JSX.Element return Getting withdrawal details.; } + let termsContent: TermsDocument | undefined = undefined; + if (details.tosRequested) { + if (details.tosRequested.tosContentType === 'text/xml') { + try { + const document = new DOMParser().parseFromString(details.tosRequested.tosText, "text/xml") + termsContent = { type: 'xml', document } + } catch (e) { + console.log(e) + debugger; + } + } + } + + const status: TermsStatus = !termsContent ? 'notfound' : ( + !details.exchangeDetails.termsOfServiceAcceptedEtag ? 'new' : ( + details.tosRequested?.tosEtag !== details.exchangeDetails.termsOfServiceAcceptedEtag ? 'changed' : 'accepted' + )) + + return diff --git a/packages/taler-wallet-webextension/src/wxApi.ts b/packages/taler-wallet-webextension/src/wxApi.ts index acb28ffec..63774b00b 100644 --- a/packages/taler-wallet-webextension/src/wxApi.ts +++ b/packages/taler-wallet-webextension/src/wxApi.ts @@ -39,6 +39,7 @@ import { RetryTransactionRequest, SetWalletDeviceIdRequest, GetExchangeWithdrawalInfo, + AcceptExchangeTosRequest, } from "@gnu-taler/taler-util"; import { AddBackupProviderRequest, BackupProviderState, OperationFailedError, RemoveBackupProviderRequest } from "@gnu-taler/taler-wallet-core"; import { BackupInfo } from "@gnu-taler/taler-wallet-core"; @@ -251,6 +252,16 @@ export function acceptWithdrawal( }); } +export function setExchangeTosAccepted( + exchangeBaseUrl: string, + etag: string | undefined +): Promise { + return callBackend("setExchangeTosAccepted", { + exchangeBaseUrl, etag + } as AcceptExchangeTosRequest) +} + + /** * Get diagnostics information */ @@ -287,7 +298,7 @@ export function getWithdrawalDetailsForUri( /** * Get diagnostics information */ - export function getExchangeWithdrawalInfo( +export function getExchangeWithdrawalInfo( req: GetExchangeWithdrawalInfo, ): Promise { return callBackend("getExchangeWithdrawalInfo", req); -- cgit v1.2.3