4 files changed, 53 insertions, 0 deletions

diff --git a/src/containers/auth/ChangeServerScreen.js b/src/containers/auth/ChangeServerScreen.js
new file mode 100644
index 000000000..5c58087a3
--- /dev/null
+++ b/src/containers/auth/ChangeServerScreen.js
@@ -0,0 +1,50 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { inject, observer } from 'mobx-react';
+import { RouterStore } from 'mobx-react-router';
+import ChangeServer from '../../components/auth/ChangeServer';
+import SettingsStore from '../../stores/SettingsStore';
+
+export default @inject('stores', 'actions') @observer class ChangeServerScreen extends Component {
+  constructor(props) {
+    super(props);
+
+    this.onSubmit = this.onSubmit.bind(this);
+  }
+
+  onSubmit(values) {
+    const { server } = values;
+
+    this.props.actions.settings.update({
+      type: 'app',
+      data: {
+        server,
+      },
+    });
+    this.props.stores.router.push('/auth');
+  }
+
+  render() {
+    const { stores } = this.props;
+    const { server } = stores.settings.all.app;
+
+    return (
+      <ChangeServer
+        onSubmit={this.onSubmit}
+        server={server}
+      />
+    );
+  }
+}
+
+ChangeServerScreen.wrappedComponent.propTypes = {
+  actions: PropTypes.shape({
+    settings: PropTypes.shape({
+      update: PropTypes.func.isRequired,
+    }).isRequired,
+  }).isRequired,
+  stores: PropTypes.shape({
+    settings: PropTypes.instanceOf(SettingsStore).isRequired,
+    router: PropTypes.instanceOf(RouterStore).isRequired,
+  }).isRequired,
+};
diff --git a/src/containers/auth/LoginScreen.js b/src/containers/auth/LoginScreen.js
index e5ee10785..d17820ad6 100644
--- a/src/containers/auth/LoginScreen.js
+++ b/src/containers/auth/LoginScreen.js
@@ -21,6 +21,7 @@ export default @inject('stores', 'actions') @observer class LoginScreen extends
         isServerLogout={stores.user.logoutReason === stores.user.logoutReasonTypes.SERVER}
         signupRoute={stores.user.signupRoute}
         passwordRoute={stores.user.passwordRoute}
+        changeServerRoute={stores.user.changeServerRoute}
         error={error}
       />
     );
diff --git a/src/containers/auth/SignupScreen.js b/src/containers/auth/SignupScreen.js
index f93498be2..803fe1cd9 100644
--- a/src/containers/auth/SignupScreen.js
+++ b/src/containers/auth/SignupScreen.js
@@ -36,6 +36,7 @@ export default @inject('stores', 'actions') @observer class SignupScreen extends
         onSubmit={values => this.onSignup(values)}
         isSubmitting={stores.user.signupRequest.isExecuting}
         loginRoute={stores.user.loginRoute}
+        changeServerRoute={stores.user.changeServerRoute}
         error={error}
       />
     );
diff --git a/src/containers/auth/WelcomeScreen.js b/src/containers/auth/WelcomeScreen.js
index 75182345a..6f2d0eee6 100644
--- a/src/containers/auth/WelcomeScreen.js
+++ b/src/containers/auth/WelcomeScreen.js
@@ -14,6 +14,7 @@ export default @inject('stores', 'actions') @observer class LoginScreen extends
       <Welcome
         loginRoute={user.loginRoute}
         signupRoute={user.signupRoute}
+        changeServerRoute={user.changeServerRoute}
         recipes={recipePreviews.featured}
       />
     );