make AccountManager functions only rather than full static class

ts/components/session/ActionsPanel.tsx

@@ -22,7 +22,7 @@ import {
 } from '../../data/data';
 import { OnionPaths } from '../../session/onions';
 import { getMessageQueue } from '../../session/sending';
-import { AccountManager } from '../../util';
+import { clearSessionsAndPreKeys } from '../../util/accountManager';
 // tslint:disable-next-line: no-import-side-effect no-submodule-imports
 
 export enum SectionType {
@@ -90,7 +90,7 @@ class ActionsPanelPrivate extends React.Component<Props> {
     void this.showResetSessionIDDialogIfNeeded();
 
     // remove existing prekeys, sign prekeys and sessions
-    void AccountManager.clearSessionsAndPreKeys();
+    void clearSessionsAndPreKeys();
 
     // Do this only if we created a new Session ID, or if we already received the initial configuration message
 

ts/components/session/LeftPaneSettingSection.tsx

@@ -14,7 +14,7 @@ import { SessionSearchInput } from './SessionSearchInput';
 import { SessionSettingCategory } from './settings/SessionSettings';
 import { DefaultTheme } from 'styled-components';
 import { LeftPaneSectionHeader } from './LeftPaneSectionHeader';
-import { AccountManager } from '../../util';
+import { deleteAccount } from '../../util/accountManager';
 
 interface Props {
   settingsCategory: SessionSettingCategory;
@@ -180,7 +180,7 @@ export class LeftPaneSettingSection extends React.Component<Props, State> {
       title,
       message,
       messageSub,
-      resolve: AccountManager.deleteAccount,
+      resolve: deleteAccount,
       okTheme: 'danger',
     });
   }

ts/components/session/SessionIDResetDialog.tsx

@@ -4,7 +4,7 @@ import { SessionModal } from './SessionModal';
 import { SessionButton, SessionButtonColor } from './SessionButton';
 import { DefaultTheme, withTheme } from 'styled-components';
 import { SessionIcon, SessionIconSize, SessionIconType } from './icon';
-import { AccountManager } from '../../util';
+import { deleteAccount } from '../../util/accountManager';
 
 type Props = {
   onClose: any;
@@ -41,7 +41,7 @@ const SessionIDResetDialogInner = (props: Props) => {
         <SessionButton
           text="Upgrade Now"
           onClick={() => {
-            void AccountManager.deleteAccount('Session ID Upgrade');
+            void deleteAccount('Session ID Upgrade');
             props.onClose();
           }}
           buttonColor={SessionButtonColor.Danger}

ts/components/session/registration/RegistrationTabs.tsx

@@ -14,10 +14,12 @@ import { TabLabel, TabType } from './TabLabel';
 import { PasswordUtil } from '../../../util';
 import { trigger } from '../../../shims/events';
 import {
-  AccountManager,
+  generateMnemonic,
+  registerSingleDevice,
   sessionGenerateKeyPair,
+  signInByLinkingDevice,
 } from '../../../util/accountManager';
-import { fromHex, fromHexToArray } from '../../../session/utils/String';
+import { fromHex } from '../../../session/utils/String';
 import { TaskTimedOutError } from '../../../session/utils/Promise';
 
 export const MAX_USERNAME_LENGTH = 20;
@@ -138,11 +140,7 @@ export async function signUp(signUpDetails: {
   try {
     await resetRegistration();
     await window.setPassword(password);
-    await AccountManager.registerSingleDevice(
+    await registerSingleDevice(generatedRecoveryPhrase, 'english', trimName);
-      generatedRecoveryPhrase,
-      'english',
-      trimName
-    );
     await createOrUpdateItem({
       id: 'hasSyncedInitialConfigurationItem',
       value: true,
@@ -191,11 +189,7 @@ export async function signInWithRecovery(signInDetails: {
     await resetRegistration();
     await window.setPassword(password);
 
-    await AccountManager.registerSingleDevice(
+    await registerSingleDevice(userRecoveryPhrase, 'english', trimName);
-      userRecoveryPhrase,
-      'english',
-      trimName
-    );
     trigger('openInbox');
   } catch (e) {
     await resetRegistration();
@@ -225,7 +219,7 @@ export async function signInWithLinking(signInDetails: {
   try {
     await resetRegistration();
     await window.setPassword(password);
-    await AccountManager.signInByLinkingDevice(userRecoveryPhrase, 'english');
+    await signInByLinkingDevice(userRecoveryPhrase, 'english');
 
     let displayNameFromNetwork = '';
 
@@ -311,7 +305,7 @@ export class RegistrationTabs extends React.Component<any, State> {
   private async generateMnemonicAndKeyPair() {
     if (this.state.generatedRecoveryPhrase === '') {
       const language = 'english';
-      const mnemonic = await AccountManager.generateMnemonic(language);
+      const mnemonic = await generateMnemonic(language);
 
       let seedHex = window.mnemonic.mn_decode(mnemonic, language);
       // handle shorter than 32 bytes seeds

ts/util/accountManager.ts

@@ -59,36 +59,29 @@ const generateKeypair = async (mnemonic: string, mnemonicLanguage: string) => {
   return sessionGenerateKeyPair(seed);
 };
 
-// TODO not sure why AccountManager was a singleton before. Can we get rid of it as a singleton?
+/**
-// tslint:disable-next-line: no-unnecessary-class
-export class AccountManager {
-  /**
  * Sign in with a recovery phrase. We won't try to recover an existing profile name
  * @param mnemonic the mnemonic the user duly saved in a safe place. We will restore his sessionID based on this.
  * @param mnemonicLanguage 'english' only is supported
  * @param profileName the displayName to use for this user
  */
-  public static async signInWithRecovery(
+export async function signInWithRecovery(
   mnemonic: string,
   mnemonicLanguage: string,
   profileName: string
-  ) {
+) {
-    return AccountManager.registerSingleDevice(
+  return registerSingleDevice(mnemonic, mnemonicLanguage, profileName);
-      mnemonic,
+}
-      mnemonicLanguage,
-      profileName
-    );
-  }
 
-  /**
+/**
  * Sign in with a recovery phrase but trying to recover display name and avatar from the first encountered configuration message.
  * @param mnemonic the mnemonic the user duly saved in a safe place. We will restore his sessionID based on this.
  * @param mnemonicLanguage 'english' only is supported
  */
-  public static async signInByLinkingDevice(
+export async function signInByLinkingDevice(
   mnemonic: string,
   mnemonicLanguage: string
-  ) {
+) {
   if (!mnemonic) {
     throw new Error(
       'Session always needs a mnemonic. Either generated or given by the user'
@@ -100,25 +93,25 @@ export class AccountManager {
 
   const identityKeyPair = await generateKeypair(mnemonic, mnemonicLanguage);
   UserUtils.setSignInByLinking(true);
-    await AccountManager.createAccount(identityKeyPair);
+  await createAccount(identityKeyPair);
   UserUtils.saveRecoveryPhrase(mnemonic);
-    await AccountManager.clearSessionsAndPreKeys();
+  await clearSessionsAndPreKeys();
   const pubKeyString = toHex(identityKeyPair.pubKey);
 
   // await for the first configuration message to come in.
-    await AccountManager.registrationDone(pubKeyString, '');
+  await registrationDone(pubKeyString, '');
-  }
+}
-  /**
+/**
  * This is a signup. User has no recovery and does not try to link a device
  * @param mnemonic The mnemonic generated on first app loading and to use for this brand new user
  * @param mnemonicLanguage only 'english' is supported
  * @param profileName the display name to register toi
  */
-  public static async registerSingleDevice(
+export async function registerSingleDevice(
   generatedMnemonic: string,
   mnemonicLanguage: string,
   profileName: string
-  ) {
+) {
   if (!generatedMnemonic) {
     throw new Error(
       'Session always needs a mnemonic. Either generated or given by the user'
@@ -136,25 +129,25 @@ export class AccountManager {
     mnemonicLanguage
   );
 
-    await AccountManager.createAccount(identityKeyPair);
+  await createAccount(identityKeyPair);
   UserUtils.saveRecoveryPhrase(generatedMnemonic);
-    await AccountManager.clearSessionsAndPreKeys();
+  await clearSessionsAndPreKeys();
   await UserUtils.setLastProfileUpdateTimestamp(Date.now());
 
   const pubKeyString = toHex(identityKeyPair.pubKey);
-    await AccountManager.registrationDone(pubKeyString, profileName);
+  await registrationDone(pubKeyString, profileName);
-  }
+}
 
-  public static async generateMnemonic(language = 'english') {
+export async function generateMnemonic(language = 'english') {
   // Note: 4 bytes are converted into 3 seed words, so length 12 seed words
   // (13 - 1 checksum) are generated using 12 * 4 / 3 = 16 bytes.
   const seedSize = 16;
   const seed = (await getSodium()).randombytes_buf(seedSize);
   const hex = toHex(seed);
   return window.mnemonic.mn_encode(hex, language);
-  }
+}
 
-  public static async clearSessionsAndPreKeys() {
+export async function clearSessionsAndPreKeys() {
   window.log.info('clearing all sessions');
   // During secondary device registration we need to keep our prekeys sent
   // to other pubkeys
@@ -165,9 +158,9 @@ export class AccountManager {
     removeAllContactSignedPreKeys(),
     removeAllSessions(),
   ]);
-  }
+}
 
-  public static async deleteAccount(reason?: string) {
+export async function deleteAccount(reason?: string) {
   const deleteEverything = async () => {
     window.log.info(
       'configuration message sent successfully. Deleting everything'
@@ -198,9 +191,9 @@ export class AccountManager {
     }
   }
   window.restart();
-  }
+}
 
-  private static async createAccount(identityKeyPair: any) {
+async function createAccount(identityKeyPair: any) {
   const sodium = await getSodium();
   let password = fromArrayBufferToBase64(sodium.randombytes_buf(16));
   password = password.substring(0, password.length - 2);
@@ -233,12 +226,9 @@ export class AccountManager {
   );
 
   await window.textsecure.storage.user.setNumberAndDeviceId(pubKeyString, 1);
-  }
+}
 
-  private static async registrationDone(
+async function registrationDone(ourPubkey: string, displayName: string) {
-    ourPubkey: string,
-    displayName: string
-  ) {
   window.log.info('registration done');
 
   window.textsecure.storage.put('primaryDevicePubKey', ourPubkey);
@@ -257,5 +247,4 @@ export class AccountManager {
   window.Whisper.Registration.markDone();
   window.log.info('dispatching registration event');
   trigger('registration_done');
-  }
 }

ts/util/index.ts

@@ -10,7 +10,6 @@ import * as AttachmentUtil from './attachmentsUtil';
 import * as LinkPreviewUtil from './linkPreviewFetch';
 
 export * from './blockedNumberController';
-export * from './accountManager';
 
 export {
   arrayBufferToObjectURL,