fix: fix transitioning issue from old dot

src/libs/Navigation/AppNavigator/AuthScreens.js

@@ -35,6 +35,7 @@ import * as SessionUtils from '../../SessionUtils';
 import NotFoundPage from '../../../pages/ErrorPage/NotFoundPage';
 import getRootNavigatorScreenOptions from './getRootNavigatorScreenOptions';
 import DemoSetupPage from '../../../pages/DemoSetupPage';
+import getCurrentUrl from '../currentUrl';
 
 let timezone;
 let currentAccountID;
@@ -145,6 +146,16 @@ class AuthScreens extends React.Component {
  }
 
  componentDidMount() {
+ const currentUrl = getCurrentUrl();
+
+ const isLoggingInAsNewUser = SessionUtils.isLoggingInAsNewUser(currentUrl, this.props.session.email);
+ // Sign out the current user if we're transitioning with a different user
+ const isTransitioning = currentUrl.includes(ROUTES.TRANSITION_BETWEEN_APPS);
+ if (isLoggingInAsNewUser && isTransitioning) {
+ Session.signOutAndRedirectToSignIn();
+ return;
+ }
+
  NetworkConnection.listenForReconnect();
  NetworkConnection.onReconnect(() => {
  if (isLoadingApp) {

src/libs/actions/App.js

@@ -389,9 +389,6 @@ function setUpPoliciesAndNavigate(session, shouldNavigateToAdminChat) {
 
  // Sign out the current user if we're transitioning with a different user
  const isTransitioning = Str.startsWith(url.pathname, Str.normalizeUrl(ROUTES.TRANSITION_BETWEEN_APPS));
- if (isLoggingInAsNewUser && isTransitioning) {
- Session.signOut();
- }
 
  const shouldCreateFreePolicy = !isLoggingInAsNewUser && isTransitioning && exitTo === ROUTES.WORKSPACE_NEW;
  if (shouldCreateFreePolicy) {

src/pages/LogOutPreviousUserPage.js

@@ -1,12 +1,10 @@
 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 */
@@ -25,25 +23,16 @@ const defaultProps = {
 function LogOutPreviousUserPage(props) {
  useEffect(
  () => {
- 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);
- }
- });
+ // 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
  [],