Merge pull request #2529 from mattermost/plt-2383

PLT-2383 Fixed system console login page flash. 

1 files changed, 4 insertions, 11 deletions

diff --git a/webapp/components/team_signup_with_sso.jsx b/webapp/components/team_signup_with_sso.jsx
index 4f84f13cf..9a46b2d6b 100644
--- a/webapp/components/team_signup_with_sso.jsx
+++ b/webapp/components/team_signup_with_sso.jsx
@@ -24,6 +24,7 @@ const holders = defineMessages({
 });
 
 import React from 'react';
+import {browserHistory} from 'react-router';
 
 class SSOSignUpPage extends React.Component {
     constructor(props) {
@@ -63,9 +64,9 @@ class SSOSignUpPage extends React.Component {
             this.props.service,
             (data) => {
                 if (data.follow_link) {
-                    window.location.href = data.follow_link;
+                    browserHistory.push(data.follow_link);
                 } else {
-                    window.location.href = '/' + team.name + '/channels/town-square';
+                    browserHistory.push('/' + team.name + '/channels/town-square');
                 }
             },
             (err) => {
@@ -157,14 +158,6 @@ class SSOSignUpPage extends React.Component {
                     {button}
                     {serverError}
                 </div>
-                <div className='form-group margin--extra-2x'>
-                    <span><a href='/find_team'>
-                        <FormattedMessage
-                            id='sso_signup.find'
-                            defaultMessage='Find my teams'
-                        />
-                    </a></span>
-                </div>
             </form>
         );
     }
@@ -178,4 +171,4 @@ SSOSignUpPage.propTypes = {
     service: React.PropTypes.string
 };
 
-export default injectIntl(SSOSignUpPage);
\ No newline at end of file
+export default injectIntl(SSOSignUpPage);