fix: restore logging out logic to fix a spinner issue

Expensify · Oct 16, 2023 · 12ecca0 · 12ecca0
1 parent eba5f0b
commit 12ecca0
Showing 1 changed file with 21 additions and 10 deletions.
diff --git a/src/pages/LogOutPreviousUserPage.js b/src/pages/LogOutPreviousUserPage.js
@@ -1,10 +1,12 @@
 import React, {useEffect} from 'react';
+import {Linking} from 'react-native';
 import lodashGet from 'lodash/get';
 import PropTypes from 'prop-types';
 import {withOnyx} from 'react-native-onyx';
 import ONYXKEYS from '../ONYXKEYS';
 import * as Session from '../libs/actions/Session';
 import FullScreenLoadingIndicator from '../components/FullscreenLoadingIndicator';
+import * as SessionUtils from '../libs/SessionUtils';
 
 const propTypes = {
     /** The data about the current session which will be set once the user is authenticated and we return to this component as an AuthScreen */
@@ -23,16 +25,25 @@ const defaultProps = {
 function LogOutPreviousUserPage(props) {
     useEffect(
         () => {
-            // We need to signin and fetch a new authToken, if a user was already authenticated in NewDot, and was redirected to OldDot
-            // and their authToken stored in Onyx becomes invalid.
-            // This workflow is triggered while setting up VBBA. User is redirected from NewDot to OldDot to set up 2FA, and then redirected back to NewDot
-            // On Enabling 2FA, authToken stored in Onyx becomes expired and hence we need to fetch new authToken
-            const shouldForceLogin = lodashGet(props, 'route.params.shouldForceLogin', '') === 'true';
-            if (shouldForceLogin) {
-                const email = lodashGet(props, 'route.params.email', '');
-                const shortLivedAuthToken = lodashGet(props, 'route.params.shortLivedAuthToken', '');
-                Session.signInWithShortLivedAuthToken(email, shortLivedAuthToken);
-            }
+            Linking.getInitialURL().then((transitionURL) => {
+                const sessionEmail = props.session.email;
+                const isLoggingInAsNewUser = SessionUtils.isLoggingInAsNewUser(transitionURL, sessionEmail);
+
+                if (isLoggingInAsNewUser) {
+                    Session.signOutAndRedirectToSignIn();
+                }
+
+                // We need to signin and fetch a new authToken, if a user was already authenticated in NewDot, and was redirected to OldDot
+                // and their authToken stored in Onyx becomes invalid.
+                // This workflow is triggered while setting up VBBA. User is redirected from NewDot to OldDot to set up 2FA, and then redirected back to NewDot
+                // On Enabling 2FA, authToken stored in Onyx becomes expired and hence we need to fetch new authToken
+                const shouldForceLogin = lodashGet(props, 'route.params.shouldForceLogin', '') === 'true';
+                if (shouldForceLogin) {
+                    const email = lodashGet(props, 'route.params.email', '');
+                    const shortLivedAuthToken = lodashGet(props, 'route.params.shortLivedAuthToken', '');
+                    Session.signInWithShortLivedAuthToken(email, shortLivedAuthToken);
+                }
+            });
         },
         // eslint-disable-next-line react-hooks/exhaustive-deps
         [],