Skip to content

[FIX] SSO not working with 2FA (TOTP) #2978

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 11 commits into from
Mar 22, 2021
Merged

[FIX] SSO not working with 2FA (TOTP) #2978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e4ed7f7
Update AuthenticationWebView.js
gerzonc Mar 10, 2021
f052d8b
Updated loginTOTP
gerzonc Mar 12, 2021
4b48bfb
Added validation
gerzonc Mar 12, 2021
4071f78
Update rocketchat.js
gerzonc Mar 12, 2021
b209e73
Update rocketchat.js
gerzonc Mar 12, 2021
6c3af28
Update rocketchat.js
gerzonc Mar 12, 2021
c22fc91
Update rocketchat.js
gerzonc Mar 12, 2021
0247045
Fix resolve
gerzonc Mar 12, 2021
5071951
Remove incognito
gerzonc Mar 12, 2021
d427418
Merge branch 'develop' into fix.sso-saml-2fa
diegolmello Mar 22, 2021
9e0c188
Fix totp being requested on webview
diegolmello Mar 22, 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
34 changes: 23 additions & 11 deletions app/lib/rocketchat.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,18 +465,30 @@ const RocketChat = {
if (e.data?.error && (e.data.error === 'totp-required' || e.data.error === 'totp-invalid')) {
const { details } = e.data;
try {
reduxStore.dispatch(setUser({ username: params.user || params.username }));
const code = await twoFactor({ method: details?.method || 'totp', invalid: e.data.error === 'totp-invalid' });

// Force normalized params for 2FA starting RC 3.9.0.
const serverVersion = reduxStore.getState().server.version;
if (compareServerVersion(serverVersion, '3.9.0', methods.greaterThanOrEqualTo)) {
const user = params.user ?? params.username;
const password = params.password ?? params.ldapPass ?? params.crowdPassword;
params = { user, password };
const code = await twoFactor({ method: details?.method || 'totp', invalid: details?.error === 'totp-invalid' });

if (loginEmailPassword) {
reduxStore.dispatch(setUser({ username: params.user || params.username }));

// Force normalized params for 2FA starting RC 3.9.0.
const serverVersion = reduxStore.getState().server.version;
if (compareServerVersion(serverVersion, '3.9.0', methods.greaterThanOrEqualTo)) {
const user = params.user ?? params.username;
const password = params.password ?? params.ldapPass ?? params.crowdPassword;
params = { user, password };
}

return resolve(this.loginTOTP({ ...params, code: code?.twoFactorCode }, loginEmailPassword));
}

return resolve(this.loginTOTP({ ...params, code: code?.twoFactorCode }, loginEmailPassword));
return resolve(this.loginTOTP({
totp: {
login: {
...params
},
code: code?.twoFactorCode
}
}));
} catch {
// twoFactor was canceled
return reject();
Expand Down Expand Up @@ -511,7 +523,7 @@ const RocketChat = {
},

async loginOAuthOrSso(params) {
const result = await this.login(params);
const result = await this.loginTOTP(params);
reduxStore.dispatch(loginRequest({ resume: result.token }));
},

Expand Down
6 changes: 3 additions & 3 deletions app/views/AuthenticationWebView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class AuthenticationWebView extends React.PureComponent {
navigation.pop();
}

login = async(params) => {
login = (params) => {
const { logging } = this.state;
if (logging) {
return;
Expand All @@ -80,7 +80,7 @@ class AuthenticationWebView extends React.PureComponent {
this.setState({ logging: true });

try {
await RocketChat.loginOAuthOrSso(params);
RocketChat.loginOAuthOrSso(params);
} catch (e) {
console.warn(e);
}
Expand All @@ -89,7 +89,7 @@ class AuthenticationWebView extends React.PureComponent {
}

// eslint-disable-next-line react/sort-comp
debouncedLogin = debounce(params => this.login(params), 3000);
debouncedLogin = debounce(params => this.login(params), 3000, true);

tryLogin = debounce(async() => {
const { Accounts_Iframe_api_url, Accounts_Iframe_api_method } = this.props;
Expand Down