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] Logout from custom oauth when using password #2435

Merged
merged 3 commits into from
Aug 28, 2020
Merged

[FIX] Logout from custom oauth when using password #2435

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0090e75
[FIX] Logout from custom oauth when using password
djorkaeffalexandre Aug 27, 2020
bbab390
Remove an useless const
djorkaeffalexandre Aug 27, 2020
b178de1
Merge branch 'develop' into fix.clear-cookies
diegolmello Aug 28, 2020
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
6 changes: 2 additions & 4 deletions app/lib/rocketchat.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ const RocketChat = {
try {
reduxStore.dispatch(setUser({ username: params.user || params.username }));
const code = await twoFactor({ method: details?.method || 'totp', invalid: e.data.error === 'totp-invalid' });
return resolve(this.loginTOTP({ ...params, code: code?.twoFactorCode }));
return resolve(this.loginTOTP({ ...params, code: code?.twoFactorCode }, loginEmailPassword));
} catch {
// twoFactor was canceled
return reject();
Expand Down Expand Up @@ -390,9 +390,7 @@ const RocketChat = {
};
}

const loginEmailPassword = true;

return this.loginTOTP(params, loginEmailPassword);
return this.loginTOTP(params, true);
},

async loginOAuthOrSso(params) {
Expand Down