From 6b132cc4d014c2c6f6ab697e61e957cbd98e6c8d Mon Sep 17 00:00:00 2001
From: Chris Duarte <csduarte@users.noreply.github.com>
Date: Thu, 26 Oct 2017 09:16:32 -0700
Subject: [PATCH] Allow server to be auto selected from config (#946)

* Allow server to be auto selected from config

* Remove easter egg

* Review feedback 2

* Show the readonly textbox at all times
---
 app/mattermost.js                          |  5 +++++
 app/screens/login/login.js                 |  2 +-
 app/screens/root/root.js                   |  8 ++++----
 app/screens/select_server/select_server.js | 12 ++++++++----
 assets/base/config.json                    |  2 ++
 5 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/app/mattermost.js b/app/mattermost.js
index 61f81118c..90a1b0677 100644
--- a/app/mattermost.js
+++ b/app/mattermost.js
@@ -271,6 +271,11 @@ export default class Mattermost {
         let serverUrl = null;
         let username = null;
 
+        if (Config.AutoSelectServerUrl) {
+            handleServerUrlChanged(Config.DefaultServerUrl)(dispatch, getState);
+            this.allowOtherServers = false;
+        }
+
         try {
             const config = await mattermostManaged.getConfig();
             if (config) {
diff --git a/app/screens/login/login.js b/app/screens/login/login.js
index c5b92c3a1..e2c6626e8 100644
--- a/app/screens/login/login.js
+++ b/app/screens/login/login.js
@@ -314,7 +314,7 @@ class Login extends PureComponent {
         }
 
         return (
-            <View style={{flex: 1}}>
+            <View style={style.container}>
                 <StatusBar/>
                 <TouchableWithoutFeedback onPress={this.blur}>
                     <KeyboardAwareScrollView
diff --git a/app/screens/root/root.js b/app/screens/root/root.js
index 40990fd88..39d8bb14f 100644
--- a/app/screens/root/root.js
+++ b/app/screens/root/root.js
@@ -11,15 +11,15 @@ import {stripTrailingSlashes} from 'app/utils/url';
 
 export default class Root extends Component {
     static propTypes = {
+        actions: PropTypes.shape({
+            loadMe: PropTypes.func.isRequired
+        }).isRequired,
         allowOtherServers: PropTypes.bool,
         currentUser: PropTypes.object,
         credentials: PropTypes.object,
         justInit: PropTypes.bool,
         navigator: PropTypes.object,
-        theme: PropTypes.object,
-        actions: PropTypes.shape({
-            loadMe: PropTypes.func
-        }).isRequired
+        theme: PropTypes.object
     };
 
     shouldComponentUpdate(nextProps) {
diff --git a/app/screens/select_server/select_server.js b/app/screens/select_server/select_server.js
index 18fa3d34d..67f09694b 100644
--- a/app/screens/select_server/select_server.js
+++ b/app/screens/select_server/select_server.js
@@ -20,6 +20,7 @@ import urlParse from 'url-parse';
 import {RequestStatus} from 'mattermost-redux/constants';
 import {Client, Client4} from 'mattermost-redux/client';
 
+import Config from 'assets/config';
 import ErrorText from 'app/components/error_text';
 import FormattedText from 'app/components/formatted_text';
 import TextInputWithLocalizedPlaceholder from 'app/components/text_input_with_localized_placeholder';
@@ -28,7 +29,6 @@ import {isValidUrl, stripTrailingSlashes} from 'app/utils/url';
 import {UpgradeTypes} from 'app/constants/view';
 import checkUpgradeType from 'app/utils/client_upgrade';
 
-import LocalConfig from 'assets/config';
 import logo from 'assets/images/logo.png';
 
 class SelectServer extends PureComponent {
@@ -66,7 +66,7 @@ class SelectServer extends PureComponent {
     componentDidMount() {
         const {allowOtherServers, pingRequest, serverUrl} = this.props;
         if (pingRequest.status === RequestStatus.NOT_STARTED && !allowOtherServers && serverUrl) {
-            // If the app is managed, the server url is set and the user can't change it
+            // If the app is managed or AutoSelectServerUrl is true in the Config, the server url is set and the user can't change it
             // we automatically trigger the ping to move to the next screen
             this.onClick();
         }
@@ -78,7 +78,7 @@ class SelectServer extends PureComponent {
 
     componentWillReceiveProps(nextProps) {
         if (!this.props.transition && nextProps.transition) {
-            if (LocalConfig.EnableMobileClientUpgrade) {
+            if (Config.EnableMobileClientUpgrade) {
                 this.props.actions.setLastUpgradeCheck();
                 const {currentVersion, minVersion, latestVersion} = nextProps;
                 const upgradeType = checkUpgradeType(currentVersion, minVersion, latestVersion);
@@ -108,6 +108,7 @@ class SelectServer extends PureComponent {
             backButtonTitle: '',
             navigatorStyle: {
                 navBarHidden: false,
+                disabledBackGesture: Config.AutoSelectServerUrl,
                 statusBarHidden: true,
                 statusBarHideWithNavBar: true,
                 navBarTextColor: theme.sidebarHeaderTextColor,
@@ -147,6 +148,8 @@ class SelectServer extends PureComponent {
             animated: true,
             backButtonTitle: '',
             navigatorStyle: {
+                navBarHidden: Config.AutoSelectServerUrl,
+                disabledBackGesture: Config.AutoSelectServerUrl,
                 navBarTextColor: theme.sidebarHeaderTextColor,
                 navBarBackgroundColor: theme.sidebarHeaderBg,
                 navBarButtonColor: theme.sidebarHeaderTextColor
@@ -237,6 +240,7 @@ class SelectServer extends PureComponent {
                         <Image
                             source={logo}
                         />
+
                         <View>
                             <FormattedText
                                 style={[GlobalStyles.header, GlobalStyles.label]}
@@ -250,7 +254,7 @@ class SelectServer extends PureComponent {
                             editable={allowOtherServers}
                             onChangeText={this.props.actions.handleServerUrlChanged}
                             onSubmitEditing={this.onClick}
-                            style={[GlobalStyles.inputBox, allowOtherServers ? {} : {backgroundColor: '#e3e3e3'}]}
+                            style={[GlobalStyles.inputBox, (allowOtherServers) ? {} : {backgroundColor: '#e3e3e3'}]}
                             autoCapitalize='none'
                             autoCorrect={false}
                             keyboardType='url'
diff --git a/assets/base/config.json b/assets/base/config.json
index e97d7931f..fbf60855f 100644
--- a/assets/base/config.json
+++ b/assets/base/config.json
@@ -24,6 +24,8 @@
         }
     },
 
+    "AutoSelectServerUrl": false,
+
     "EnableMobileClientUpgrade": false,
     "EnableMobileClientUpgradeUserSetting": false,
     "EnableForceMobileClientUpgrade": false,