fix delete all on network request

ts/session/utils/syncUtils.ts

@@ -128,13 +128,14 @@ export const forceSyncConfigurationNowIfNeeded = async (waitForMessageSent = fal
 const getNetworkTime = async (snode: Snode): Promise<string | number> => {
   const response: any = await snodeRpc('info', {}, snode);
   const body = JSON.parse(response.body);
-  const timestamp = body.timestamp;
+  const timestamp = body?.timestamp;
   if (!timestamp) {
     throw new Error(`getNetworkTime returned invalid timestamp: ${timestamp}`);
   }
   return timestamp;
 };
 
+// tslint:disable-next-line: max-func-body-length
 export const forceNetworkDeletion = async (): Promise<Map<string, boolean> | null> => {
   const sodium = await getSodium();
   const userX25519PublicKey = UserUtils.getOurPubKeyFromCache();
@@ -147,11 +148,7 @@ export const forceNetworkDeletion = async (): Promise<Map<string, boolean> | nul
   }
   const edKeyPriv = userED25519KeyPair.privKey;
 
-  console.warn({ userED25519KeyPair });
+  return pRetry(async () => {
-  console.warn({ edKeyPriv });
-
-  return pRetry(
-    async () => {
     const userSwarm = await getSwarmFor(userX25519PublicKey.key);
     const snodeToMakeRequestTo: Snode | undefined = _.sample(userSwarm);
     const edKeyPrivBytes = fromHexToArray(edKeyPriv);
@@ -161,7 +158,6 @@ export const forceNetworkDeletion = async (): Promise<Map<string, boolean> | nul
       return null;
     }
 
-      // FIXME audric pretry getNetworkTime separately too
     return pRetry(
       async () => {
         const timestamp = await getNetworkTime(snodeToMakeRequestTo);
@@ -216,7 +212,6 @@ export const forceNetworkDeletion = async (): Promise<Map<string, boolean> | nul
             swarmAsArray.map(snode => {
               const snodePubkey = snode[0];
               const snodeJson = snode[1];
-                console.warn({ snodePubkey, snodeJson });
 
               const isFailed = snodeJson.failed || false;
 
@@ -268,10 +263,9 @@ export const forceNetworkDeletion = async (): Promise<Map<string, boolean> | nul
             `delete_all request attempt #${e.attemptNumber} failed. ${e.retriesLeft} retries left...`
           );
         },
-        },
       }
     );
-
+  }, {});
 };
 
 const getActiveOpenGroupV2CompleteUrls = async (
@@ -319,7 +313,7 @@ const getValidClosedGroups = async (convos: Array<ConversationModel>) => {
       }
 
       return new ConfigurationMessageClosedGroup({
-        publicKey: groupPubKey as string,
+        publicKey: groupPubKey,
         name: c.get('name') || '',
         members: c.get('members') || [],
         admins: c.get('groupAdmins') || [],

ts/util/accountManager.ts

@@ -4,7 +4,10 @@ import { UserUtils } from '../session/utils';
 import { fromArrayBufferToBase64, fromHex, toHex } from '../session/utils/String';
 import { getOurPubKeyStrFromCache } from '../session/utils/User';
 import { trigger } from '../shims/events';
-import { forceNetworkDeletion, forceSyncConfigurationNowIfNeeded } from '../session/utils/syncUtils';
+import {
+  forceNetworkDeletion,
+  forceSyncConfigurationNowIfNeeded,
+} from '../session/utils/syncUtils';
 import { actions as userActions } from '../state/ducks/user';
 import { mn_decode, mn_encode } from '../session/crypto/mnemonic';
 import { ConversationTypeEnum } from '../models/conversation';
@@ -140,9 +143,9 @@ async function bouncyDeleteAccount(reason?: string) {
   try {
     window?.log?.info('DeleteAccount => Sending a last SyncConfiguration');
 
-
     // send deletion message to the network
-    await forceNetworkDeletion();
+    const ret = await forceNetworkDeletion();
+    debugger;
 
     // be sure to wait for the message being effectively sent. Otherwise we won't be able to encrypt it for our devices !
     await forceSyncConfigurationNowIfNeeded(true);