From 0090e759e2fb999ade5323f457b16821d4377960 Mon Sep 17 00:00:00 2001 From: Djorkaeff Alexandre Date: Thu, 27 Aug 2020 10:35:26 -0300 Subject: [PATCH 1/2] [FIX] Logout from custom oauth when using password --- app/lib/rocketchat.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/lib/rocketchat.js b/app/lib/rocketchat.js index 64a5c2ca820..e7fcb25e4cb 100644 --- a/app/lib/rocketchat.js +++ b/app/lib/rocketchat.js @@ -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(); From bbab390c9ed06e3b40f99e9e209e7a51ebc57458 Mon Sep 17 00:00:00 2001 From: Djorkaeff Alexandre Date: Thu, 27 Aug 2020 10:46:25 -0300 Subject: [PATCH 2/2] Remove an useless const --- app/lib/rocketchat.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/lib/rocketchat.js b/app/lib/rocketchat.js index e7fcb25e4cb..e2130cbf6ab 100644 --- a/app/lib/rocketchat.js +++ b/app/lib/rocketchat.js @@ -390,9 +390,7 @@ const RocketChat = { }; } - const loginEmailPassword = true; - - return this.loginTOTP(params, loginEmailPassword); + return this.loginTOTP(params, true); }, async loginOAuthOrSso(params) {