forked/shlink-web-client
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink-web-client.git synced 2026-04-19 21:16:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to shlink-web-client 0.3.1

Browse Source
This commit is contained in:
Alejandro Celaya
2023-08-27 18:22:04 +02:00
parent 30318faf23
commit 1e31444c67
6 changed files with 51 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/api/services/ShlinkApiClient.ts
View File

@@ -25,13 +25,13 @@ import {
ErrorTypeV3,
} from '@shlinkio/shlink-web-component/api-contract';
import { isEmpty, isNil, reject } from 'ramda';
import type { HttpClient } from '../../common/services/HttpClient';
import type { HttpClient, RequestOptions } from '../../common/services/HttpClient';
import { replaceAuthorityFromUri } from '../../utils/helpers/uri';
import type { OptionalString } from '../../utils/utils';
type ApiVersion = 2 | 3;
type RequestOptions = {
type ShlinkRequestOptions = {
url: string;
method?: 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE';
query?: object;
@@ -145,12 +145,12 @@ export class ShlinkApiClient implements BaseShlinkApiClient {
): Promise<ShlinkDomainRedirects> =>
this.performRequest<ShlinkDomainRedirects>({ url: '/domains/redirects', method: 'PATCH', body: domainRedirects });
private readonly performRequest = async <T>(requestOptions: RequestOptions): Promise<T> =>
private readonly performRequest = async <T>(requestOptions: ShlinkRequestOptions): Promise<T> =>
this.httpClient.fetchJson<T>(...this.toFetchParams(requestOptions)).catch(
this.handleFetchError(() => this.httpClient.fetchJson<T>(...this.toFetchParams(requestOptions))),
);
private readonly performEmptyRequest = async (requestOptions: RequestOptions): Promise<void> =>
private readonly performEmptyRequest = async (requestOptions: ShlinkRequestOptions): Promise<void> =>
this.httpClient.fetchEmpty(...this.toFetchParams(requestOptions)).catch(
this.handleFetchError(() => this.httpClient.fetchEmpty(...this.toFetchParams(requestOptions))),
);
@@ -161,7 +161,7 @@ export class ShlinkApiClient implements BaseShlinkApiClient {
query = {},
body,
domain,
}: RequestOptions): [string, RequestInit] => {
}: ShlinkRequestOptions): [string, RequestOptions] => {
const normalizedQuery = stringifyQuery(rejectNilProps(query));
const stringifiedQuery = isEmpty(normalizedQuery) ? '' : `?${normalizedQuery}`;
const baseUrl = domain ? replaceAuthorityFromUri(this.baseUrl, domain) : this.baseUrl;