PLT-2057 User as a first class object (#2648)

* Adding TeamMember to system

* Fixing all unit tests on the backend

* Fixing merge conflicts

* Fixing merge conflict

* Adding javascript unit tests

* Adding TeamMember to system

* Fixing all unit tests on the backend

* Fixing merge conflicts

* Fixing merge conflict

* Adding javascript unit tests

* Adding client side unit test

* Cleaning up the clint side tests

* Fixing msg

* Adding more client side unit tests

* Adding more using tests

* Adding last bit of client side unit tests and adding make cmd

* Fixing bad merge

* Fixing libraries

* Updating to new client side API

* Fixing borken unit test

* Fixing unit tests

* ugg...trying to beat gofmt

* ugg...trying to beat gofmt

* Cleaning up remainder of the server side routes

* Adding inital load api

* Increased coverage of webhook unit tests (#2660)

* Adding loading ... to root html

* Fixing bad merge

* Removing explicit content type so superagent will guess corectly (#2685)

* Fixing merge and unit tests

* Adding create team UI

* Fixing signup flows

* Adding LDAP unit tests and enterprise unit test helper (#2702)

* Add the ability to reset MFA from the commandline (#2706)

* Fixing compliance unit tests

* Fixing client side tests

* Adding open server to system console

* Moving websocket connection

* Fixing unit test

* Fixing unit tests

* Fixing unit tests

* Adding nickname and more LDAP unit tests (#2717)

* Adding join open teams

* Cleaning up all TODOs in the code

* Fixing web sockets

* Removing unused webockets file

* PLT-2533 Add the ability to reset a user's MFA from the system console (#2715)

* Add the ability to reset a user's MFA from the system console

* Add client side unit test for adminResetMfa

* Reorganizing authentication to fix LDAP error message (#2723)

* Fixing failing unit test

* Initial upgrade db code

* Adding upgrade script

* Fixing upgrade script after running on core

* Update OAuth and Claim routes to work with user model changes (#2739)

* Fixing perminant deletion. Adding ability to delete all user and the entire database (#2740)

* Fixing team invite ldap login call (#2741)

* Fixing bluebar and some img stuff

* Fix all the different file upload web utils (#2743)

* Fixing invalid session redirect (#2744)

* Redirect on bad channel name (#2746)

* Fixing a bunch of issue and removing dead code

* Patch to fix error message on leave channel (#2747)

* Setting EnableOpenServer to false by default

* Fixing config

* Fixing upgrade

* Fixing reported bugs

* Bug fixes for PLT-2057

* PLT-2563 Redo password recovery to use a database table (#2745)

* Redo password recovery to use a database table

* Update reset password audits

* Split out admin and user reset password APIs to be separate

* Delete password recovery when user is permanently deleted

* Consolidate password resetting into a single function

* Removed private channels as an option for outgoing webhooks (#2752)

* PLT-2577/PLT-2552 Fixes for backstage (#2753)

* Added URL to incoming webhook list

* Fixed client functions for adding/removing integrations

* Disallowed slash commands without trigger words

* Fixed clientside handling of errors on AddCommand page

* Minor auth cleanup (#2758)

* Changed EditPostModal to just close if you save without making any changes (#2759)

* Renamed client -> Client in async_client.jsx and fixed eslint warnings (#2756)

* Fixed url in channel info modal (#2755)

* Fixing reported issues

* Moving to version 3 of the apis

* Fixing command unit tests (#2760)

* Adding team admins

* Fixing DM issue

* Fixing eslint error

* Properly set EditPostModal's originalText state in all cases (#2762)

* Update client config check to assume features is defined if server is licensed (#2772)

* Fixing url link

* Fixing issue with websocket crashing when sending messages to different teams

1 files changed, 25 insertions, 122 deletions

diff --git a/webapp/components/logged_in.jsx b/webapp/components/logged_in.jsx
index 1dcb6b0aa..3941dd12c 100644
--- a/webapp/components/logged_in.jsx
+++ b/webapp/components/logged_in.jsx
@@ -2,39 +2,17 @@
 // See License.txt for license information.
 
 import $ from 'jquery';
+import LoadingScreen from 'components/loading_screen.jsx';
 import * as AsyncClient from 'utils/async_client.jsx';
-import * as GlobalActions from 'action_creators/global_actions.jsx';
 import UserStore from 'stores/user_store.jsx';
-import ChannelStore from 'stores/channel_store.jsx';
 import BrowserStore from 'stores/browser_store.jsx';
 import PreferenceStore from 'stores/preference_store.jsx';
 import * as Utils from 'utils/utils.jsx';
-import Constants from 'utils/constants.jsx';
-const TutorialSteps = Constants.TutorialSteps;
-const Preferences = Constants.Preferences;
-import ErrorBar from 'components/error_bar.jsx';
 import * as Websockets from 'action_creators/websocket_actions.jsx';
-import LoadingScreen from 'components/loading_screen.jsx';
+import Constants from 'utils/constants.jsx';
 
 import {browserHistory} from 'react-router';
 
-import SidebarRight from 'components/sidebar_right.jsx';
-import SidebarRightMenu from 'components/sidebar_right_menu.jsx';
-import Navbar from 'components/navbar.jsx';
-
-// Modals
-import GetPostLinkModal from 'components/get_post_link_modal.jsx';
-import GetTeamInviteLinkModal from 'components/get_team_invite_link_modal.jsx';
-import EditPostModal from 'components/edit_post_modal.jsx';
-import DeletePostModal from 'components/delete_post_modal.jsx';
-import MoreChannelsModal from 'components/more_channels.jsx';
-import TeamSettingsModal from 'components/team_settings_modal.jsx';
-import RemovedFromChannelModal from 'components/removed_from_channel_modal.jsx';
-import RegisterAppModal from 'components/register_app_modal.jsx';
-import ImportThemeModal from 'components/user_settings/import_theme_modal.jsx';
-import InviteMemberModal from 'components/invite_member_modal.jsx';
-import SelectTeamModal from 'components/admin_console/select_team_modal.jsx';
-
 const CLIENT_STATUS_INTERVAL = 30000;
 const BACKSPACE_CHAR = 8;
 
@@ -45,19 +23,22 @@ export default class LoggedIn extends React.Component {
         super(params);
 
         this.onUserChanged = this.onUserChanged.bind(this);
+        this.setupUser = this.setupUser.bind(this);
 
         this.state = {
-            user: null,
-            profiles: null
+            user: UserStore.getCurrentUser()
         };
+
+        if (this.state.user) {
+            this.setupUser(this.state.user);
+        }
     }
+
     isValidState() {
-        return this.state.user != null && this.state.profiles != null;
+        return this.state.user != null;
     }
-    onUserChanged() {
-        // Grab the current user
-        const user = UserStore.getCurrentUser();
 
+    setupUser(user) {
         // Update segment indentify
         if (global.window.mm_config.SegmentDeveloperKey != null && global.window.mm_config.SegmentDeveloperKey !== '') {
             global.window.analytics.identify(user.id, {
@@ -65,7 +46,6 @@ export default class LoggedIn extends React.Component {
                 email: user.email,
                 createdAt: user.create_at,
                 username: user.username,
-                team_id: user.team_id,
                 id: user.id
             });
         }
@@ -78,25 +58,19 @@ export default class LoggedIn extends React.Component {
                 Utils.applyTheme(Constants.THEMES.default);
             }
         }
+    }
 
-        // Go to tutorial if we are first arrivign
-        const tutorialStep = PreferenceStore.getInt(Preferences.TUTORIAL_STEP, UserStore.getCurrentId(), 999);
-        if (tutorialStep <= TutorialSteps.INTRO_SCREENS) {
-            browserHistory.push(Utils.getTeamURLFromAddressBar() + '/tutorial');
-        }
-
-        // Get profiles
-        const profiles = UserStore.getProfiles();
+    onUserChanged() {
+        // Grab the current user
+        const user = UserStore.getCurrentUser();
+        this.setupUser(user);
 
         this.setState({
-            user,
-            profiles
+            user
         });
     }
-    componentWillMount() {
-        // Emit view action
-        GlobalActions.viewLoggedIn();
 
+    componentWillMount() {
         // Listen for user
         UserStore.addChangeListener(this.onUserChanged);
 
@@ -116,7 +90,7 @@ export default class LoggedIn extends React.Component {
                 }
 
                 console.log('detected logout from a different tab'); //eslint-disable-line no-console
-                browserHistory.push('/' + this.props.params.team);
+                browserHistory.push('/');
             }
 
             if (e.originalEvent.key === '__login__' && e.originalEvent.storageArea === localStorage && e.originalEvent.newValue) {
@@ -170,18 +144,6 @@ export default class LoggedIn extends React.Component {
             $('body').addClass('ios');
         }
 
-        // Set up tracking for whether the window is active
-        window.isActive = true;
-        $(window).on('focus', () => {
-            AsyncClient.updateLastViewedAt();
-            ChannelStore.resetCounts(ChannelStore.getCurrentId());
-            ChannelStore.emitChange();
-            window.isActive = true;
-        });
-        $(window).on('blur', () => {
-            window.isActive = false;
-        });
-
         // if preferences have already been stored in local storage do not wait until preference store change is fired and handled in channel.jsx
         const selectedFont = PreferenceStore.get(Constants.Preferences.CATEGORY_DISPLAY_SETTINGS, 'selected_font', Constants.DEFAULT_FONT);
         Utils.applyFont(selectedFont);
@@ -193,13 +155,11 @@ export default class LoggedIn extends React.Component {
             }
         });
     }
+
     componentWillUnmount() {
         $('#root').attr('class', '');
         clearInterval(this.intervalId);
 
-        $(window).off('focus');
-        $(window).off('blur');
-
         Websockets.close();
         UserStore.removeChangeListener(this.onUserChanged);
 
@@ -211,75 +171,18 @@ export default class LoggedIn extends React.Component {
 
         $(window).off('keydown.preventBackspace');
     }
+
     render() {
         if (!this.isValidState()) {
             return <LoadingScreen/>;
         }
 
-        let content = [];
-        if (this.props.children) {
-            content = this.props.children;
-        } else {
-            content.push(
-                this.props.navbar
-            );
-            content.push(
-                this.props.sidebar
-            );
-            content.push(
-                <div
-                    key='inner-wrap'
-                    className='inner-wrap channel__wrap'
-                >
-                    <div className='row header'>
-                        <div id='navbar'>
-                            <Navbar/>
-                        </div>
-                    </div>
-                    <div className='row main'>
-                        {React.cloneElement(this.props.center, {
-                            user: this.state.user,
-                            profiles: this.state.profiles
-                        })}
-                    </div>
-                </div>
-            );
-        }
-        return (
-            <div className='channel-view'>
-                <ErrorBar/>
-                <div className='container-fluid'>
-                    <SidebarRight/>
-                    <SidebarRightMenu/>
-                    {content}
-
-                    <GetPostLinkModal/>
-                    <GetTeamInviteLinkModal/>
-                    <InviteMemberModal/>
-                    <ImportThemeModal/>
-                    <TeamSettingsModal/>
-                    <MoreChannelsModal/>
-                    <EditPostModal/>
-                    <DeletePostModal/>
-                    <RemovedFromChannelModal/>
-                    <RegisterAppModal/>
-                    <SelectTeamModal/>
-                </div>
-            </div>
-        );
+        return React.cloneElement(this.props.children, {
+            user: this.state.user
+        });
     }
 }
 
-LoggedIn.defaultProps = {
-};
-
 LoggedIn.propTypes = {
-    children: React.PropTypes.oneOfType([
-        React.PropTypes.arrayOf(React.PropTypes.element),
-        React.PropTypes.element
-    ]),
-    navbar: React.PropTypes.element,
-    sidebar: React.PropTypes.element,
-    center: React.PropTypes.element,
-    params: React.PropTypes.object
+    children: React.PropTypes.object
 };