Page MenuHomePhabricator
Files F2755049

D12698.diff
No OneTemporary
Actions

D12698.diff
View Options

diff --git a/native/components/background-identity-login-handler.react.js b/native/components/background-identity-login-handler.react.js
--- a/native/components/background-identity-login-handler.react.js
+++ b/native/components/background-identity-login-handler.react.js
@@ -8,6 +8,7 @@
logOutActionTypes,
useLogOut,
} from 'lib/actions/user-actions.js';
+import { isLoggedInToIdentityAndAuthoritativeKeyserver } from 'lib/selectors/user-selectors.js';
import { accountHasPassword } from 'lib/shared/account-utils.js';
import { securityUpdateLogoutText } from 'lib/types/alert-types.js';
import { useDispatchActionPromise } from 'lib/utils/redux-promise-utils.js';
@@ -15,6 +16,7 @@
import { usingCommServicesAccessToken } from 'lib/utils/services-utils.js';
import { fetchNativeKeychainCredentials } from '../account/native-credentials.js';
+import { useIsAppLoggedIn } from '../navigation/nav-selectors.js';
import Alert from '../utils/alert.js';
function BackgroundIdentityLoginHandler() {
@@ -25,7 +27,14 @@
accountHasPassword(state.currentUserInfo),
);
const hasAccessToken = useSelector(state => !!state.commServicesAccessToken);
- const dataLoaded = useSelector(state => state.dataLoaded);
+
+ const loggedIn = useSelector(isLoggedInToIdentityAndAuthoritativeKeyserver);
+ const navLoggedIn = useIsAppLoggedIn();
+
+ // We don't want to try identity login until both loggedIn and navLoggedIn are
+ // true. The former is to make sure that we will be able to successfully log
+ // in with identity. The latter is to address a race condition in ENG-8785.
+ const readyToTryIdentityLogin = loggedIn && navLoggedIn;
const callIdentityPasswordLogIn = useIdentityPasswordLogIn();
@@ -39,7 +48,7 @@
const logInIfPossibleElseLogOut = React.useCallback(async () => {
if (
hasAccessToken ||
- !dataLoaded ||
+ !readyToTryIdentityLogin ||
!usingCommServicesAccessToken ||
loginAttemptedRef.current
) {
@@ -80,7 +89,7 @@
}, [
callIdentityPasswordLogIn,
dispatchActionPromise,
- dataLoaded,
+ readyToTryIdentityLogin,
handleLogOutAndAlert,
hasAccessToken,
isAccountWithPassword,

File Metadata

Mime Type
text/plain
Expires
Thu, Sep 19, 9:24 PM (5 h, 55 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2142440
Default Alt Text
D12698.diff (2 KB)

Event Timeline