Skip to content

Commit db960af

Browse files
authored
Merge pull request #5190 from parasharrajat/synglogout
Sync Logout across tabs
2 parents cb48dd7 + fc4323c commit db960af

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

src/libs/actions/SignInRedirect.js

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,21 @@ function redirectToSignIn(errorMessage) {
4141
if (preferredLocale) {
4242
Onyx.set(ONYXKEYS.NVP_PREFERRED_LOCALE, preferredLocale);
4343
}
44-
if (errorMessage) {
45-
Onyx.set(ONYXKEYS.SESSION, {error: errorMessage});
46-
}
4744
if (activeClients && activeClients.length > 0) {
4845
Onyx.set(ONYXKEYS.ACTIVE_CLIENTS, activeClients);
4946
}
47+
48+
const session = {
49+
// We must set the authToken to null so that signOut action is triggered across other clients
50+
authToken: null,
51+
};
52+
53+
if (errorMessage) {
54+
session.error = errorMessage;
55+
}
56+
57+
// `Onyx.clear` reinitialize the Onyx instance with initial values so use `Onyx.merge` instead of `Onyx.set`.
58+
Onyx.merge(ONYXKEYS.SESSION, session);
5059
});
5160
}
5261

0 commit comments

Comments
 (0)