From 9a9fb7271ed25d5afc0971f72415ae5bd4deaad6 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 2 Jun 2021 14:24:20 +1000
Subject: [PATCH] add some logs when fetching a new token opengroupv2

---
 FSV1 TO CLEAN.txt                   | 51 -----------------------------
 ts/opengroup/opengroupV2/ApiAuth.ts | 13 ++++++--
 2 files changed, 10 insertions(+), 54 deletions(-)
 delete mode 100644 FSV1 TO CLEAN.txt

diff --git a/FSV1 TO CLEAN.txt b/FSV1 TO CLEAN.txt
deleted file mode 100644
index fbedc192d..000000000
--- a/FSV1 TO CLEAN.txt	
+++ /dev/null
@@ -1,51 +0,0 @@
-
-A TESTER
-move mentions user to redux for opengroups
-* MENTIONS opengroupv2
-
-
-lokiPublicChatAPI
-
-
-
-
-DELETED
-LokiPushNotificationServerApi
-channelAPI.sendMessage
-dot_net_api
-loki_public_chat_api
-tokenlessFileServerAdnAPI
-channelId
-publicChat with only a cahnnel of 1
-loki_file_server_api
-LokiAppDotNetApi
-LokiPublicChatFactoryAPI
-lastPublicMessage
-getLastRetrievedMessage
-setLastRetrievedMessage
-attemptConnection
-attemptConnectionOneAtATime
-
-getPublicSendData
-setPublicSource
-getPublicSource
-findOrCreateServer
-initAPIs
-OpenGroup.
-findOrCreateChannel
-initSpecialConversations
-updateOpenGroupV1
-partChannel
-acceptOpenGroupInvitationV1
-pollForChannelOnce
-publicConversatio
-handleOpenGroupJoinV1
-setChannelName
-setChannelAvatar
-isOpenGroupV1
-toOpenGroupV1
-setListOfMembers
-
-
-lokiFileServerAPI
-lokiFileServerAPIFactory
\ No newline at end of file
diff --git a/ts/opengroup/opengroupV2/ApiAuth.ts b/ts/opengroup/opengroupV2/ApiAuth.ts
index 450c9ea54..36d5f4f41 100644
--- a/ts/opengroup/opengroupV2/ApiAuth.ts
+++ b/ts/opengroup/opengroupV2/ApiAuth.ts
@@ -45,27 +45,34 @@ export async function getAuthToken({
     return roomDetails.token;
   }
 
-  await allowOnlyOneAtATime(`getAuthTokenV2${serverUrl}:${roomId}`, async () => {
+  await allowOnlyOneAtATime(`getAuthToken${serverUrl}:${roomId}`, async () => {
     try {
-      window?.log?.info('TRIGGERING NEW AUTH TOKEN WITH', { serverUrl, roomId });
+      window?.log?.info(
+        `Triggering getAuthToken with serverUrl:'${serverUrl}'; roomId:'${roomId}'`
+      );
       const token = await requestNewAuthToken({ serverUrl, roomId });
       if (!token) {
         window?.log?.warn('invalid new auth token', token);
         return;
       }
+      window?.log?.info(`Got AuthToken for serverUrl:'${serverUrl}'; roomId:'${roomId}'`);
       const claimedToken = await claimAuthToken(token, serverUrl, roomId);
       if (!claimedToken) {
-        window?.log?.warn('invalid claimed token', claimedToken);
+        window?.log?.warn('Failed to claim token', claimedToken);
+      } else {
+        window?.log?.info(`Claimed AuthToken for serverUrl:'${serverUrl}'; roomId:'${roomId}'`);
       }
       // still save it to the db. just to mark it as to be refreshed later
       roomDetails.token = claimedToken || '';
       await saveV2OpenGroupRoom(roomDetails);
+      window?.log?.info(`AuthToken saved to DB for serverUrl:'${serverUrl}'; roomId:'${roomId}'`);
     } catch (e) {
       window?.log?.error('Failed to getAuthToken', e);
       throw e;
     }
   });
 
+  // fetch the data from the db again, which should have been written in the saveV2OpenGroupRoom() call above
   const refreshedRoomDetails = await getV2OpenGroupRoomByRoomId({
     serverUrl,
     roomId,