Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sign in, out, or navigate on transition mount #8257

Merged
merged 14 commits into from
Mar 23, 2022
+14 −25
Merged

Sign in, out, or navigate on transition mount #8257

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
acbdf28
Sign in, out, or navigate on transition mount
neil-marcellini Mar 18, 2022
a873630
Queue requests to sign in with a short lived token
neil-marcellini Mar 22, 2022
191c02f
Retry growls when the ref is not available
neil-marcellini Mar 22, 2022
e527f2e
Show a loading screen when the betas are loading
neil-marcellini Mar 22, 2022
2d63d2b
Remove setTimeout on Growl
marcaaron Mar 23, 2022
6e375bb
Fix CreateMenu from popping up when navigating to workspace page on s…
marcaaron Mar 23, 2022
151571b
do it for large screens too
marcaaron Mar 23, 2022
a77553c
add logs
marcaaron Mar 23, 2022
e1e594f
Merge remote-tracking branch 'origin/main' into neil-setup-transition
marcaaron Mar 23, 2022
7e65708
revert growl changes improve log
marcaaron Mar 23, 2022
38c4b8a
Remove IS_LOADING_BETAS
marcaaron Mar 23, 2022
282a9d1
remove isLoadingBetas
marcaaron Mar 23, 2022
25bb9c4
Remove shouldProcessImmediately
marcaaron Mar 23, 2022
2996c88
remove parseInt
marcaaron Mar 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 1 addition & 19 deletions src/pages/LogInWithShortLivedTokenPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,24 +58,12 @@ class LogInWithShortLivedTokenPage extends Component {
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', '');

// 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
return;
Expand Down Expand Up @@ -121,10 +109,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);