Просмотр исходного кода

use postForm method instead of specifying header

Futa Arai 6 месяцев назад
Родитель
Сommit
3de29dec97
2 измененных файлов с 10 добавлено и 14 удалено
  1. 5 7
      apps/app/src/client/util/apiv1-client.ts
  2. 5 7
      apps/app/src/client/util/apiv3-client.ts

+ 5 - 7
apps/app/src/client/util/apiv1-client.ts

@@ -21,8 +21,8 @@ class Apiv1ErrorHandler extends Error {
 
 }
 
-export async function apiRequest<T>(method: string, path: string, params: unknown, options = {}): Promise<T> {
-  const res = await axios[method](urljoin(apiv1Root, path), params, options);
+export async function apiRequest<T>(method: string, path: string, params: unknown): Promise<T> {
+  const res = await axios[method](urljoin(apiv1Root, path), params);
 
   if (res.data.ok) {
     return res.data;
@@ -41,14 +41,12 @@ export async function apiGet<T>(path: string, params: unknown = {}): Promise<T>
   return apiRequest<T>('get', path, { params });
 }
 
-export async function apiPost<T>(path: string, params: unknown = {}, options = {}): Promise<T> {
-  return apiRequest<T>('post', path, params, options);
+export async function apiPost<T>(path: string, params: unknown = {}): Promise<T> {
+  return apiRequest<T>('post', path, params);
 }
 
 export async function apiPostForm<T>(path: string, formData: FormData): Promise<T> {
-  return apiPost<T>(path, formData, {
-    headers: { 'Content-Type': 'multipart/form-data' },
-  });
+  return apiRequest<T>('postForm', path, formData);
 }
 
 export async function apiDelete<T>(path: string, params: unknown = {}): Promise<T> {

+ 5 - 7
apps/app/src/client/util/apiv3-client.ts

@@ -30,9 +30,9 @@ const apiv3ErrorHandler = (_err: any): any[] => {
 };
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export async function apiv3Request<T = any>(method: string, path: string, params: unknown, options = {}): Promise<AxiosResponse<T>> {
+export async function apiv3Request<T = any>(method: string, path: string, params: unknown): Promise<AxiosResponse<T>> {
   try {
-    const res = await axios[method](urljoin(apiv3Root, path), params, options);
+    const res = await axios[method](urljoin(apiv3Root, path), params);
     return res;
   }
   catch (err) {
@@ -45,14 +45,12 @@ export async function apiv3Get<T = any>(path: string, params: unknown = {}): Pro
   return apiv3Request('get', path, { params });
 }
 
-export async function apiv3Post<T = any>(path: string, params: unknown = {}, options = {}): Promise<AxiosResponse<T>> {
-  return apiv3Request('post', path, params, options);
+export async function apiv3Post<T = any>(path: string, params: unknown = {}): Promise<AxiosResponse<T>> {
+  return apiv3Request('post', path, params);
 }
 
 export async function apiv3PostForm<T = any>(path: string, formData: FormData): Promise<AxiosResponse<T>> {
-  return apiv3Post<T>(path, formData, {
-    headers: { 'Content-Type': 'multipart/form-data' },
-  });
+  return apiv3Request('postForm', path, formData);
 }
 
 export async function apiv3Put<T = any>(path: string, params: unknown = {}): Promise<AxiosResponse<T>> {