From b0f22380625c45ed09f3af2b35e12d6ae1358df1 Mon Sep 17 00:00:00 2001
From: schmanu <manu@safe.global>
Date: Mon, 9 Oct 2023 12:11:42 +0200
Subject: [PATCH] fix: simplify MFA setup

---
 .../SignerAccountMFA/PasswordForm.tsx         | 32 ++++---------------
 .../settings/SignerAccountMFA/helper.ts       | 28 +---------------
 2 files changed, 8 insertions(+), 52 deletions(-)

diff --git a/src/components/settings/SignerAccountMFA/PasswordForm.tsx b/src/components/settings/SignerAccountMFA/PasswordForm.tsx
index 0f4d905974..f40e2e0522 100644
--- a/src/components/settings/SignerAccountMFA/PasswordForm.tsx
+++ b/src/components/settings/SignerAccountMFA/PasswordForm.tsx
@@ -1,40 +1,33 @@
-import { DeviceShareRecovery } from '@/hooks/wallets/mpc/recovery/DeviceShareRecovery'
 import { SecurityQuestionRecovery } from '@/hooks/wallets/mpc/recovery/SecurityQuestionRecovery'
-import { Typography, TextField, FormControlLabel, Checkbox, Button, Box } from '@mui/material'
+import { Typography, TextField, Button, Box } from '@mui/material'
 import { type Web3AuthMPCCoreKit } from '@web3auth/mpc-core-kit'
 import { useState, useMemo } from 'react'
-import { Controller, useForm } from 'react-hook-form'
+import { useForm } from 'react-hook-form'
 import { enableMFA } from './helper'
 
 enum PasswordFieldNames {
   oldPassword = 'oldPassword',
   newPassword = 'newPassword',
   confirmPassword = 'confirmPassword',
-  storeDeviceShare = 'storeDeviceShare',
 }
 
 type PasswordFormData = {
   [PasswordFieldNames.oldPassword]: string | undefined
   [PasswordFieldNames.newPassword]: string
   [PasswordFieldNames.confirmPassword]: string
-  [PasswordFieldNames.storeDeviceShare]: boolean
 }
 
 export const PasswordForm = ({ mpcCoreKit }: { mpcCoreKit: Web3AuthMPCCoreKit }) => {
   const formMethods = useForm<PasswordFormData>({
     mode: 'all',
-    defaultValues: async () => {
-      const isDeviceShareStored = await new DeviceShareRecovery(mpcCoreKit).isEnabled()
-      return {
-        [PasswordFieldNames.confirmPassword]: '',
-        [PasswordFieldNames.oldPassword]: undefined,
-        [PasswordFieldNames.newPassword]: '',
-        [PasswordFieldNames.storeDeviceShare]: isDeviceShareStored,
-      }
+    defaultValues: {
+      [PasswordFieldNames.confirmPassword]: '',
+      [PasswordFieldNames.oldPassword]: undefined,
+      [PasswordFieldNames.newPassword]: '',
     },
   })
 
-  const { register, formState, getValues, control, handleSubmit } = formMethods
+  const { register, formState, getValues, handleSubmit } = formMethods
 
   const [enablingMFA, setEnablingMFA] = useState(false)
 
@@ -100,17 +93,6 @@ export const PasswordForm = ({ mpcCoreKit }: { mpcCoreKit: Web3AuthMPCCoreKit })
           })}
         />
 
-        <Controller
-          control={control}
-          name={PasswordFieldNames.storeDeviceShare}
-          render={({ field: { value, ...field } }) => (
-            <FormControlLabel
-              control={<Checkbox checked={value ?? false} {...field} />}
-              label="Do not ask for second factor on this device"
-            />
-          )}
-        />
-
         <Button
           sx={{ justifySelf: 'flex-start' }}
           disabled={!formMethods.formState.isValid || enablingMFA}
diff --git a/src/components/settings/SignerAccountMFA/helper.ts b/src/components/settings/SignerAccountMFA/helper.ts
index b9eb7a1f37..4c39a02a49 100644
--- a/src/components/settings/SignerAccountMFA/helper.ts
+++ b/src/components/settings/SignerAccountMFA/helper.ts
@@ -1,11 +1,8 @@
-import { DeviceShareRecovery } from '@/hooks/wallets/mpc/recovery/DeviceShareRecovery'
 import { SecurityQuestionRecovery } from '@/hooks/wallets/mpc/recovery/SecurityQuestionRecovery'
 import { logError } from '@/services/exceptions'
 import ErrorCodes from '@/services/exceptions/ErrorCodes'
 import { asError } from '@/services/exceptions/utils'
-import { getPubKeyPoint } from '@tkey-mpc/common-types'
 import { type Web3AuthMPCCoreKit } from '@web3auth/mpc-core-kit'
-import BN from 'bn.js'
 
 export const isMFAEnabled = (mpcCoreKit: Web3AuthMPCCoreKit) => {
   if (!mpcCoreKit) {
@@ -20,18 +17,15 @@ export const enableMFA = async (
   {
     newPassword,
     oldPassword,
-    storeDeviceShare,
   }: {
     newPassword: string
     oldPassword: string | undefined
-    storeDeviceShare: boolean
   },
 ) => {
   if (!mpcCoreKit) {
     return
   }
   const securityQuestions = new SecurityQuestionRecovery(mpcCoreKit)
-  const deviceShareRecovery = new DeviceShareRecovery(mpcCoreKit)
   try {
     // 1. setup device factor with password recovery
     await securityQuestions.upsertPassword(newPassword, oldPassword)
@@ -39,30 +33,10 @@ export const enableMFA = async (
     if (!securityQuestionFactor) {
       throw Error('Could not recover using the new password recovery')
     }
-    // We commit the new password separately
-    // It is necessary to be able to input the password factor before removing the (active) device factor
-    await mpcCoreKit.commitChanges()
 
     if (!isMFAEnabled(mpcCoreKit)) {
       // 2. enable MFA in mpcCoreKit
-      const recoveryFactor = await mpcCoreKit.enableMFA({})
-
-      // 3. remove the recovery factor the mpcCoreKit creates
-      const recoverKey = new BN(recoveryFactor, 'hex')
-      const recoverPubKey = getPubKeyPoint(recoverKey)
-      await mpcCoreKit.deleteFactor(recoverPubKey, recoverKey)
-    }
-
-    const hasDeviceShare = await deviceShareRecovery.isEnabled()
-
-    if (!hasDeviceShare && storeDeviceShare) {
-      await deviceShareRecovery.createAndStoreDeviceFactor()
-    }
-
-    if (hasDeviceShare && !storeDeviceShare) {
-      // Switch to password recovery factor such that we can delete the device factor
-      await mpcCoreKit.inputFactorKey(new BN(securityQuestionFactor, 'hex'))
-      await deviceShareRecovery.removeDeviceFactor()
+      await mpcCoreKit.enableMFA({}, false)
     }
 
     await mpcCoreKit.commitChanges()