Rework handleResponse and response error class

limit-zero · Oct 12, 2018 · 4c188b0 · 4c188b0
1 parent 24a8ecc
commit 4c188b0
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 11 deletions.
diff --git a/src/index.js b/src/index.js
@@ -3,7 +3,7 @@ const MarketingCloudAuth = require('marketing-cloud-auth');
 const applyAuthHeader = require('./utils/apply-auth-header');
 const ResponseError = require('./objects/response-error');
 
-class MarkingCloudSOAP {
+class MarketingCloudSOAP {
   /**
    * For WSDL information visit: https://developer.salesforce.com/docs/atlas.en-us.noversion.mc-apis.meta/mc-apis/wsdl-endpoint-links.htm
    *
@@ -39,7 +39,7 @@ class MarkingCloudSOAP {
         Properties: props,
       },
     });
-    return this.handleResponse({ result, rawResponse, rawRequest });
+    return MarketingCloudSOAP.handleResponse({ result, rawResponse, rawRequest });
   }
 
   /**
@@ -77,16 +77,17 @@ class MarkingCloudSOAP {
    * @private
    * @param {object} params
    */
-  handleResponse({ result, rawResponse, rawRequest } = {}) {
-    if (result && result.OverallStatus && result.OverallStatus !== 'OK') {
-      throw new ResponseError({
-        result,
-        rawResponse,
-        rawRequest
-      }, result.OverallStatus);
+  static handleResponse({ result, rawResponse, rawRequest } = {}) {
+    if (!result && !result.OverallStatus) {
+      throw new ResponseError({ result, rawResponse, rawRequest }, 'Unable to parse response status.');
+    }
+
+    const { OverallStatus } = result;
+    if (ResponseError.pattern.test(OverallStatus)) {
+      throw new ResponseError({ result, rawResponse, rawRequest }, OverallStatus);
     }
     return result;
   }
 }
 
-module.exports = MarkingCloudSOAP;
+module.exports = MarketingCloudSOAP;
diff --git a/src/objects/response-error.js b/src/objects/response-error.js
@@ -1,6 +1,15 @@
 class ResponseError extends Error {
+  /**
+   *
+   * @param {object} params
+   * @param {object} params.result
+   * @param {string} params.rawResponse
+   * @param {string} params.rawRequest
+   * @param {string} message
+   * @param  {...any} args
+   */
   constructor({ result, rawResponse, rawRequest } = {}, message, ...args) {
-    const formatted = message ? message.replace(/^error: /i, '') : message;
+    const formatted = message ? message.replace(ResponseError.pattern, '') : message;
     super(formatted, ...args);
 
     if (Error.captureStackTrace) {
@@ -13,4 +22,6 @@ class ResponseError extends Error {
   }
 }
 
+ResponseError.pattern = /^error: /i;
+
 module.exports = ResponseError;