Handle all HTTP errors correctly (#379)

* fix: handle non-http errors correctly (#375) * fix: handle all HTTP errors correctly (#378)
ToothlessGear · Oct 10, 2023 · a235d24 · a235d24
1 parent cc6fa1a
commit a235d24
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/lib/sender.js b/lib/sender.js
@@ -157,11 +157,6 @@ Sender.prototype.sendNoRetry = function(message, recipient, callback) {
             .then((res) => {
                 const { data: resBodyJSON, status } = res;
 
-                if (status !== 200) {
-                    debug('Invalid request (' + status + '): ' + resBodyJSON);
-                    return callback(status);
-                }
-
                 if (_.isEmpty(resBodyJSON)) {
                     debug('Empty response received (' + status + ' ' + res.statusText + ')');
                     // Spoof error code 400 to avoid retrying the request
@@ -183,6 +178,12 @@ Sender.prototype.sendNoRetry = function(message, recipient, callback) {
                         debug('GCM service is unavailable (500)');
                         return callback(res.status);
                     }
+
+                    if (res.status !== 200) {
+                        debug('Invalid request (' + res.status + '): ' + res.data);
+                        return callback(res.status);
+                    }
+
                 }
 
                 return callback(err);