From 5de2dea407c078906c57fae5780b1e6508f2af65 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Mon, 26 Oct 2020 10:35:33 +1100
Subject: [PATCH] use .ok field on serverRequest to check for request success

---
 js/expire.js                       |  2 +-
 js/modules/loki_app_dot_net_api.js | 23 +++++++++++------------
 ts/session/snode_api/onions.ts     |  3 +--
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/js/expire.js b/js/expire.js
index e76c64acf..b7f3992c0 100644
--- a/js/expire.js
+++ b/js/expire.js
@@ -101,7 +101,7 @@
       const res = await window.tokenlessFileServerAdnAPI.serverRequest(
         'loki/v1/time'
       );
-      if (res.statusCode === 200) {
+      if (res.ok) {
         timestamp = res.response;
       }
     } catch (e) {
diff --git a/js/modules/loki_app_dot_net_api.js b/js/modules/loki_app_dot_net_api.js
index 2158d6f34..02e63ca9d 100644
--- a/js/modules/loki_app_dot_net_api.js
+++ b/js/modules/loki_app_dot_net_api.js
@@ -243,6 +243,7 @@ const serverRequest = async (endpoint, options = {}) => {
     );
     return {
       err: e,
+      ok: false,
     };
   }
 
@@ -313,6 +314,7 @@ const serverRequest = async (endpoint, options = {}) => {
 
     return {
       err: e,
+      ok: false,
     };
   }
 
@@ -320,6 +322,7 @@ const serverRequest = async (endpoint, options = {}) => {
     return {
       err: 'noResult',
       response,
+      ok: false,
     };
   }
 
@@ -336,11 +339,13 @@ const serverRequest = async (endpoint, options = {}) => {
       err: 'statusCode',
       statusCode: result.status,
       response,
+      ok: false,
     };
   }
   return {
     statusCode: result.status,
     response,
+    ok: result.status >= 200 && result.status <= 299,
   };
 };
 
@@ -692,7 +697,7 @@ class LokiAppDotNetServerAPI {
       }
       return null;
     }
-    if (res.statusCode !== 200) {
+    if (!res.ok) {
       log.error('requestToken request failed');
       return null;
     }
@@ -712,7 +717,7 @@ class LokiAppDotNetServerAPI {
         },
         noJson: true,
       });
-      return res.statusCode === 200;
+      return res.ok;
     } catch (e) {
       log.error('submitToken serverRequest failure', e.code, e.message);
       return false;
@@ -937,12 +942,9 @@ class LokiAppDotNetServerAPI {
       rawBody: data,
     };
 
-    const { statusCode, response } = await this.serverRequest(
-      endpoint,
-      options
-    );
+    const { response, ok } = await this.serverRequest(endpoint, options);
 
-    if (statusCode !== 200) {
+    if (!ok) {
       throw new Error(`Failed to upload avatar to ${this.baseServerUrl}`);
     }
 
@@ -970,11 +972,8 @@ class LokiAppDotNetServerAPI {
       rawBody: data,
     };
 
-    const { statusCode, response } = await this.serverRequest(
-      endpoint,
-      options
-    );
-    if (statusCode !== 200) {
+    const { ok, response } = await this.serverRequest(endpoint, options);
+    if (!ok) {
       throw new Error(`Failed to upload data to server: ${this.baseServerUrl}`);
     }
 
diff --git a/ts/session/snode_api/onions.ts b/ts/session/snode_api/onions.ts
index 3b7f62ef7..df0ecbb9a 100644
--- a/ts/session/snode_api/onions.ts
+++ b/ts/session/snode_api/onions.ts
@@ -438,8 +438,7 @@ const sendOnionRequest = async (
     id
   );
   onionPayload += payload.length;
-  log.debug('Onion payload size: ', payload.length);
-  log.debug('Onion total: ', onionPayload);
+  log.debug('Onion payload size: ', payload.length, ' total:', onionPayload);
 
   const guardFetchOptions = {
     method: 'POST',