Merge pull request #652 from systemli/Fix-broken-Upload

🐛 Fix broken Upload
systemli · Jul 28, 2024 · 036b220 · 036b220
2 parents 14a48e4 + a7eec86
commit 036b220
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 6 deletions.
diff --git a/src/api/Upload.test.ts b/src/api/Upload.test.ts
@@ -1,4 +1,4 @@
-import { ApiUrl, apiHeaders } from './Api'
+import { ApiUrl } from './Api'
 import { postUploadApi } from './Upload'
 
 describe('postUploadApi', () => {
@@ -12,7 +12,11 @@ describe('postUploadApi', () => {
     const response = await postUploadApi('token', new FormData())
     expect(response).toEqual(data)
     expect(fetchMock).toHaveBeenCalledTimes(1)
-    expect(fetchMock).toHaveBeenCalledWith(`${ApiUrl}/admin/upload`, { headers: apiHeaders('token'), method: 'post', body: new FormData() })
+    expect(fetchMock).toHaveBeenCalledWith(`${ApiUrl}/admin/upload`, {
+      headers: { Accept: 'application/json', Authorization: 'Bearer token' },
+      method: 'post',
+      body: new FormData(),
+    })
   })
 
   it('should throw error on non-200 status', async () => {
@@ -21,14 +25,22 @@ describe('postUploadApi', () => {
     const response = await postUploadApi('token', new FormData())
     expect(response).toEqual(data)
     expect(fetchMock).toHaveBeenCalledTimes(1)
-    expect(fetchMock).toHaveBeenCalledWith(`${ApiUrl}/admin/upload`, { headers: apiHeaders('token'), method: 'post', body: new FormData() })
+    expect(fetchMock).toHaveBeenCalledWith(`${ApiUrl}/admin/upload`, {
+      headers: { Accept: 'application/json', Authorization: 'Bearer token' },
+      method: 'post',
+      body: new FormData(),
+    })
   })
 
   it('should throw error on network failure', async () => {
     fetchMock.mockReject(new Error('Failed to fetch'))
     const response = await postUploadApi('token', new FormData())
     expect(response).toEqual({ status: 'error', error: { code: 500, message: 'Failed to fetch' } })
     expect(fetchMock).toHaveBeenCalledTimes(1)
-    expect(fetchMock).toHaveBeenCalledWith(`${ApiUrl}/admin/upload`, { headers: apiHeaders('token'), method: 'post', body: new FormData() })
+    expect(fetchMock).toHaveBeenCalledWith(`${ApiUrl}/admin/upload`, {
+      headers: { Accept: 'application/json', Authorization: 'Bearer token' },
+      method: 'post',
+      body: new FormData(),
+    })
   })
 })
diff --git a/src/api/Upload.ts b/src/api/Upload.ts
@@ -1,4 +1,4 @@
-import { ApiResponse, ApiUrl, apiClient, apiHeaders } from './Api'
+import { ApiResponse, ApiUrl, apiClient } from './Api'
 
 interface UploadeResponseData {
   uploads: Array<Upload>
@@ -13,5 +13,12 @@ export interface Upload {
 }
 
 export async function postUploadApi(token: string, formData: FormData): Promise<ApiResponse<UploadeResponseData>> {
-  return apiClient<UploadeResponseData>(`${ApiUrl}/admin/upload`, { headers: apiHeaders(token), method: 'post', body: formData })
+  return apiClient<UploadeResponseData>(`${ApiUrl}/admin/upload`, {
+    headers: {
+      Accept: 'application/json',
+      Authorization: `Bearer ${token}`,
+    },
+    method: 'post',
+    body: formData,
+  })
 }