Sign in, out, or navigate on transition mount

src/ONYXKEYS.js

@@ -74,6 +74,7 @@ export default {
     // Information about the current session (authToken, accountID, email, loading, error)
     SESSION: 'session',
     BETAS: 'betas',
+    IS_LOADING_BETAS: 'isLoadingBetas',
 
     // NVP keys
     // Contains the user's payPalMe address

src/libs/Growl.js

@@ -6,7 +6,7 @@ const growlRef = React.createRef();
 const [isGrowlReady, setIsReady] = createOnReadyTask();
 
 /**
- * Show the growl notification
+ * Show the growl notification. If the ref is not available, retry until it is.
  *
  * @param {String} bodyText
  * @param {String} type

src/libs/Navigation/AppNavigator/MainDrawerNavigator.js

@@ -22,11 +22,15 @@ const propTypes = {
 
     /** Beta features list */
     betas: PropTypes.arrayOf(PropTypes.string),
+
+    /** Are the betas currently loading from the api? */
+    isLoadingBetas: PropTypes.bool,
 };
 
 const defaultProps = {
     reports: {},
     betas: [],
+    isLoadingBetas: true,
 };
 
 /**
@@ -48,7 +52,7 @@ const MainDrawerNavigator = (props) => {
     const initialParams = getInitialReportScreenParams(props.reports, !Permissions.canUseDefaultRooms(props.betas));
 
     // Wait until reports are fetched and there is a reportID in initialParams
-    if (!initialParams.reportID) {
+    if (!initialParams.reportID || props.isLoadingBetas) {
         return <FullScreenLoadingIndicator />;
     }
 
@@ -81,5 +85,8 @@ export default withOnyx({
     betas: {
         key: ONYXKEYS.BETAS,
     },
+    isLoadingBetas: {
+        key: ONYXKEYS.IS_LOADING_BETAS,
+    },
 })(MainDrawerNavigator);
 export {getInitialReportScreenParams};

src/libs/actions/Session/index.js

@@ -174,9 +174,10 @@ function fetchAccountDetails(login) {
  *
  * @param {String} authToken
  * @param {String} email
+ * @param {Boolean} shouldProcessImmediately
  * @return {Promise}
  */
