From ad26e50de10ebce4ead154ca38debef0fa6e45e4 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 30 Apr 2021 11:37:28 +1000
Subject: [PATCH] fix attachment upload for opengroupv1 and old file server

---
 js/background.js                     |  7 +++----
 js/modules/loki_app_dot_net_api.js   |  2 +-
 ts/opengroup/opengroupV2/ApiUtil.ts  | 11 -----------
 ts/opengroup/utils/OpenGroupUtils.ts |  4 +++-
 ts/session/onions/onionSend.ts       |  2 +-
 ts/session/snode_api/swarmPolling.ts |  3 +--
 6 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/js/background.js b/js/background.js
index 8ddff19e7..de74ed7e8 100644
--- a/js/background.js
+++ b/js/background.js
@@ -126,10 +126,9 @@
     // If already exists we registered as a secondary device
     if (!window.lokiFileServerAPI) {
       window.lokiFileServerAPIFactory = new window.LokiFileServerAPI(ourKey);
-      // FIXME audric
-      // window.lokiFileServerAPI = window.lokiFileServerAPIFactory.establishHomeConnection(
-      //   window.getDefaultFileServer()
-      // );
+      window.lokiFileServerAPI = window.lokiFileServerAPIFactory.establishHomeConnection(
+        window.getDefaultFileServer()
+      );
     }
 
     window.initialisedAPI = true;
diff --git a/js/modules/loki_app_dot_net_api.js b/js/modules/loki_app_dot_net_api.js
index 1ce0ae8a8..d058f46aa 100644
--- a/js/modules/loki_app_dot_net_api.js
+++ b/js/modules/loki_app_dot_net_api.js
@@ -381,7 +381,7 @@ class LokiAppDotNetServerAPI {
     return OnionSend.serverRequest(`${this.baseServerUrl}/${endpoint}`, {
       ...options,
       token: this.token,
-      srvPubKey: this.pubKey,
+      srvPubKey: this.pubKeyHex,
     });
   }
 
diff --git a/ts/opengroup/opengroupV2/ApiUtil.ts b/ts/opengroup/opengroupV2/ApiUtil.ts
index 721411d3f..01fbfbd35 100644
--- a/ts/opengroup/opengroupV2/ApiUtil.ts
+++ b/ts/opengroup/opengroupV2/ApiUtil.ts
@@ -104,17 +104,6 @@ export const parseMessages = async (
   return _.compact(messages);
 };
 // tslint:disable: no-http-string
-
-// FIXME audric change this to
-// const defaultRoom =
-//   'https://opengroup.bilb.us/main?public_key=1352534ba73d4265973280431dbc72e097a3e43275d1ada984f9805b4943047d';
-
-// const defaultRoom =
-//   'http://opengroup.bilb.us:9861/main?public_key=1352534ba73d4265973280431dbc72e097a3e43275d1ada984f9805b4943047d';
-
-// const defaultRoom =
-//   'https://sog.ibolpap.finance/main?public_key=b464aa186530c97d6bcf663a3a3b7465a5f782beaa67c83bee99468824b4aa10';
-
 const defaultServerUrl = 'http://116.203.70.33';
 const defaultServerPublicKey = 'a03c383cf63c3c4efe67acc52112a6dd734b3a946b9545f488aaa93da7991238';
 const defaultRoom = `${defaultServerUrl}/main?public_key=${defaultServerPublicKey}`;
diff --git a/ts/opengroup/utils/OpenGroupUtils.ts b/ts/opengroup/utils/OpenGroupUtils.ts
index c3bc1802a..e6928ee6a 100644
--- a/ts/opengroup/utils/OpenGroupUtils.ts
+++ b/ts/opengroup/utils/OpenGroupUtils.ts
@@ -1,6 +1,7 @@
 import { default as insecureNodeFetch } from 'node-fetch';
 import { OpenGroupV2Room } from '../../data/opengroups';
 import { sendViaOnion } from '../../session/onions/onionSend';
+import { toHex } from '../../session/utils/String';
 import { OpenGroupRequestCommonType } from '../opengroupV2/ApiUtil';
 
 const protocolRegex = new RegExp('(https?://)?');
@@ -131,9 +132,10 @@ export const validOpenGroupServer = async (serverUrl: string) => {
       // decode it.
       const obj = JSON.parse(result.response.data);
       const pubKey = window.dcodeIO.ByteBuffer.wrap(obj.data, 'base64').toArrayBuffer();
+      const pubKeyHex = toHex(pubKey);
       // verify we can make an onion routed call to that open group with the decoded public key
       // get around the FILESERVER_HOSTS filter by not using serverRequest
-      const res = await sendViaOnion(pubKey, url, { method: 'GET' }, { noJson: true });
+      const res = await sendViaOnion(pubKeyHex, url, { method: 'GET' }, { noJson: true });
       if (res && res.result && res.result.status === 200) {
         window.log.info(
           `loki_public_chat::validOpenGroupServer - onion routing enabled on ${url.toString()}`
diff --git a/ts/session/onions/onionSend.ts b/ts/session/onions/onionSend.ts
index 921cf6602..105ca51d2 100644
--- a/ts/session/onions/onionSend.ts
+++ b/ts/session/onions/onionSend.ts
@@ -95,7 +95,7 @@ const buildSendViaOnionPayload = (url: URL, fetchOptions: OnionFetchOptions) =>
   ) {
     const fData = payloadObj.body.getBuffer();
     const fHeaders = payloadObj.body.getHeaders();
-    tempHeaders = { ...tempHeaders, fHeaders };
+    tempHeaders = { ...tempHeaders, ...fHeaders };
     // update headers for boundary
     // update body with base64 chunk
     payloadObj.body = {
diff --git a/ts/session/snode_api/swarmPolling.ts b/ts/session/snode_api/swarmPolling.ts
index 03f4d9579..8a798a4b6 100644
--- a/ts/session/snode_api/swarmPolling.ts
+++ b/ts/session/snode_api/swarmPolling.ts
@@ -53,8 +53,7 @@ export class SwarmPolling {
 
   public start(): void {
     this.loadGroupIds();
-    // FIXME audric
-    // void this.pollForAllKeys();
+    void this.pollForAllKeys();
   }
 
   public addGroupId(pubkey: PubKey) {