CW-566-Cake2FA-Bypass-Bug (#1275)

* fix: TOTP 2FA Bug * fix: key switch error * Fix 2fa preset issue --------- Co-authored-by: OmarHatem <[email protected]>
cake-tech · Jan 27, 2024 · f68987b · f68987b
1 parent fc352a6
commit f68987b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/lib/store/settings_store.dart b/lib/store/settings_store.dart
@@ -997,7 +997,7 @@ abstract class SettingsStoreBase with Store {
     final totpSecretKey = await SecureKey.getString(
           secureStorage: secureStorage,
           sharedPreferences: sharedPreferences,
-          key: SecureKey.useTOTP2FA,
+          key: SecureKey.totpSecretKey,
         ) ??
         '';
 
@@ -1243,7 +1243,7 @@ abstract class SettingsStoreBase with Store {
     totpSecretKey = await SecureKey.getString(
           secureStorage: _secureStorage,
           sharedPreferences: sharedPreferences,
-          key: SecureKey.useTOTP2FA,
+          key: SecureKey.totpSecretKey,
         ) ??
         totpSecretKey;
 

diff --git a/lib/view_model/set_up_2fa_viewmodel.dart b/lib/view_model/set_up_2fa_viewmodel.dart
@@ -27,7 +27,9 @@ abstract class Setup2FAViewModelBase with Store {
         unhighlightTabs = false,
         selected2FASettings = ObservableList<VerboseControlSettings>(),
         state = InitialExecutionState() {
-    selectCakePreset(selectedCake2FAPreset);
+    if (selectedCake2FAPreset != Cake2FAPresetsOptions.none) {
+      selectCakePreset(selectedCake2FAPreset);
+    }
     reaction((_) => state, _saveLastAuthTime);
   }