verdnatura-mirror
/
verdnatura-chat
forked from verdnatura-mirror/Rocket.Chat.ReactNative
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FIX] Login TOTP Compatibility to older servers (#2018) 

* [FIX] Login TOTP Compatibility to older servers

* [FIX] Android crashes if use double negation

Co-authored-by: Diego Mello <diegolmello@gmail.com>
This commit is contained in:
Djorkaeff Alexandre 2020-04-13 10:25:31 -03:00 committed by GitHub
parent acf70790cd
commit 2b3ccf4df5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/containers/TwoFactor/index.js
View File

@ -48,6 +48,7 @@ const TwoFactor = React.memo(({ theme, split }) => {
useDeepCompareEffect(() => { useDeepCompareEffect(() => {
if (!_.isEmpty(data)) { if (!_.isEmpty(data)) {
setCode('');
setVisible(true); setVisible(true);
} else { } else {
setVisible(false); setVisible(false);
@ -94,7 +95,7 @@ const TwoFactor = React.memo(({ theme, split }) => {
<View style={styles.container}> <View style={styles.container}>
<View style={[styles.content, split && [sharedStyles.modal, sharedStyles.modalFormSheet], { backgroundColor: themes[theme].backgroundColor }]}> <View style={[styles.content, split && [sharedStyles.modal, sharedStyles.modalFormSheet], { backgroundColor: themes[theme].backgroundColor }]}>
<Text style={[styles.title, { color }]}>{I18n.t(method?.title || 'Two_Factor_Authentication')}</Text> <Text style={[styles.title, { color }]}>{I18n.t(method?.title || 'Two_Factor_Authentication')}</Text>
<Text style={[styles.subtitle, { color }]}>{I18n.t(method?.text)}</Text> {method?.text ? <Text style={[styles.subtitle, { color }]}>{I18n.t(method.text)}</Text> : null}
<TextInput <TextInput
value={code} value={code}
theme={theme} theme={theme}

3
app/containers/TwoFactor/styles.js
View File

@ -15,11 +15,12 @@ export default StyleSheet.create({
}, },
title: { title: {
fontSize: 14, fontSize: 14,
paddingBottom: 8,
...sharedStyles.textBold ...sharedStyles.textBold
}, },
subtitle: { subtitle: {
fontSize: 14, fontSize: 14,
paddingVertical: 8, paddingBottom: 8,
...sharedStyles.textRegular, ...sharedStyles.textRegular,
...sharedStyles.textAlignCenter ...sharedStyles.textAlignCenter
}, },

4
app/lib/rocketchat.js
View File

@ -337,8 +337,8 @@ const RocketChat = {
if (e.data?.error && (e.data.error === 'totp-required' || e.data.error === 'totp-invalid')) { if (e.data?.error && (e.data.error === 'totp-required' || e.data.error === 'totp-invalid')) {
const { details } = e.data; const { details } = e.data;
try { try {
await twoFactor({ method: details?.method, invalid: e.data.error === 'totp-invalid' }); const code = await twoFactor({ method: details?.method || 'totp', invalid: e.data.error === 'totp-invalid' });
return resolve(this.loginTOTP(params)); return resolve(this.loginTOTP({ ...params, code: code?.twoFactorCode }));
} catch { } catch {
// twoFactor was canceled // twoFactor was canceled
return reject(); return reject();