Rework http error validation so it can be reused r=kgrandon

1 files changed, 27 insertions, 1 deletions

diff --git a/lib/caldav/xhr.js b/lib/caldav/xhr.js
index 6c8351f..42e0c32 100644
--- a/lib/caldav/xhr.js
+++ b/lib/caldav/xhr.js
@@ -3,6 +3,7 @@
 */
 (function(module, ns) {
   var Native;
+  var Errors = ns.require('errors');
 
   if (typeof(window) === 'undefined') {
     Native = require('xmlhttprequest').XMLHttpRequest;
@@ -10,6 +11,19 @@
     Native = window.XMLHttpRequest;
   }
 
+  function determineHttpStatusError(status) {
+    var message = 'Cannot handle request due to server response';
+    var err = 'Unknown';
+
+    if (status === 500)
+      err = 'ServerFailure';
+
+    if (status === 401)
+      err = 'Authentication';
+
+    return new Errors[err](message);
+  }
+
   /**
    * Creates a XHR wrapper.
    * Depending on the platform this is loaded
@@ -51,6 +65,7 @@
     password: null,
     url: null,
     streaming: true,
+    validateStatus: false,
 
     headers: {},
     data: null,
@@ -168,7 +183,18 @@
           }
 
           this.waiting = false;
-          callback(null, this.xhr);
+
+          if (
+            !this.validateStatus ||
+            (
+              this.xhr.status > 199 &&
+              this.xhr.status < 300
+            )
+          ) {
+            return callback(null, this.xhr);
+          }
+
+          callback(determineHttpStatusError(this.xhr.status), this.xhr);
         }
       }.bind(this));