diff options
author | Sebastian <sebasjm@gmail.com> | 2022-12-07 15:44:16 -0300 |
---|---|---|
committer | Sebastian <sebasjm@gmail.com> | 2022-12-07 16:08:19 -0300 |
commit | d2554bedf3984ba4eb3a52b5649daa9c7c686c39 (patch) | |
tree | 237e020c1ef78634a5a288df4420f541bf706a1b /packages/demobank-ui/src/utils.ts | |
parent | 9112655ef5b68245f934ad25d2c8b9fa19a0f7bd (diff) |
no-fix: remove 'any' and login status is taken from backend
Diffstat (limited to 'packages/demobank-ui/src/utils.ts')
-rw-r--r-- | packages/demobank-ui/src/utils.ts | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/packages/demobank-ui/src/utils.ts b/packages/demobank-ui/src/utils.ts index 23cade0e8..d74f4d129 100644 --- a/packages/demobank-ui/src/utils.ts +++ b/packages/demobank-ui/src/utils.ts @@ -1,9 +1,11 @@ +import { canonicalizeBaseUrl } from "@gnu-taler/taler-util"; + /** * Validate (the number part of) an amount. If needed, * replace comma with a dot. Returns 'false' whenever * the input is invalid, the valid amount otherwise. */ -export function validateAmount(maybeAmount: string): any { +export function validateAmount(maybeAmount: string | undefined): string | undefined { const amountRegex = "^[0-9]+(.[0-9]+)?$"; if (!maybeAmount) { console.log(`Entered amount (${maybeAmount}) mismatched <input> pattern.`); @@ -15,7 +17,7 @@ export function validateAmount(maybeAmount: string): any { const re = RegExp(amountRegex); if (!re.test(maybeAmount)) { console.log(`Not using invalid amount '${maybeAmount}'.`); - return false; + return; } } return maybeAmount; @@ -33,18 +35,19 @@ export function getIbanFromPayto(url: string): string { return iban; } +const maybeRootPath = "https://bank.demo.taler.net/demobanks/default/"; + export function getBankBackendBaseUrl(): string { const overrideUrl = localStorage.getItem("bank-base-url"); if (overrideUrl) { console.log( `using bank base URL ${overrideUrl} (override via bank-base-url localStorage)`, ); - return overrideUrl; + } else { + console.log(`using bank base URL (${maybeRootPath})`); } - const maybeRootPath = "https://bank.demo.taler.net/demobanks/default/"; - if (!maybeRootPath.endsWith("/")) return `${maybeRootPath}/`; - console.log(`using bank base URL (${maybeRootPath})`); - return maybeRootPath; + return canonicalizeBaseUrl(overrideUrl ? overrideUrl : maybeRootPath) + } export function undefinedIfEmpty<T extends object>(obj: T): T | undefined { |