diff options
Diffstat (limited to 'packages/bank-ui/src/Routing.tsx')
-rw-r--r-- | packages/bank-ui/src/Routing.tsx | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/packages/bank-ui/src/Routing.tsx b/packages/bank-ui/src/Routing.tsx index 380b267a2..0e4a264a8 100644 --- a/packages/bank-ui/src/Routing.tsx +++ b/packages/bank-ui/src/Routing.tsx @@ -31,7 +31,7 @@ import { HttpStatusCode, TranslatedString, assertUnreachable, - createRFC8959AccessTokenEncoded + createRFC8959AccessTokenEncoded, } from "@gnu-taler/taler-util"; import { useEffect } from "preact/hooks"; import { useSessionState } from "./hooks/session.js"; @@ -108,10 +108,6 @@ function PublicRounting({ } }, [location]); - if (location === undefined) { - return <Fragment />; - } - async function doAutomaticLogin(username: string, password: string) { await handleError(async () => { const resp = await lib @@ -122,14 +118,17 @@ function PublicRounting({ refreshable: true, }); if (resp.type === "ok") { - onLoggedUser(username, createRFC8959AccessTokenEncoded(resp.body.access_token)); + onLoggedUser( + username, + createRFC8959AccessTokenEncoded(resp.body.access_token), + ); } else { switch (resp.case) { case HttpStatusCode.Unauthorized: return notify({ type: "error", title: i18n.str`Wrong credentials for "${username}"`, - description: resp.detail.hint as TranslatedString, + description: resp.detail?.hint as TranslatedString , debug: resp.detail, when: AbsoluteTime.now(), }); @@ -137,7 +136,7 @@ function PublicRounting({ return notify({ type: "error", title: i18n.str`Account not found`, - description: resp.detail.hint as TranslatedString, + description: resp.detail?.hint as TranslatedString , debug: resp.detail, when: AbsoluteTime.now(), }); @@ -149,6 +148,7 @@ function PublicRounting({ } switch (location.name) { + case undefined: case "login": { return ( <Fragment> @@ -167,7 +167,7 @@ function PublicRounting({ <WithdrawalOperationPage operationId={location.values.wopid} routeWithdrawalDetails={publicPages.operationDetails} - purpose="after-confirmation" + origin="from-wallet-ui" onOperationAborted={() => navigateTo(publicPages.login.url({}))} routeClose={publicPages.login} onAuthorizationRequired={() => @@ -278,17 +278,13 @@ function PrivateRouting({ } }, [location]); - if (location === undefined) { - return <Fragment />; - } - switch (location.name) { case "operationDetails": { return ( <WithdrawalOperationPage operationId={location.values.wopid} routeWithdrawalDetails={privatePages.operationDetails} - purpose="after-confirmation" + origin="from-wallet-ui" onOperationAborted={() => navigateTo(privatePages.home.url({}))} routeClose={privatePages.home} onAuthorizationRequired={() => @@ -302,7 +298,7 @@ function PrivateRouting({ <WithdrawalOperationPage operationId={location.values.wopid} routeWithdrawalDetails={privatePages.operationDetails} - purpose="after-creation" + origin="from-bank-ui" onOperationAborted={() => navigateTo(privatePages.home.url({}))} routeClose={privatePages.home} onAuthorizationRequired={() => @@ -395,9 +391,7 @@ function PrivateRouting({ routeMyAccountDetails={privatePages.myAccountDetails} routeMyAccountPassword={privatePages.myAccountPassword} routeConversionConfig={privatePages.conversionConfig} - onCashout={() => - navigateTo(privatePages.home.url({})) - } + onCashout={() => navigateTo(privatePages.home.url({}))} onAuthorizationRequired={() => navigateTo(privatePages.solveSecondFactor.url({})) } @@ -465,9 +459,7 @@ function PrivateRouting({ routeMyAccountDetails={privatePages.myAccountDetails} routeMyAccountPassword={privatePages.myAccountPassword} routeConversionConfig={privatePages.conversionConfig} - onCashout={() => - navigateTo(privatePages.home.url({})) - } + onCashout={() => navigateTo(privatePages.home.url({}))} onAuthorizationRequired={() => navigateTo(privatePages.solveSecondFactor.url({})) } @@ -475,6 +467,7 @@ function PrivateRouting({ /> ); } + case undefined: case "home": { if (isAdmin) { return ( |