fix: Properly handle errors in Upload Api (related to StorageError) (#216)

* fix upload error handling

* bypass type check

* fix _getRequestParams

Author: hmpthz

src/lib/fetch.ts

@@ -45,15 +45,17 @@ const _getRequestParams = (
 ) => {
   const params: { [k: string]: any } = { method, headers: options?.headers || {} }
 
-  if (method === 'GET') {
+  if (method === 'GET' || !body) {
     return params
   }
 
-  params.headers = { 'Content-Type': 'application/json', ...options?.headers }
-
-  if (body) {
+  if (body instanceof FormData) {
+    params.body = body
+  } else {
+    params.headers = { 'Content-Type': 'application/json', ...options?.headers }
     params.body = JSON.stringify(body)
   }
+
   return { ...params, ...parameters }
 }
 

src/packages/StorageFileApi.ts

@@ -1,5 +1,5 @@
 import { isStorageError, StorageError, StorageUnknownError } from '../lib/errors'
-import { Fetch, get, head, post, remove } from '../lib/fetch'
+import { Fetch, get, head, post, put, remove } from '../lib/fetch'
 import { recursiveToCamel, resolveFetch } from '../lib/helpers'
 import {
   FileObject,
@@ -118,23 +118,16 @@ export default class StorageFileApi {
 
       const cleanPath = this._removeEmptyFolders(path)
       const _path = this._getFinalPath(cleanPath)
-      const res = await this.fetch(`${this.url}/object/${_path}`, {
-        method,
-        body: body as BodyInit,
-        headers,
-        ...(options?.duplex ? { duplex: options.duplex } : {}),
-      })
-
-      const data = await res.json()
+      const data = await (method == 'PUT' ? put : post)(
+        this.fetch,
+        `${this.url}/object/${_path}`,
+        body as object,
+        { headers, ...(options?.duplex ? { duplex: options.duplex } : {}) }
+      )
 
-      if (res.ok) {
-        return {
-          data: { path: cleanPath, id: data.Id, fullPath: data.Key },
-          error: null,
-        }
-      } else {
-        const error = data
-        return { data: null, error }
+      return {
+        data: { path: cleanPath, id: data.Id, fullPath: data.Key },
+        error: null,
       }
     } catch (error) {
       if (isStorageError(error)) {
@@ -207,22 +200,16 @@ export default class StorageFileApi {
         headers['content-type'] = options.contentType as string
       }
 
-      const res = await this.fetch(url.toString(), {
-        method: 'PUT',
-        body: body as BodyInit,
-        headers,
-      })
-
-      const data = await res.json()
+      const data = await put(
+        this.fetch,
+        url.toString(),
+        body as object,
+        { headers }
+      )
 
-      if (res.ok) {
-        return {
-          data: { path: cleanPath, fullPath: data.Key },
-          error: null,
-        }
-      } else {
-        const error = data
-        return { data: null, error }
+      return {
+        data: { path: cleanPath, fullPath: data.Key },
+        error: null,
       }
     } catch (error) {
       if (isStorageError(error)) {