From 8d684f7b1b69dc35b15520b7c21212441edf4372 Mon Sep 17 00:00:00 2001
From: Jeff Becker <jeff@i2p.rocks>
Date: Mon, 9 Mar 2020 22:59:23 -0400
Subject: [PATCH] make .loki public chats "work" passing number zero to
 environmental variables UNSETS the variable, pass "0" instead. this commit
 makes it "work" but is probably not the right fix, that comes later. (tm)

---
 js/modules/loki_app_dot_net_api.js | 16 +++++++++++-----
 js/modules/loki_public_chat_api.js |  8 ++++----
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/js/modules/loki_app_dot_net_api.js b/js/modules/loki_app_dot_net_api.js
index c4945fd76..70ff7e8a1 100644
--- a/js/modules/loki_app_dot_net_api.js
+++ b/js/modules/loki_app_dot_net_api.js
@@ -390,7 +390,13 @@ class LokiAppDotNetServerAPI {
         json: () => response,
       };
     }
-    return nodeFetch(urlObj, fetchOptions, options);
+    const urlStr = urlObj.toString();
+    if (urlStr.match(/\.loki\//)) {
+      process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
+    }
+    const result = await nodeFetch(urlObj, fetchOptions, options);
+    process.env.NODE_TLS_REJECT_UNAUTHORIZED = 1;
+    return result;
   }
 
   async _sendToProxy(endpoint, pFetchOptions, options = {}) {
@@ -565,7 +571,7 @@ class LokiAppDotNetServerAPI {
       fetchOptions.headers = headers;
 
       // domain ends in .loki
-      if (endpoint.match(/\.loki\//)) {
+      if (url.toString().match(/\.loki\//)) {
         fetchOptions.agent = snodeHttpsAgent;
       }
     } catch (e) {
@@ -599,9 +605,9 @@ class LokiAppDotNetServerAPI {
         ));
       } else {
         // disable check for .loki
-        process.env.NODE_TLS_REJECT_UNAUTHORIZED = endpoint.match(/\.loki\//)
-          ? 0
-          : 1;
+        if (url.toString().match(/\.loki/)) {
+          process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
+        }
         result = await nodeFetch(url, fetchOptions);
         // always make sure this check is enabled
         process.env.NODE_TLS_REJECT_UNAUTHORIZED = 1;
diff --git a/js/modules/loki_public_chat_api.js b/js/modules/loki_public_chat_api.js
index 0dff04c9b..89fbc7abf 100644
--- a/js/modules/loki_public_chat_api.js
+++ b/js/modules/loki_public_chat_api.js
@@ -29,11 +29,11 @@ class LokiPublicChatFactoryAPI extends EventEmitter {
     try {
       // allow .loki (may only need an agent but not sure
       //              until we have a .loki to test with)
-      process.env.NODE_TLS_REJECT_UNAUTHORIZED = serverUrl.match(/\.loki\//)
-        ? 0
-        : 1;
+      if (serverUrl.match(/\.loki$/)) {
+        process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
+      }
       await nodeFetch(serverUrl);
-      process.env.NODE_TLS_REJECT_UNAUTHORIZED = 1;
+      process.env.NODE_TLS_REJECT_UNAUTHORIZED = '1';
       // const txt = await res.text();
     } catch (e) {
       process.env.NODE_TLS_REJECT_UNAUTHORIZED = 1;