Merge pull request #2610 from mattermost/plt-2490

PLT-2490, PLT-2452 Fixing signup flow. Better root redirect. Fixes back buttons.

1 files changed, 1 insertions, 19 deletions

diff --git a/webapp/root.jsx b/webapp/root.jsx
index da5980c33..417a13659 100644
--- a/webapp/root.jsx
+++ b/webapp/root.jsx
@@ -158,23 +158,6 @@ function preLoggedIn(nextState, replace, callback) {
     });
 }
 
-function onRootEnter(nextState, replace, callback) {
-    if (nextState.location.pathname === '/') {
-        Client.getMeLoggedIn((data) => {
-            if (!data || data.logged_in === 'false') {
-                replace({pathname: '/signup_team'});
-                callback();
-            } else {
-                replace({pathname: '/' + data.team_name + '/channels/town-square'});
-                callback();
-            }
-        });
-        return;
-    }
-
-    callback();
-}
-
 function onPermalinkEnter(nextState) {
     const postId = nextState.params.postid;
 
@@ -225,7 +208,6 @@ function renderRootComponent() {
             <Route
                 path='/'
                 component={Root}
-                onEnter={onRootEnter}
             >
                 <Route
                     path='error'
@@ -332,7 +314,7 @@ function renderRootComponent() {
                             component={TeamURLPage}
                         />
                         <Route
-                            path='invites'
+                            path='send_invites'
                             component={SendInivtesPage}
                         />
                         <Route