Skip to content

[FIX] Redirect user to SetUsernameView #1728

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 3 commits into from
Feb 21, 2020
Merged

[FIX] Redirect user to SetUsernameView #1728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f15f8a8
Redirect to setUsername when username dont follow regex
djorkaeffalexandre Feb 14, 2020
b9aa249
Merge branch 'develop' into fix.set-username
diegolmello Feb 21, 2020
0e27eeb
Fix
diegolmello Feb 21, 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
2 changes: 1 addition & 1 deletion app/sagas/init.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ const start = function* start({ root }) {
if (root === 'inside') {
yield Navigation.navigate('InsideStack');
} else if (root === 'setUsername') {
yield Navigation.navigate('SetUsernameView');
yield Navigation.navigate('SetUsernameStack');
} else if (root === 'outside') {
yield Navigation.navigate('OutsideStack');
} else if (root === 'loading') {
Expand Down
13 changes: 8 additions & 5 deletions app/sagas/login.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,13 @@ const handleLoginRequest = function* handleLoginRequest({ credentials, logoutOnE
} else {
result = yield call(loginWithPasswordCall, credentials);
}
return yield put(loginSuccess(result));
if (!result.username) {
yield put(serverFinishAdd());
yield put(setUser(result));
yield put(appStart('setUsername'));
} else {
yield put(loginSuccess(result));
}
} catch (e) {
if (logoutOnError && (e.data && e.data.message && /you've been logged out by the server/i.test(e.data.message))) {
yield put(logout(true));
Expand Down Expand Up @@ -117,9 +123,7 @@ const handleLoginSuccess = function* handleLoginSuccess({ user }) {
EventEmitter.emit('connected');

let currentRoot;
if (!user.username) {
yield put(appStart('setUsername'));
} else if (adding) {
if (adding) {
yield put(serverFinishAdd());
yield put(appStart('inside'));
} else {
Expand Down Expand Up @@ -193,7 +197,6 @@ const root = function* root() {
while (true) {
const params = yield take(types.LOGIN.SUCCESS);
const loginSuccessTask = yield fork(handleLoginSuccess, params);
// yield take(types.SERVER.SELECT_REQUEST);
yield race({
selectRequest: take(types.SERVER.SELECT_REQUEST),
timeout: delay(2000)
Expand Down
12 changes: 7 additions & 5 deletions app/views/RegisterView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import {
Keyboard, Text, ScrollView, Alert
} from 'react-native';
import { Keyboard, Text, ScrollView } from 'react-native';
import { connect } from 'react-redux';
import { SafeAreaView } from 'react-navigation';
import RNPickerSelect from 'react-native-picker-select';
Expand All @@ -24,6 +22,7 @@ import { withTheme } from '../theme';
import { themes } from '../constants/colors';
import { themedHeader } from '../utils/navigation';
import { isTablet } from '../utils/deviceInfo';
import { showErrorAlert } from '../utils/info';

const shouldUpdateState = ['name', 'email', 'password', 'username', 'saving'];

Expand Down Expand Up @@ -129,12 +128,15 @@ class RegisterView extends React.Component {

if (Accounts_EmailVerification) {
await navigation.goBack();
Alert.alert(I18n.t('Verify_email_title'), I18n.t('Verify_email_desc'));
showErrorAlert(I18n.t('Verify_email_desc'), I18n.t('Verify_email_title'));
} else {
await loginRequest({ user: email, password });
}
} catch (e) {
Alert.alert(I18n.t('Oops'), e.data.error);
if (e.data && e.data.errorType === 'username-invalid') {
return loginRequest({ user: email, password });
}
showErrorAlert(e.data.error, I18n.t('Oops'));
}
this.setState({ saving: false });
}
Expand Down
4 changes: 2 additions & 2 deletions app/views/SetUsernameView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ import scrollPersistTaps from '../utils/scrollPersistTaps';
import I18n from '../i18n';
import RocketChat from '../lib/rocketchat';
import StatusBar from '../containers/StatusBar';
import log from '../utils/log';
import { themedHeader } from '../utils/navigation';
import { withTheme } from '../theme';
import { themes } from '../constants/colors';
import { isTablet } from '../utils/deviceInfo';
import { getUserSelector } from '../selectors/login';
import { showErrorAlert } from '../utils/info';

const styles = StyleSheet.create({
loginTitle: {
Expand Down Expand Up @@ -96,7 +96,7 @@ class SetUsernameView extends React.Component {
await RocketChat.setUsername(username);
await loginRequest({ resume: token });
} catch (e) {
log(e);
showErrorAlert(e.message, I18n.t('Oops'));
}
this.setState({ saving: false });
}
Expand Down