Merge pull request #27 from drucker/hotfix/frontend-errorhandling

Merged!

Author: keigohtr

frontend/src/apis/Core/index.tsx

@@ -182,7 +182,7 @@ export async function rawRequest<T = any>(
 
   return fetch(entryPoint, fullOptions)
     .then((response) => {
-      return _handleAPIResponse<T>(entryPoint, response, convert)
+      return _handleAPIResponse<T>(response, convert)
     })
     .catch((error) => {
       if (error instanceof APIError) {
@@ -225,16 +225,13 @@ export async function rawMultiRequest<T = any>(
   }
   return Promise.all(
     entryPoints.map(
-      (entryPoint, i) =>
-        fetch(entryPoint, fullOptionsList[i])
+      (entryPoint, i) => {
+        return fetch(entryPoint, fullOptionsList[i]).then((response) => {
+          return _handleAPIResponse<T>(response, convert)
+        })
+      }
     )
   )
-  .then((responses) => {
-    return responses.map(
-      (response, i) => {
-        return _handleAPIResponse<T>(entryPoints[i], response, convert)
-      })
-  })
   .catch((error) => { throw new APIError(error.message) })
 }
 
@@ -246,35 +243,21 @@ function generateFormData(params) {
 }
 
 function _handleAPIResponse<T = any>(
-  entryPoint: string,
   response: Response,
   convert: (response) => T = (r) => r
 ): Promise<any> {
   if (response.ok) {
     return response.json()
       .then((resultJSON) => convert(resultJSON))
   }
-
-  // Throw API error exception
-  if (entryPoint.endsWith('/credential')) {
-    return new Promise((_, reject) => {
-      response.json()
-        .then((resultJSON) => {
-          reject(new APIError(
-            resultJSON.message,
-            APIErrorType.serverside,
-            response.status
-          ))
-        })
-    })
-  }
-  response.json().then(
-    (resultJSON) => {
-      throw new APIError(
-        resultJSON.message,
-        APIErrorType.serverside,
-        response.status
-      )
-    }
-  )
+  return new Promise((_, reject) => {
+    response.json()
+      .then((resultJSON) => {
+        reject(new APIError(
+          resultJSON.message,
+          APIErrorType.serverside,
+          response.status
+        ))
+      })
+  })
 }