-function createTemporaryLogin(authToken, email) {
+function createTemporaryLogin(authToken, email, shouldProcessImmediately = true) {
     const autoGeneratedLogin = Str.guid('expensify.cash-');
     const autoGeneratedPassword = Str.guid();
 
@@ -188,6 +189,7 @@ function createTemporaryLogin(authToken, email) {
         partnerUserSecret: autoGeneratedPassword,
         shouldRetry: false,
         forceNetworkRequest: true,
+        shouldProcessImmediately,
         email,
         includeEncryptedAuthToken: true,
     })
@@ -268,7 +270,7 @@ function signIn(password, twoFactorAuthCode) {
 function signInWithShortLivedToken(accountID, email, shortLivedToken) {
     Onyx.merge(ONYXKEYS.ACCOUNT, {...CONST.DEFAULT_ACCOUNT_DATA, loading: true});
 
-    createTemporaryLogin(shortLivedToken, email).then((response) => {
+    createTemporaryLogin(shortLivedToken, email, false).then((response) => {
         Onyx.merge(ONYXKEYS.SESSION, {
             accountID,
             email,

src/libs/actions/User.js

@@ -86,12 +86,14 @@ function closeAccount(message) {
 }
 
 function getBetas() {
+    Onyx.set(ONYXKEYS.IS_LOADING_BETAS, true);
     API.User_GetBetas().then((response) => {
         if (response.jsonCode !== 200) {
             return;
         }
 
         Onyx.set(ONYXKEYS.BETAS, response.betas);
+        Onyx.set(ONYXKEYS.IS_LOADING_BETAS, false);
     });
 }
 

src/libs/actions/WelcomeActions.js

@@ -68,7 +68,9 @@ function show({routes, toggleCreateMenu}) {
         // If we are rendering the SidebarScreen at the same time as a workspace route that means we've already created a workspace via workspace/new and should not open the global
         // create menu right now.
         const topRouteName = lodashGet(_.last(routes), 'name', '');
-        const isDisplayingWorkspaceRoute = topRouteName.toLowerCase().includes('workspace');
+        const loginWithShortLivedTokenRoute = _.find(routes, route => route.name === 'LogInWithShortLivedToken');
+        const exitingToWorkspaceRoute = lodashGet(loginWithShortLivedTokenRoute, 'params.exitTo', '') === 'workspace/new';
+        const isDisplayingWorkspaceRoute = topRouteName.toLowerCase().includes('workspace') || exitingToWorkspaceRoute;
 
         // It's also possible that we already have a workspace policy. In either case we will not toggle the menu but do still want to set the NVP in this case
         // since the user does not need to create a workspace.

src/pages/LogInWithShortLivedTokenPage.js

@@ -7,6 +7,7 @@ import ONYXKEYS from '../ONYXKEYS';
 import * as Session from '../libs/actions/Session';
 import FullScreenLoadingIndicator from '../components/FullscreenLoadingIndicator';
 import Navigation from '../libs/Navigation/Navigation';
+import Log from '../libs/Log';
 
 const propTypes = {
     /** The parameters needed to authenticate with a short lived token are in the URL */
@@ -55,38 +56,29 @@ class LogInWithShortLivedTokenPage extends Component {
 
         const isUserSignedIn = this.props.session && this.props.session.authToken;
         if (!isUserSignedIn) {
+            Log.info('[LoginWithShortLivedTokenPage] User not signed in - signing in with short lived token');
             Session.signInWithShortLivedToken(accountID, email, shortLivedToken);
             return;
         }
 
-        this.signOutIfNeeded(email);
-    }
-
-    componentDidUpdate() {
-        if (!lodashGet(this.props, 'session.authToken', null)) {
+        if (this.signOutIfNeeded(email)) {
             return;
         }
 
-        const email = lodashGet(this.props.route.params, 'email', '');
+        Log.info('[LoginWithShortLivedTokenPage] User signed in');
 
         // exitTo is URI encoded because it could contain a variable number of slashes (i.e. "workspace/new" vs "workspace/<ID>/card")
         const exitTo = decodeURIComponent(lodashGet(this.props.route.params, 'exitTo', ''));
-
-        if (this.signOutIfNeeded(email)) {
-            return;
-        }
-
         if (exitTo === ROUTES.WORKSPACE_NEW) {
             // New workspace creation is handled in AuthScreens, not in its own screen
+            Log.info('[LoginWithShortLivedTokenPage] exitTo is workspace/new - handling new workspace creation in AuthScreens');
             return;
         }
 
-        // In order to navigate to a modal, we first have to dismiss the current modal. But there is no current
-        // modal you say? I know, it confuses me too. Without dismissing the current modal, if the user cancels out
-        // of the workspace modal, then they will be routed back to
-        // /transition/<accountID>/<email>/<authToken>/workspace/<policyID>/card and we don't want that. We want them to go back to `/`
-        // and by calling dismissModal(), the /transition/... route is removed from history so the user will get taken to `/`
-        // if they cancel out of the new workspace modal.
+        // In order to navigate to a modal, we first have to dismiss the current modal. Without dismissing the current modal, if the user cancels out of the workspace modal,
+        // then they will be routed back to /transition/<accountID>/<email>/<authToken>/workspace/<policyID>/card and we don't want that. We want them to go back to `/`
+        // and by calling dismissModal(), the /transition/... route is removed from history so the user will get taken to `/` if they cancel out of the new workspace modal.
+        Log.info('[LoginWithShortLivedTokenPage] Dismissing LoginWithShortLivedTokenPage and navigating to exitTo');
         Navigation.dismissModal();
         Navigation.navigate(exitTo);
     }
@@ -105,6 +97,7 @@ class LogInWithShortLivedTokenPage extends Component {
             return false;
         }
 
+        Log.info('[LoginWithShortLivedTokenPage] Different user signed in - signing out');
         Session.signOutAndRedirectToSignIn();
         return true;
     }
@@ -121,10 +114,4 @@ export default withOnyx({
     session: {
         key: ONYXKEYS.SESSION,
     },
-
-    // We need to subscribe to the betas so that componentDidUpdate will run,
-    // causing us to exit to the proper page.
-    betas: {
-        key: ONYXKEYS.BETAS,
-    },
 })(LogInWithShortLivedTokenPage);