Skip to content

fix: invalid requestion options #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ngocphuongnb merged 1 commit into from
Sep 12, 2025
Merged

fix: invalid requestion options #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
101 changes: 71 additions & 30 deletions src/libs/request.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
import { getErrorMessage } from './helpers';
import { RequestError } from './error';

export type RequestMethods = 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH' | 'HEAD' | 'OPTIONS' | 'CONNECT' | 'TRACE';
export type RequestMethods =
| 'GET'
| 'POST'
| 'PUT'
| 'DELETE'
| 'PATCH'
| 'HEAD'
| 'OPTIONS'
| 'CONNECT'
| 'TRACE';
export type RequestHeaders = Record<string, string>;

export interface FsRequestOptions {
Expand Down Expand Up @@ -34,10 +43,18 @@ export interface IRequest {
baseApiUrl: () => string;
getAuthToken: (() => Promise<string | undefined>) | undefined;
get<T>(url: string, options?: RequestOptions): Promise<T>;
post<T>(url: string, data?: RequestData, options?: RequestOptions): Promise<T>;
post<T>(
url: string,
data?: RequestData,
options?: RequestOptions
): Promise<T>;
put<T>(url: string, data?: RequestData, options?: RequestOptions): Promise<T>;
delete<T>(url: string, options?: RequestOptions): Promise<T>;
patch<T>(url: string, data?: RequestData, options?: RequestOptions): Promise<T>;
patch<T>(
url: string,
data?: RequestData,
options?: RequestOptions
): Promise<T>;
head<T>(url: string, options?: RequestOptions): Promise<T>;
options<T>(url: string, options?: RequestOptions): Promise<T>;
connect<T>(url: string, options?: RequestOptions): Promise<T>;
Expand All @@ -63,7 +80,10 @@ export class FsRequest {
return this._baseApiUrl;
}

async getRequestHeader(headers?: RequestHeaders, data?: any): Promise<RequestHeaders> {
async getRequestHeader(
headers?: RequestHeaders,
data?: any
): Promise<RequestHeaders> {
const authToken = (await this.getAuthToken?.()) ?? undefined;
const requestHeaders: RequestHeaders = {
'Content-Type': 'application/json;charset=utf-8',
Expand All @@ -85,8 +105,12 @@ export class FsRequest {
}

if (this.opts.authCookieName) {
const existingCookies = requestHeaders['Cookie'] ? requestHeaders['Cookie'] + '; ' : '';
requestHeaders['Cookie'] = `${existingCookies}${this.opts.authCookieName}=${authToken}`;
const existingCookies = requestHeaders['Cookie']
? requestHeaders['Cookie'] + '; '
: '';
requestHeaders[
'Cookie'
] = `${existingCookies}${this.opts.authCookieName}=${authToken}`;
return requestHeaders;
}

Expand All @@ -96,13 +120,18 @@ export class FsRequest {
return requestHeaders;
}

async createRequestInit(method: string, data?: any, headers?: RequestHeaders): Promise<RequestInit> {
async createRequestInit(
method: string,
data?: any,
options?: RequestOptions
): Promise<RequestInit> {
const headers = options?.headers ?? {};
const requestInit: RequestInit = {
method: method,
mode: 'cors',
cache: 'no-cache',
credentials: 'same-origin',
headers: await this.getRequestHeader(headers ?? {}, data),
headers: await this.getRequestHeader(headers, data),
redirect: 'follow',
referrerPolicy: 'strict-origin-when-cross-origin',
};
Expand Down Expand Up @@ -130,17 +159,17 @@ export class FsRequest {
method: RequestMethods,
url: string,
data?: any,
headers?: RequestHeaders,
options?: RequestOptions
): Promise<T> => {
const requestInit = await this.createRequestInit(method, data, headers);
const requestInit = await this.createRequestInit(method, data, options);
const response = await fetch(this.createRequestUrl(url), requestInit);

if (!response.ok) {
let msg = response.statusText ?? 'Network response was not ok';
try {
const errorResponse = await response.json();
msg = getErrorMessage(errorResponse.error, msg);
} catch (e) { }
} catch (e) {}

throw new RequestError(msg);
}
Expand All @@ -152,41 +181,53 @@ export class FsRequest {
}

return (result as { data: T }).data;
}
};

async get<T>(url: string, headers?: RequestHeaders): Promise<T> {
return await this.createRequest<T>('GET', url, null, headers);
async get<T>(url: string, options?: RequestOptions): Promise<T> {
return await this.createRequest<T>('GET', url, null, options);
}

async post<T>(url: string, data?: RequestData, headers?: RequestHeaders): Promise<T> {
return await this.createRequest<T>('POST', url, data, headers);
async post<T>(
url: string,
data?: RequestData,
options?: RequestOptions
): Promise<T> {
return await this.createRequest<T>('POST', url, data, options);
}

async put<T>(url: string, data?: RequestData, headers?: RequestHeaders): Promise<T> {
return await this.createRequest<T>('PUT', url, data, headers);
async put<T>(
url: string,
data?: RequestData,
options?: RequestOptions
): Promise<T> {
return await this.createRequest<T>('PUT', url, data, options);
}

async delete<T>(url: string, headers?: RequestHeaders): Promise<T> {
return await this.createRequest<T>('DELETE', url, null, headers);
async delete<T>(url: string, options?: RequestOptions): Promise<T> {
return await this.createRequest<T>('DELETE', url, null, options);
}

async patch<T>(url: string, data?: RequestData, headers?: RequestHeaders): Promise<T> {
return await this.createRequest<T>('PATCH', url, data, headers);
async patch<T>(
url: string,
data?: RequestData,
options?: RequestOptions
): Promise<T> {
return await this.createRequest<T>('PATCH', url, data, options);
}

async head<T>(url: string, headers?: RequestHeaders): Promise<T> {
return await this.createRequest<T>('HEAD', url, null, headers);
async head<T>(url: string, options?: RequestOptions): Promise<T> {
return await this.createRequest<T>('HEAD', url, null, options);
}

async options<T>(url: string, headers?: RequestHeaders): Promise<T> {
return await this.createRequest<T>('OPTIONS', url, null, headers);
async options<T>(url: string, options?: RequestOptions): Promise<T> {
return await this.createRequest<T>('OPTIONS', url, null, options);
}

async connect<T>(url: string, headers?: RequestHeaders): Promise<T> {
return await this.createRequest<T>('CONNECT', url, null, headers);
async connect<T>(url: string, options?: RequestOptions): Promise<T> {
return await this.createRequest<T>('CONNECT', url, null, options);
}

async trace<T>(url: string, headers?: RequestHeaders): Promise<T> {
return await this.createRequest<T>('TRACE', url, null, headers);
async trace<T>(url: string, options?: RequestOptions): Promise<T> {
return await this.createRequest<T>('TRACE', url, null, options);
}
}
Loading