Merge pull request Expensify#81984 from software-mansion-labs/war-in/fix-require-2fa-domain

fix: keep user in ND until they setup 2FA when required

Author: cead22

src/libs/HybridApp.ts

@@ -4,7 +4,7 @@ import type {OnyxEntry} from 'react-native-onyx';
 import CONFIG from '@src/CONFIG';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {Credentials, HybridApp, Session, TryNewDot} from '@src/types/onyx';
+import type {Account, Credentials, HybridApp, Session, TryNewDot} from '@src/types/onyx';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import {closeReactNativeApp, setReadyToShowAuthScreens, setUseNewDotSignInPage} from './actions/HybridApp';
 import Log from './Log';
@@ -18,36 +18,45 @@ let currentHybridApp: OnyxEntry<HybridApp>;
 let currentTryNewDot: OnyxEntry<TryNewDot>;
 let currentCredentials: OnyxEntry<Credentials>;
 let currentSession: OnyxEntry<Session>;
+let currentAccount: OnyxEntry<Account>;
 
 Onyx.connectWithoutView({
     key: ONYXKEYS.HYBRID_APP,
     callback: (hybridApp) => {
         currentHybridApp = hybridApp;
-        signInToOldDotAndChooseExperience(hybridApp, currentTryNewDot, currentCredentials, currentSession);
+        signInToOldDotAndChooseExperience(hybridApp, currentTryNewDot, currentCredentials, currentSession, currentAccount);
     },
 });
 
 Onyx.connectWithoutView({
     key: ONYXKEYS.NVP_TRY_NEW_DOT,
     callback: (tryNewDot) => {
         currentTryNewDot = tryNewDot;
-        signInToOldDotAndChooseExperience(currentHybridApp, tryNewDot, currentCredentials, currentSession);
+        signInToOldDotAndChooseExperience(currentHybridApp, tryNewDot, currentCredentials, currentSession, currentAccount);
     },
 });
 
 Onyx.connectWithoutView({
     key: ONYXKEYS.CREDENTIALS,
     callback: (credentials) => {
         currentCredentials = credentials;
-        signInToOldDotAndChooseExperience(currentHybridApp, currentTryNewDot, credentials, currentSession);
+        signInToOldDotAndChooseExperience(currentHybridApp, currentTryNewDot, credentials, currentSession, currentAccount);
     },
 });
 
 Onyx.connectWithoutView({
     key: ONYXKEYS.SESSION,
     callback: (session: OnyxEntry<Session>) => {
         currentSession = session;
-        signInToOldDotAndChooseExperience(currentHybridApp, currentTryNewDot, currentCredentials, session);
+        signInToOldDotAndChooseExperience(currentHybridApp, currentTryNewDot, currentCredentials, session, currentAccount);
+    },
+});
+
+Onyx.connectWithoutView({
+    key: ONYXKEYS.ACCOUNT,
+    callback: (account: OnyxEntry<Account>) => {
+        currentAccount = account;
+        signInToOldDotAndChooseExperience(currentHybridApp, currentTryNewDot, currentCredentials, currentSession, account);
     },
 });
 
@@ -70,7 +79,13 @@ function shouldUseOldApp(tryNewDot: TryNewDot) {
  * Signs the user into OldDot when session and credentials are available,
  * then decides whether to stay in NewDot or switch to OldDot based on `nvp_tryNewDot`.
  */
-function signInToOldDotAndChooseExperience(hybridApp: OnyxEntry<HybridApp>, tryNewDot: OnyxEntry<TryNewDot>, credentials: OnyxEntry<Credentials>, session: OnyxEntry<Session>) {
+function signInToOldDotAndChooseExperience(
+    hybridApp: OnyxEntry<HybridApp>,
+    tryNewDot: OnyxEntry<TryNewDot>,
+    credentials: OnyxEntry<Credentials>,
+    session: OnyxEntry<Session>,
+    account: OnyxEntry<Account>,
+) {
     if (!CONFIG.IS_HYBRID_APP) {
         return;
     }
@@ -84,7 +99,7 @@ function signInToOldDotAndChooseExperience(hybridApp: OnyxEntry<HybridApp>, tryN
         return;
     }
 
-    if (!credentials?.autoGeneratedLogin || !credentials?.autoGeneratedPassword) {
+    if (!credentials?.autoGeneratedLogin || !credentials?.autoGeneratedPassword || account?.requiresTwoFactorAuth === undefined || account?.needsTwoFactorAuthSetup === undefined) {
         return;
     }
 
@@ -106,7 +121,7 @@ function signInToOldDotAndChooseExperience(hybridApp: OnyxEntry<HybridApp>, tryN
 
     if (tryNewDot !== undefined) {
         setUseNewDotSignInPage(false).then(() => {
-            if (shouldUseOldApp(tryNewDot)) {
+            if (shouldUseOldApp(tryNewDot) && (!account?.needsTwoFactorAuthSetup || account?.requiresTwoFactorAuth)) {
                 closeReactNativeApp({shouldSetNVP: false, isTrackingGPS: false});
             } else {
                 setReadyToShowAuthScreens(true);

src/pages/settings/Security/TwoFactorAuth/SuccessPage.tsx

@@ -1,26 +1,41 @@
 import React, {useCallback, useEffect} from 'react';
+import type {OnyxEntry} from 'react-native-onyx';
 import ConfirmationPage from '@components/ConfirmationPage';
 import LottieAnimations from '@components/LottieAnimations';
 import useEnvironment from '@hooks/useEnvironment';
 import useLocalize from '@hooks/useLocalize';
+import useOnyx from '@hooks/useOnyx';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {TwoFactorAuthNavigatorParamList} from '@libs/Navigation/types';
+import {closeReactNativeApp} from '@userActions/HybridApp';
 import {openLink} from '@userActions/Link';
 import {quitAndNavigateBack} from '@userActions/TwoFactorAuthActions';
+import CONFIG from '@src/CONFIG';
 import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
+import type {TryNewDot} from '@src/types/onyx';
 import TwoFactorAuthWrapper from './TwoFactorAuthWrapper';
 
 type SuccessPageProps = PlatformStackScreenProps<TwoFactorAuthNavigatorParamList, typeof SCREENS.TWO_FACTOR_AUTH.SUCCESS>;
 
+function classicRedirectDismissedSelector(tryNewDot: OnyxEntry<TryNewDot>) {
+    return tryNewDot?.classicRedirect?.dismissed;
+}
+
 function SuccessPage({route}: SuccessPageProps) {
     const {translate} = useLocalize();
     const {environmentURL} = useEnvironment();
     const styles = useThemeStyles();
 
+    const [isClassicRedirectDismissed] = useOnyx(ONYXKEYS.NVP_TRY_NEW_DOT, {
+        selector: classicRedirectDismissedSelector,
+        canBeMissing: true,
+    });
+
     const goBack = useCallback(() => {
         quitAndNavigateBack(route.params?.backTo ?? ROUTES.SETTINGS_2FA_ROOT.getRoute());
     }, [route.params?.backTo]);
@@ -49,6 +64,10 @@ function SuccessPage({route}: SuccessPageProps) {
                 shouldShowButton
                 buttonText={translate('common.buttonConfirm')}
                 onButtonPress={() => {
+                    if (CONFIG.IS_HYBRID_APP && isClassicRedirectDismissed) {
+                        closeReactNativeApp({shouldSetNVP: false, isTrackingGPS: false});
+                        return;
+                    }
                     goBack();
                     if (route.params?.forwardTo) {
                         openLink(route.params.forwardTo, environmentURL);