fix: throw error when fetch is not ok (#81)

* fix: throw error when fetch is not ok * fix: return statusCode with error res
moltin · Dec 21, 2018 · 84293bf · 84293bf
1 parent 0e80fd0
commit 84293bf
Showing 1 changed file with 37 additions and 41 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -27,56 +27,52 @@ export class createClient {
     data: object = undefined,
     requestHeaders: Headers = {}
   ) {
-    try {
-      const {
-        application,
-        currency,
-        customer_token,
-        host,
-        version,
-        headers: classHeaders
-      } = this.options
-
-      const uri: string = `https://${host}/${version}/${removeLeadingSlash(
-        path
-      )}`
-
-      const customHeaders = {
-        ...classHeaders,
-        ...requestHeaders
-      }
+    const {
+      application,
+      currency,
+      customer_token,
+      host,
+      version,
+      headers: classHeaders
+    } = this.options
+
+    const uri: string = `https://${host}/${version}/${removeLeadingSlash(path)}`
+
+    const customHeaders = {
+      ...classHeaders,
+      ...requestHeaders
+    }
 
-      const headers: Headers = {
-        'Content-Type': 'application/json',
-        'X-MOLTIN-SDK-LANGUAGE': 'JS-REQUEST',
-        Authorization: `Bearer ${await this.authenticate()}`,
-        ...(application && { 'X-MOLTIN-APPLICATION': application }),
-        ...(currency && { 'X-MOLTIN-CURRENCY': currency }),
-        ...(customer_token && { 'X-MOLTIN-CUSTOMER-TOKEN': customer_token }),
-        ...customHeaders
-      }
+    const headers: Headers = {
+      'Content-Type': 'application/json',
+      'X-MOLTIN-SDK-LANGUAGE': 'JS-REQUEST',
+      Authorization: `Bearer ${await this.authenticate()}`,
+      ...(application && { 'X-MOLTIN-APPLICATION': application }),
+      ...(currency && { 'X-MOLTIN-CURRENCY': currency }),
+      ...(customer_token && { 'X-MOLTIN-CUSTOMER-TOKEN': customer_token }),
+      ...customHeaders
+    }
 
-      const body = customHeaders['Content-Type']
-        ? data
-        : { body: JSON.stringify({ data }) }
+    const body = customHeaders['Content-Type']
+      ? data
+      : { body: JSON.stringify({ data }) }
 
-      const response = await fetch(uri, {
-        method,
-        headers,
-        ...(data && body)
-      })
+    const response = await fetch(uri, {
+      method,
+      headers,
+      ...(data && body)
+    })
 
-      const json = await response.json()
+    const json = await response.json()
 
-      return {
+    if (!response.ok) {
+      throw {
         statusCode: response.status,
         ...json
       }
-    } catch (errors) {
-      return {
-        errors
-      }
     }
+
+    return json
   }
 
   async authenticate() {