fix restHandlers.genericResponse error handling

Author: martintajur

lib/restHandlers.js

@@ -18,7 +18,13 @@
 	}
 
 	RestHandlers.prototype.genericResponse = function(method, object, responseBody, callback, rawRequest, rawResponse) {
-		var statusCodeSeries = (rawResponse.statusCode || 0).toString().substr(0, 1);
+		log('Handling response of ' + method + ' ' + object + ': ' + rawRequest.url.href + (rawRequest.url.href.indexOf(rawRequest.url.query) === -1 ? '?' + rawRequest.url.query : ''));
+
+		if (!_.isFunction(callback)) {
+			return;
+		}
+
+		var statusCodeGroup = parseInt((rawResponse.statusCode || 0).toString().substr(0, 1), 10);
 
 		if (_.isString(responseBody)) {
 			try {
@@ -27,14 +33,11 @@
 			catch (err) {}
 		}
 
-		log('Handling response of ' + method + ' ' + object + ': ' + rawRequest.url.href + (rawRequest.url.href.indexOf(rawRequest.url.query) === -1 ? '?' + rawRequest.url.query : ''));
-
 		if (responseBody.success === true) {
-			if (_.isFunction(callback)) {
-				callback(null, responseBody.data, responseBody.additional_data, rawRequest, rawResponse);
-			}
+			callback(null, responseBody.data, responseBody.additional_data, rawRequest, rawResponse);
+			return;
 		}
-		else if (statusCodeSeries == '4' || statusCodeSeries == '5') {
+		else if (statusCodeGroup === 4 || statusCodeGroup === 5) {
 			var errorObject = new Error();
 
 			if (_.isObject(rawResponse._error)) {
@@ -57,14 +60,15 @@
 				}
 			}
 
-			if (_.isFunction(callback)) {
-				callback(errorObject, null, null, rawRequest, rawResponse);
-			}
+			callback(errorObject, null, null, rawRequest, rawResponse);
+			return;
 		}
-		else if (_.isFunction(callback)) {
-			callback(null, responseBody.data || {}, responseBody.additional_data || {}, rawRequest, rawResponse);
+		else if (responseBody.error) {
+			callback(responseBody.error, responseBody.data || {}, responseBody.additional_data || {}, rawRequest, rawResponse);
+			return;
 		}
 
+		callback(null, responseBody.data || {}, responseBody.additional_data || {}, rawRequest, rawResponse);
 	};
 
 	// GET /items