Skip to content

fix(login): don't cancel login saga on 2s timeout (#7333) #7340

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

Merged
diegolmello merged 2 commits into from
May 26, 2026
Merged

fix(login): don't cancel login saga on 2s timeout (#7333) #7340

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd10b38
fix: don't cancel login saga on 2s timeout (stranded login screen)
diegolmello May 25, 2026
469ac7f
Merge branch 'develop' into fix-login-conditional-cancel
Rohit3523 May 26, 2026
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
10 changes: 8 additions & 2 deletions app/sagas/login.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,11 +479,17 @@ const root = function* root() {
while (true) {
const params = yield take(types.LOGIN.SUCCESS);
const loginSuccessTask = yield fork(handleLoginSuccess, params);
yield race({
// Only cancel handleLoginSuccess if a workspace switch interrupts it.
// Cancelling on the 2s timeout would rip the saga before it reaches
// appStart(ROOT_INSIDE), stranding users on the login screen when
// permissions/enterprise fetches run long (issue #7333).
const { selectRequest } = yield race({
selectRequest: take(types.SERVER.SELECT_REQUEST),
timeout: delay(2000)
});
yield cancel(loginSuccessTask);
if (selectRequest) {
yield cancel(loginSuccessTask);
}
}
};
export default root;
Loading