fix(lib-core): fixing for axios

Syncano · Nov 27, 2018 · 7809576 · 7809576
1 parent 29538f8
commit 7809576
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/packages/lib-js-core/src/utils.js b/packages/lib-js-core/src/utils.js
@@ -38,18 +38,16 @@ export function parseJSON (response) {
   const mimetype = response.headers.get('Content-Type')
 
   if (response.status === 204 || mimetype === null) {
-    return Promise.resolve({
-      data: undefined,
-      ...response
-    })
+    response.data = undefined
+    return Promise.resolve(response)
   }
 
   // Parse JSON
   if (/^.*\/.*\+json/.test(mimetype) || /^application\/json/.test(mimetype)) {
-    return response.json().then(res => ({
-      data: res,
-      ...response
-    }))
+    return response.json().then(res => {
+      response.data = res
+      return response
+    })
   }
 
   // Parse XML and plain text
@@ -58,10 +56,10 @@ export function parseJSON (response) {
     /^.*\/.*\+xml/.test(mimetype) ||
     mimetype === 'text/plain'
   ) {
-    return response.text().then(res => ({
-      data: res,
-      ...response
-    }))
+    return response.text().then(res => {
+      response.data = res
+      return response
+    })
   }
 
   return response.arrayBuffer()

diff --git a/packages/lib-js-validate/src/index.js b/packages/lib-js-validate/src/index.js
@@ -93,7 +93,6 @@ export default class Validator {
     }
 
     // Should we validate empty schema?
-    console.log('YYY validateResponse')
     if (!responseSchema || !isEmpty(responseSchema)) {
       return true
     }