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

[FIX] Unnecessary navigation on server forced logout #3428

Merged
merged 4 commits into from
Oct 14, 2021
Merged

[FIX] Unnecessary navigation on server forced logout #3428

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
19ec56e
[FIX] Review the logout flow
reinaldonetof Oct 6, 2021
9ff567b
minor tweaks
reinaldonetof Oct 6, 2021
4d0a076
Merge branch 'develop' into fix.review-logout
diegolmello Oct 7, 2021
60a40ca
Merge branch 'develop' into fix.review-logout
diegolmello Oct 14, 2021
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
3 changes: 0 additions & 3 deletions app/sagas/login.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import { encryptionInit, encryptionStop } from '../actions/encryption';
import UserPreferences from '../lib/userPreferences';
import { inquiryRequest, inquiryReset } from '../ee/omnichannel/actions/inquiry';
import { isOmnichannelStatusAvailable } from '../ee/omnichannel/lib';
import Navigation from '../lib/Navigation';

const getServer = state => state.server.server;
const loginWithPasswordCall = args => RocketChat.loginWithPassword(args);
Expand Down Expand Up @@ -191,8 +190,6 @@ const handleLogout = function* handleLogout({ forcedByServer }) {
yield put(appStart({ root: ROOT_OUTSIDE }));
showErrorAlert(I18n.t('Logged_out_by_server'), I18n.t('Oops'));
yield delay(300);
Navigation.navigate('NewServerView');
yield delay(300);
EventEmitter.emit('NewServer', { server });
} else {
const serversDB = database.servers;
Expand Down