diff options
author | Florian Dold <florian@dold.me> | 2024-08-27 01:56:53 +0200 |
---|---|---|
committer | Florian Dold <florian@dold.me> | 2024-08-27 01:56:53 +0200 |
commit | 6f6e9a6fab4ecbf05264766e9b2661bdebad49eb (patch) | |
tree | 6e625cf6ca126628b16a062915d19c04030e1956 /packages/web-util/src | |
parent | 2785521f6eaaed711ba5705086988f30746748b7 (diff) | |
download | wallet-core-6f6e9a6fab4ecbf05264766e9b2661bdebad49eb.tar.xz |
auditor SPA: minor cleanup, base URL canonicalization
Diffstat (limited to 'packages/web-util/src')
-rw-r--r-- | packages/web-util/src/context/api.ts | 15 | ||||
-rw-r--r-- | packages/web-util/src/utils/request.ts | 19 |
2 files changed, 19 insertions, 15 deletions
diff --git a/packages/web-util/src/context/api.ts b/packages/web-util/src/context/api.ts index c1eaa37f8..89561e239 100644 --- a/packages/web-util/src/context/api.ts +++ b/packages/web-util/src/context/api.ts @@ -19,7 +19,12 @@ * @author Sebastian Javier Marchano (sebasjm) */ -import { TalerBankIntegrationHttpClient, TalerCoreBankHttpClient, TalerRevenueHttpClient, TalerWireGatewayHttpClient } from "@gnu-taler/taler-util"; +import { + TalerBankIntegrationHttpClient, + TalerCoreBankHttpClient, + TalerRevenueHttpClient, + TalerWireGatewayHttpClient, +} from "@gnu-taler/taler-util"; import { ComponentChildren, createContext, h, VNode } from "preact"; import { useContext } from "preact/hooks"; import { defaultRequestHandler } from "../utils/request.js"; @@ -29,10 +34,10 @@ interface Type { * @deprecated this show not be used */ request: typeof defaultRequestHandler; - bankCore: TalerCoreBankHttpClient, - bankIntegration: TalerBankIntegrationHttpClient, - bankWire: TalerWireGatewayHttpClient, - bankRevenue: TalerRevenueHttpClient, + bankCore: TalerCoreBankHttpClient; + bankIntegration: TalerBankIntegrationHttpClient; + bankWire: TalerWireGatewayHttpClient; + bankRevenue: TalerRevenueHttpClient; } const Context = createContext<Type>({ request: defaultRequestHandler } as any); diff --git a/packages/web-util/src/utils/request.ts b/packages/web-util/src/utils/request.ts index 944e65945..0c11c8c8a 100644 --- a/packages/web-util/src/utils/request.ts +++ b/packages/web-util/src/utils/request.ts @@ -28,8 +28,6 @@ export enum ErrorType { UNEXPECTED, } - - /** * * @param baseUrl URL where the service is located @@ -53,7 +51,9 @@ export async function defaultRequestHandler<T>( } requestHeaders["Content-Type"] = - !options.contentType || options.contentType === "json" ? "application/json" : "text/plain"; + !options.contentType || options.contentType === "json" + ? "application/json" + : "text/plain"; if (options.talerAmlOfficerSignature) { requestHeaders["Taler-AML-Officer-Signature"] = @@ -83,7 +83,7 @@ export async function defaultRequestHandler<T>( loading: false, message: `invalid URL: "${baseUrl}${endpoint}"`, }; - throw new RequestError(error) + throw new RequestError(error); } Object.entries(requestParams).forEach(([key, value]) => { @@ -114,7 +114,7 @@ export async function defaultRequestHandler<T>( loading: false, message: `unsupported request body type: "${typeof requestBody}"`, }; - throw new RequestError(error) + throw new RequestError(error); } } @@ -159,7 +159,7 @@ export async function defaultRequestHandler<T>( type: ErrorType.UNEXPECTED, exception: ex, loading: false, - message: (ex instanceof Error ? ex.message : ""), + message: ex instanceof Error ? ex.message : "", }; throw new RequestError(error); } @@ -470,9 +470,8 @@ export function buildRequestFailed<ErrorDetail>( */ function validateURL(baseUrl: string, endpoint: string): URL | undefined { try { - return new URL(`${baseUrl}${endpoint}`) + return new URL(`${baseUrl}${endpoint}`); } catch (ex) { - return undefined + return undefined; } - -}
\ No newline at end of file +} |