From 4c91d977cad29964c26fc9b0140fd10e1e904e6f Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Thu, 22 Oct 2020 09:56:44 +1100
Subject: [PATCH] move token and submit challenge call to onion request

---
 js/modules/loki_app_dot_net_api.js | 42 ++++++++++++------------------
 js/modules/loki_public_chat_api.js |  2 +-
 preload.js                         |  3 +--
 ts/session/snode_api/lokiRpc.ts    |  2 +-
 4 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/js/modules/loki_app_dot_net_api.js b/js/modules/loki_app_dot_net_api.js
index 923d57daf..be3153210 100644
--- a/js/modules/loki_app_dot_net_api.js
+++ b/js/modules/loki_app_dot_net_api.js
@@ -363,7 +363,7 @@ const serverRequest = async (endpoint, options = {}) => {
   } = options;
 
   const url = new URL(endpoint);
-  if (params) {
+  if (!_.isEmpty(params)) {
     url.search = new URLSearchParams(params);
   }
   const fetchOptions = {};
@@ -838,13 +838,13 @@ class LokiAppDotNetServerAPI {
   async requestToken() {
     let res;
     try {
-      const url = new URL(`${this.baseServerUrl}/loki/v1/get_challenge`);
       const params = {
         pubKey: this.ourKey,
       };
-      url.search = new URLSearchParams(params);
-
-      res = await this.proxyFetch(url);
+      res = await this.serverRequest('loki/v1/get_challenge', {
+        method: 'GET',
+        params,
+      });
     } catch (e) {
       // should we retry here?
       // no, this is the low level function
@@ -873,37 +873,29 @@ class LokiAppDotNetServerAPI {
       }
       return null;
     }
-    if (!res.ok) {
+    if (res.statusCode !== 200) {
       log.error('requestToken request failed');
       return null;
     }
-    const body = await res.json();
+    const body = res.response;
     const token = await libloki.crypto.decryptToken(body);
     return token;
   }
 
   // activate token
   async submitToken(token) {
-    const fetchOptions = {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify({
-        pubKey: this.ourKey,
-        token,
-      }),
-    };
-
     try {
-      const res = await this.proxyFetch(
-        new URL(`${this.baseServerUrl}/loki/v1/submit_challenge`),
-        fetchOptions,
-        { textResponse: true }
-      );
-      return res.ok;
+      const res = await this.serverRequest('loki/v1/submit_challenge', {
+        method: 'POST',
+        objBody: {
+          pubKey: this.ourKey,
+          token,
+        },
+        noJson: true,
+      });
+      return res.statusCode === 200;
     } catch (e) {
-      log.error('submitToken proxyFetch failure', e.code, e.message);
+      log.error('submitToken serverRequest failure', e.code, e.message);
       return false;
     }
   }
diff --git a/js/modules/loki_public_chat_api.js b/js/modules/loki_public_chat_api.js
index 4578baade..a26d1b33a 100644
--- a/js/modules/loki_public_chat_api.js
+++ b/js/modules/loki_public_chat_api.js
@@ -32,7 +32,7 @@ const validOpenGroupServer = async serverUrl => {
           { method: 'GET' },
           { noJson: true }
         );
-        if (res.result.status === 200) {
+        if (res.result && res.result.status === 200) {
           log.info(
             `loki_public_chat::validOpenGroupServer - onion routing enabled on ${url.toString()}`
           );
diff --git a/preload.js b/preload.js
index c70b76cc8..9d7b54a5e 100644
--- a/preload.js
+++ b/preload.js
@@ -450,7 +450,7 @@ window.lokiFeatureFlags = {
   privateGroupChats: true,
   useSnodeProxy: !process.env.USE_STUBBED_NETWORK,
   useOnionRequests: true,
-  useOnionRequestsV2: false,
+  useOnionRequestsV2: true,
   useFileOnionRequests: true,
   enableSenderKeys: true,
   onionRequestHops: 3,
@@ -487,7 +487,6 @@ if (config.environment.includes('test-integration')) {
   window.lokiFeatureFlags = {
     multiDeviceUnpairing: true,
     privateGroupChats: true,
-    useSnodeProxy: !process.env.USE_STUBBED_NETWORK,
     useOnionRequests: false,
     useFileOnionRequests: false,
     debugMessageLogs: true,
diff --git a/ts/session/snode_api/lokiRpc.ts b/ts/session/snode_api/lokiRpc.ts
index 0151643bd..815808530 100644
--- a/ts/session/snode_api/lokiRpc.ts
+++ b/ts/session/snode_api/lokiRpc.ts
@@ -17,7 +17,7 @@ async function lokiPlainFetch(
   const { log } = window;
 
   if (url.match(/https:\/\//)) {
-    // import that this does not get set in sendToProxy fetchOptions
+    // import that this does not get set in lokiFetch fetchOptions
     fetchOptions.agent = snodeHttpsAgent;
     process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
   } else {