diff --git a/app/lib/rocketchat.js b/app/lib/rocketchat.js
index 66b50b48947d381b43c7c330166786099dca9f26..164d573066dedd96243aa613486131c634ac1e50 100644
--- a/app/lib/rocketchat.js
+++ b/app/lib/rocketchat.js
@@ -965,11 +965,12 @@ const RocketChat = {
return ret;
}, {});
reduxStore.dispatch(setLoginServices(loginServicesReducer));
+ } else {
+ reduxStore.dispatch(setLoginServices({}));
}
- return Promise.resolve(loginServices.length);
} catch (error) {
- console.warn(error);
- return Promise.reject();
+ console.log(error);
+ reduxStore.dispatch(setLoginServices({}));
}
},
_determineAuthType(services) {
diff --git a/app/selectors/login.js b/app/selectors/login.js
index 6bbba8b9f80591ad2383a48359aa85234aabed28..773056b4b3d81b56a515182c7de492e9e943e43b 100644
--- a/app/selectors/login.js
+++ b/app/selectors/login.js
@@ -1,8 +1,15 @@
import { createSelector } from 'reselect';
const getUser = state => state.login.user || {};
+const getLoginServices = state => state.login.services || {};
+const getShowFormLoginSetting = state => state.settings.Accounts_ShowFormLogin || false;
export const getUserSelector = createSelector(
[getUser],
user => user
);
+
+export const getShowLoginButton = createSelector(
+ [getLoginServices, getShowFormLoginSetting],
+ (loginServices, showFormLogin) => showFormLogin || Object.values(loginServices).length
+);
diff --git a/app/views/RegisterView.js b/app/views/RegisterView.js
index 2c7209c3c73d40e5f8a17bfa1813a7da57c03bd8..f4a3840f48b82ded869d39bc8f685693c11699ae 100644
--- a/app/views/RegisterView.js
+++ b/app/views/RegisterView.js
@@ -22,6 +22,7 @@ import RocketChat from '../lib/rocketchat';
import { loginRequest as loginRequestAction } from '../actions/login';
import openLink from '../utils/openLink';
import LoginServices from '../containers/LoginServices';
+import { getShowLoginButton } from '../selectors/login';
const styles = StyleSheet.create({
title: {
@@ -68,7 +69,8 @@ class RegisterView extends React.Component {
Accounts_EmailVerification: PropTypes.bool,
theme: PropTypes.string,
Site_Name: PropTypes.string,
- loginRequest: PropTypes.func
+ loginRequest: PropTypes.func,
+ showLoginButton: PropTypes.bool
}
constructor(props) {
@@ -217,7 +219,7 @@ class RegisterView extends React.Component {
render() {
const { saving } = this.state;
- const { theme } = this.props;
+ const { theme, showLoginButton } = this.props;
return (
<FormContainer theme={theme}>
<FormContainerInner>
@@ -298,14 +300,17 @@ class RegisterView extends React.Component {
</Text>
</View>
- <View style={styles.bottomContainer}>
- <Text style={[styles.bottomContainerText, { color: themes[theme].auxiliaryText }]}>{I18n.t('Do_you_have_an_account')}</Text>
- <Text
- style={[styles.bottomContainerTextBold, { color: themes[theme].actionTintColor }]}
- onPress={this.login}
- >{I18n.t('Login')}
- </Text>
- </View>
+ {showLoginButton
+ ? (
+ <View style={styles.bottomContainer}>
+ <Text style={[styles.bottomContainerText, { color: themes[theme].auxiliaryText }]}>{I18n.t('Do_you_have_an_account')}</Text>
+ <Text
+ style={[styles.bottomContainerTextBold, { color: themes[theme].actionTintColor }]}
+ onPress={this.login}
+ >{I18n.t('Login')}
+ </Text>
+ </View>
+ ) : null}
</FormContainerInner>
</FormContainer>
);
@@ -319,7 +324,8 @@ const mapStateToProps = state => ({
CAS_enabled: state.settings.CAS_enabled,
CAS_login_url: state.settings.CAS_login_url,
Accounts_CustomFields: state.settings.Accounts_CustomFields,
- Accounts_EmailVerification: state.settings.Accounts_EmailVerification
+ Accounts_EmailVerification: state.settings.Accounts_EmailVerification,
+ showLoginButton: getShowLoginButton(state)
});
const mapDispatchToProps = dispatch => ({
diff --git a/app/views/RoomsListView/ServerDropdown.js b/app/views/RoomsListView/ServerDropdown.js
index de295e564d3c26f329c771d35ceaa18a8b201254..f91c20bd8cfb17cb83d6851c244f794a7107378b 100644
--- a/app/views/RoomsListView/ServerDropdown.js
+++ b/app/views/RoomsListView/ServerDropdown.js
@@ -10,7 +10,6 @@ import RNUserDefaults from 'rn-user-defaults';
import { toggleServerDropdown as toggleServerDropdownAction } from '../../actions/rooms';
import { selectServerRequest as selectServerRequestAction } from '../../actions/server';
-import { appStart as appStartAction } from '../../actions';
import styles from './styles';
import Touch from '../../utils/touch';
import RocketChat from '../../lib/rocketchat';
@@ -35,8 +34,7 @@ class ServerDropdown extends Component {
server: PropTypes.string,
theme: PropTypes.string,
toggleServerDropdown: PropTypes.func,
- selectServerRequest: PropTypes.func,
- appStart: PropTypes.func
+ selectServerRequest: PropTypes.func
}
constructor(props) {
@@ -132,7 +130,7 @@ class ServerDropdown extends Component {
select = async(server) => {
const {
- server: currentServer, selectServerRequest, appStart, navigation, split
+ server: currentServer, selectServerRequest, navigation, split
} = this.props;
this.close();
@@ -142,10 +140,12 @@ class ServerDropdown extends Component {
navigation.navigate('RoomView');
}
if (!userId) {
- appStart();
- this.newServerTimeout = setTimeout(() => {
- EventEmitter.emit('NewServer', { server });
- }, 1000);
+ setTimeout(() => {
+ navigation.navigate('NewServerView', { previousServer: currentServer });
+ this.newServerTimeout = setTimeout(() => {
+ EventEmitter.emit('NewServer', { server });
+ }, ANIMATION_DURATION);
+ }, ANIMATION_DURATION);
} else {
selectServerRequest(server);
}
@@ -267,8 +267,7 @@ const mapStateToProps = state => ({
const mapDispatchToProps = dispatch => ({
toggleServerDropdown: () => dispatch(toggleServerDropdownAction()),
- selectServerRequest: server => dispatch(selectServerRequestAction(server)),
- appStart: () => dispatch(appStartAction('outside'))
+ selectServerRequest: server => dispatch(selectServerRequestAction(server))
});
export default withNavigation(connect(mapStateToProps, mapDispatchToProps)(withTheme(withSplit(ServerDropdown))));
diff --git a/app/views/WorkspaceView/index.js b/app/views/WorkspaceView/index.js
index 562b446ae9aa5058cd0e1a36b46e665a6925f423..512ff107cb7c1952b3687a55605d1e654c36d1ac 100644
--- a/app/views/WorkspaceView/index.js
+++ b/app/views/WorkspaceView/index.js
@@ -11,6 +11,7 @@ import { withTheme } from '../../theme';
import FormContainer, { FormContainerInner } from '../../containers/FormContainer';
import { themedHeader } from '../../utils/navigation';
import ServerAvatar from './ServerAvatar';
+import { getShowLoginButton } from '../../selectors/login';
class WorkspaceView extends React.Component {
static navigationOptions = ({ screenProps }) => ({
@@ -26,7 +27,8 @@ class WorkspaceView extends React.Component {
server: PropTypes.string,
Assets_favicon_512: PropTypes.object,
registrationEnabled: PropTypes.bool,
- registrationText: PropTypes.string
+ registrationText: PropTypes.string,
+ showLoginButton: PropTypes.bool
}
login = () => {
@@ -41,7 +43,7 @@ class WorkspaceView extends React.Component {
render() {
const {
- theme, Site_Name, Site_Url, Assets_favicon_512, server, registrationEnabled, registrationText
+ theme, Site_Name, Site_Url, Assets_favicon_512, server, registrationEnabled, registrationText, showLoginButton
} = this.props;
return (
<FormContainer theme={theme}>
@@ -51,12 +53,15 @@ class WorkspaceView extends React.Component {
<Text style={[styles.serverName, { color: themes[theme].titleText }]}>{Site_Name}</Text>
<Text style={[styles.serverUrl, { color: themes[theme].auxiliaryText }]}>{Site_Url}</Text>
</View>
- <Button
- title={I18n.t('Login')}
- type='primary'
- onPress={this.login}
- theme={theme}
- />
+ {showLoginButton
+ ? (
+ <Button
+ title={I18n.t('Login')}
+ type='primary'
+ onPress={this.login}
+ theme={theme}
+ />
+ ) : null}
{
registrationEnabled ? (
<Button
@@ -83,7 +88,8 @@ const mapStateToProps = state => ({
Site_Url: state.settings.Site_Url,
Assets_favicon_512: state.settings.Assets_favicon_512,
registrationEnabled: state.settings.Accounts_RegistrationForm === 'Public',
- registrationText: state.settings.Accounts_RegistrationForm_LinkReplacementText
+ registrationText: state.settings.Accounts_RegistrationForm_LinkReplacementText,
+ showLoginButton: getShowLoginButton(state)
});
export default connect(mapStateToProps)(withTheme(WorkspaceView));