@openfn/language-mailchimp 0.8.0 → 1.0.0

package/dist/index.cjs

@@ -252,17 +252,23 @@ var defaultOptions = {
   query: {},
   body: void 0
 };
-var assertOK = (response, fullUrl) => {
-  if (response.status >= 400) {
-    const defaultErrorMesssage = `Request to ${fullUrl} failed with status: ${response.status}`;
-    const error = new Error(defaultErrorMesssage);
+var assertOK = async (response, fullUrl) => {
+  if (response.statusCode >= 400) {
+    const message = `Request to ${fullUrl} failed with status: ${response.statusCode}`;
+    console.error(message);
+    let mailchimpError;
+    try {
+      mailchimpError = await response.body.json();
+    } catch (e) {
+      console.warning("Error parsing mailchimp error body");
+      console.warning(e);
+    }
+    if (mailchimpError) {
+      throw mailchimpError;
+    }
+    const error = new Error(message);
+    error.status = response.statusCode;
     error.url = fullUrl;
-    error.type = response.type;
-    error.title = response.title;
-    error.status = response.status;
-    error.detail = response.detail;
-    error.instance = response.instance;
-    error.errors = response.errors;
     throw error;
   }
 };
@@ -292,13 +298,20 @@ function request(method, path, options, callback) {
       query,
       body: body ? JSON.stringify(body) : void 0
     });
-    console.log("Mailchimp says", response.statusCode);
-    const responseBody = await response.body.json();
-    assertOK(responseBody, `https://${server}.api.mailchimp.com${urlPath}`);
+    console.log(response.statusCode, urlPath);
+    await assertOK(response, `https://${server}.api.mailchimp.com${urlPath}`);
+    let data = {};
+    if (response.statusCode !== 204) {
+      data = await response.body.json();
+    }
     const nextState = {
       ...state,
-      data: responseBody,
-      response: responseBody
+      data,
+      response: {
+        headers: response.headers,
+        body: data,
+        statusCode: response.statusCode
+      }
     };
     if (callback)
       return callback(nextState);

package/dist/index.js

@@ -210,17 +210,23 @@ var defaultOptions = {
   query: {},
   body: void 0
 };
-var assertOK = (response, fullUrl) => {
-  if (response.status >= 400) {
-    const defaultErrorMesssage = `Request to ${fullUrl} failed with status: ${response.status}`;
-    const error = new Error(defaultErrorMesssage);
+var assertOK = async (response, fullUrl) => {
+  if (response.statusCode >= 400) {
+    const message = `Request to ${fullUrl} failed with status: ${response.statusCode}`;
+    console.error(message);
+    let mailchimpError;
+    try {
+      mailchimpError = await response.body.json();
+    } catch (e) {
+      console.warning("Error parsing mailchimp error body");
+      console.warning(e);
+    }
+    if (mailchimpError) {
+      throw mailchimpError;
+    }
+    const error = new Error(message);
+    error.status = response.statusCode;
     error.url = fullUrl;
-    error.type = response.type;
-    error.title = response.title;
-    error.status = response.status;
-    error.detail = response.detail;
-    error.instance = response.instance;
-    error.errors = response.errors;
     throw error;
   }
 };
@@ -250,13 +256,20 @@ function request(method, path, options, callback) {
       query,
       body: body ? JSON.stringify(body) : void 0
     });
-    console.log("Mailchimp says", response.statusCode);
-    const responseBody = await response.body.json();
-    assertOK(responseBody, `https://${server}.api.mailchimp.com${urlPath}`);
+    console.log(response.statusCode, urlPath);
+    await assertOK(response, `https://${server}.api.mailchimp.com${urlPath}`);
+    let data = {};
+    if (response.statusCode !== 204) {
+      data = await response.body.json();
+    }
     const nextState = {
       ...state,
-      data: responseBody,
-      response: responseBody
+      data,
+      response: {
+        headers: response.headers,
+        body: data,
+        statusCode: response.statusCode
+      }
     };
     if (callback)
       return callback(nextState);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openfn/language-mailchimp",
-  "version": "0.8.0",
+  "version": "1.0.0",
   "description": "An OpenFn adaptor for use with Mailchimp",
   "main": "dist/index.cjs",
   "author": "Open Function Group",