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

5 files changed, 57 insertions, 96 deletions

diff --git a/webapp/components/claim/claim.jsx b/webapp/components/claim/claim.jsx
index 5cfb04af3..0197e1677 100644
--- a/webapp/components/claim/claim.jsx
+++ b/webapp/components/claim/claim.jsx
@@ -1,8 +1,6 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import TeamStore from 'stores/team_store.jsx';
-
 import React from 'react';
 import {FormattedMessage} from 'react-intl';
 import {Link} from 'react-router';
@@ -13,40 +11,15 @@ export default class Claim extends React.Component {
     constructor(props) {
         super(props);
 
-        this.onTeamChange = this.onTeamChange.bind(this);
-        this.updateStateFromStores = this.updateStateFromStores.bind(this);
-
         this.state = {};
     }
     componentWillMount() {
         this.setState({
             email: this.props.location.query.email,
             newType: this.props.location.query.new_type,
-            oldType: this.props.location.query.old_type,
-            teamName: this.props.params.team,
-            teamDisplayName: ''
-        });
-        this.updateStateFromStores();
-    }
-    componentDidMount() {
-        TeamStore.addChangeListener(this.onTeamChange);
-    }
-    componentWillUnmount() {
-        TeamStore.removeChangeListener(this.onTeamChange);
-    }
-    updateStateFromStores() {
-        const team = TeamStore.getByName(this.state.teamName);
-        let displayName = '';
-        if (team) {
-            displayName = team.display_name;
-        }
-        this.setState({
-            teamDisplayName: displayName
+            oldType: this.props.location.query.old_type
         });
     }
-    onTeamChange() {
-        this.updateStateFromStores();
-    }
     render() {
         return (
             <div>
@@ -66,8 +39,6 @@ export default class Claim extends React.Component {
                         />
                         <div id='claim'>
                             {React.cloneElement(this.props.children, {
-                                teamName: this.state.teamName,
-                                teamDisplayName: this.state.teamDisplayName,
                                 currentType: this.state.oldType,
                                 newType: this.state.newType,
                                 email: this.state.email
@@ -83,7 +54,6 @@ export default class Claim extends React.Component {
 Claim.defaultProps = {
 };
 Claim.propTypes = {
-    params: React.PropTypes.object.isRequired,
     location: React.PropTypes.object.isRequired,
     children: React.PropTypes.node
 };
diff --git a/webapp/components/claim/components/email_to_ldap.jsx b/webapp/components/claim/components/email_to_ldap.jsx
index 1ceb42a27..fbf26cade 100644
--- a/webapp/components/claim/components/email_to_ldap.jsx
+++ b/webapp/components/claim/components/email_to_ldap.jsx
@@ -2,12 +2,11 @@
 // See License.txt for license information.
 
 import * as Utils from 'utils/utils.jsx';
-import * as Client from 'utils/client.jsx';
+import Client from 'utils/web_client.jsx';
 
 import React from 'react';
 import ReactDOM from 'react-dom';
 import {FormattedMessage} from 'react-intl';
-import {browserHistory} from 'react-router';
 
 export default class EmailToLDAP extends React.Component {
     constructor(props) {
@@ -45,17 +44,14 @@ export default class EmailToLDAP extends React.Component {
         state.error = null;
         this.setState(state);
 
-        var postData = {};
-        postData.email_password = password;
-        postData.ldap_id = ldapId;
-        postData.ldap_password = ldapPassword;
-        postData.email = this.props.email;
-        postData.team_name = this.props.teamName;
-
-        Client.emailToLDAP(postData,
+        Client.emailToLdap(
+            this.props.email,
+            password,
+            ldapId,
+            ldapPassword,
             (data) => {
                 if (data.follow_link) {
-                    browserHistory.push(data.follow_link);
+                    window.location.href = data.follow_link;
                 }
             },
             (error) => {
@@ -74,6 +70,20 @@ export default class EmailToLDAP extends React.Component {
             formClass += ' has-error';
         }
 
+        let loginPlaceholder;
+        if (global.window.mm_config.LdapLoginFieldName) {
+            loginPlaceholder = global.window.mm_config.LdapLoginFieldName;
+        } else {
+            loginPlaceholder = Utils.localizeMessage('claim.email_to_ldap.ldapId', 'LDAP ID');
+        }
+
+        let passwordPlaceholder;
+        if (global.window.mm_config.LdapPasswordFieldName) {
+            passwordPlaceholder = global.window.mm_config.LdapPasswordFieldName;
+        } else {
+            passwordPlaceholder = Utils.localizeMessage('claim.email_to_ldap.ldapPwd', 'LDAP Password');
+        }
+
         return (
             <div>
                 <h3>
@@ -98,9 +108,8 @@ export default class EmailToLDAP extends React.Component {
                     <p>
                         <FormattedMessage
                             id='claim.email_to_ldap.enterPwd'
-                            defaultMessage='Enter the password for your {team} {site} email account'
+                            defaultMessage='Enter the password for your {site} email account'
                             values={{
-                                team: this.props.teamDisplayName,
                                 site: global.window.mm_config.SiteName
                             }}
                         />
@@ -125,10 +134,6 @@ export default class EmailToLDAP extends React.Component {
                         <FormattedMessage
                             id='claim.email_to_ldap.enterLdapPwd'
                             defaultMessage='Enter the ID and password for your LDAP account'
-                            values={{
-                                team: this.props.teamDisplayName,
-                                site: global.window.mm_config.SiteName
-                            }}
                         />
                     </p>
                     <div className={formClass}>
@@ -138,7 +143,7 @@ export default class EmailToLDAP extends React.Component {
                             name='ldapId'
                             ref='ldapid'
                             autoComplete='off'
-                            placeholder={Utils.localizeMessage('claim.email_to_ldap.ldapId', 'LDAP ID')}
+                            placeholder={loginPlaceholder}
                             spellCheck='false'
                         />
                     </div>
@@ -149,7 +154,7 @@ export default class EmailToLDAP extends React.Component {
                             name='ldapPassword'
                             ref='ldappassword'
                             autoComplete='off'
-                            placeholder={Utils.localizeMessage('claim.email_to_ldap.ldapPwd', 'LDAP Password')}
+                            placeholder={passwordPlaceholder}
                             spellCheck='false'
                         />
                     </div>
@@ -172,7 +177,5 @@ export default class EmailToLDAP extends React.Component {
 EmailToLDAP.defaultProps = {
 };
 EmailToLDAP.propTypes = {
-    email: React.PropTypes.string,
-    teamName: React.PropTypes.string,
-    teamDisplayName: React.PropTypes.string
+    email: React.PropTypes.string
 };
diff --git a/webapp/components/claim/components/email_to_oauth.jsx b/webapp/components/claim/components/email_to_oauth.jsx
index f4376067a..1fd284bed 100644
--- a/webapp/components/claim/components/email_to_oauth.jsx
+++ b/webapp/components/claim/components/email_to_oauth.jsx
@@ -2,12 +2,11 @@
 // See License.txt for license information.
 
 import * as Utils from 'utils/utils.jsx';
-import * as Client from 'utils/client.jsx';
+import Client from 'utils/web_client.jsx';
 
 import React from 'react';
 import ReactDOM from 'react-dom';
 import {FormattedMessage} from 'react-intl';
-import {browserHistory} from 'react-router';
 
 export default class EmailToOAuth extends React.Component {
     constructor(props) {
@@ -31,16 +30,13 @@ export default class EmailToOAuth extends React.Component {
         state.error = null;
         this.setState(state);
 
-        var postData = {};
-        postData.password = password;
-        postData.email = this.props.email;
-        postData.team_name = this.props.teamName;
-        postData.service = this.props.newType;
-
-        Client.emailToOAuth(postData,
+        Client.emailToOAuth(
+            this.props.email,
+            password,
+            this.props.newType,
             (data) => {
                 if (data.follow_link) {
-                    browserHistory.push(data.follow_link);
+                    window.location.href = data.follow_link;
                 }
             },
             (error) => {
@@ -94,9 +90,8 @@ export default class EmailToOAuth extends React.Component {
                     <p>
                         <FormattedMessage
                             id='claim.email_to_oauth.enterPwd'
-                            defaultMessage='Enter the password for your {team} {site} account'
+                            defaultMessage='Enter the password for your {site} account'
                             values={{
-                                team: this.props.teamDisplayName,
                                 site: global.window.mm_config.SiteName
                             }}
                         />
@@ -134,7 +129,5 @@ EmailToOAuth.defaultProps = {
 };
 EmailToOAuth.propTypes = {
     newType: React.PropTypes.string,
-    email: React.PropTypes.string,
-    teamName: React.PropTypes.string,
-    teamDisplayName: React.PropTypes.string
+    email: React.PropTypes.string
 };
diff --git a/webapp/components/claim/components/ldap_to_email.jsx b/webapp/components/claim/components/ldap_to_email.jsx
index ed8a314bd..a10cefd6f 100644
--- a/webapp/components/claim/components/ldap_to_email.jsx
+++ b/webapp/components/claim/components/ldap_to_email.jsx
@@ -2,12 +2,11 @@
 // See License.txt for license information.
 
 import * as Utils from 'utils/utils.jsx';
-import * as Client from 'utils/client.jsx';
+import Client from 'utils/web_client.jsx';
 
 import React from 'react';
 import ReactDOM from 'react-dom';
 import {FormattedMessage} from 'react-intl';
-import {browserHistory} from 'react-router';
 
 export default class LDAPToEmail extends React.Component {
     constructor(props) {
@@ -45,16 +44,13 @@ export default class LDAPToEmail extends React.Component {
         state.error = null;
         this.setState(state);
 
-        var postData = {};
-        postData.email_password = password;
-        postData.ldap_password = ldapPassword;
-        postData.email = this.props.email;
-        postData.team_name = this.props.teamName;
-
-        Client.ldapToEmail(postData,
+        Client.ldapToEmail(
+            this.props.email,
+            password,
+            ldapPassword,
             (data) => {
                 if (data.follow_link) {
-                    browserHistory.push(data.follow_link);
+                    window.location.href = data.follow_link;
                 }
             },
             (error) => {
@@ -73,6 +69,13 @@ export default class LDAPToEmail extends React.Component {
             formClass += ' has-error';
         }
 
+        let passwordPlaceholder;
+        if (global.window.mm_config.LdapPasswordFieldName) {
+            passwordPlaceholder = global.window.mm_config.LdapPasswordFieldName;
+        } else {
+            passwordPlaceholder = Utils.localizeMessage('claim.ldap_to_email.ldapPwd', 'LDAP Password');
+        }
+
         return (
             <div>
                 <h3>
@@ -100,9 +103,9 @@ export default class LDAPToEmail extends React.Component {
                     <p>
                         <FormattedMessage
                             id='claim.ldap_to_email.enterLdapPwd'
-                            defaultMessage='Enter your LDAP password for your {team} {site} email account'
+                            defaultMessage='Enter your {ldapPassword} for your {site} email account'
                             values={{
-                                team: this.props.teamDisplayName,
+                                ldapPassword: passwordPlaceholder,
                                 site: global.window.mm_config.SiteName
                             }}
                         />
@@ -113,7 +116,7 @@ export default class LDAPToEmail extends React.Component {
                             className='form-control'
                             name='ldapPassword'
                             ref='ldappassword'
-                            placeholder={Utils.localizeMessage('claim.ldap_to_email.ldapPwd', 'LDAP Password')}
+                            placeholder={passwordPlaceholder}
                             spellCheck='false'
                         />
                     </div>
@@ -162,7 +165,5 @@ export default class LDAPToEmail extends React.Component {
 LDAPToEmail.defaultProps = {
 };
 LDAPToEmail.propTypes = {
-    email: React.PropTypes.string,
-    teamName: React.PropTypes.string,
-    teamDisplayName: React.PropTypes.string
+    email: React.PropTypes.string
 };
diff --git a/webapp/components/claim/components/oauth_to_email.jsx b/webapp/components/claim/components/oauth_to_email.jsx
index 72e0500a9..7fd18aaa6 100644
--- a/webapp/components/claim/components/oauth_to_email.jsx
+++ b/webapp/components/claim/components/oauth_to_email.jsx
@@ -2,7 +2,7 @@
 // See License.txt for license information.
 
 import * as Utils from 'utils/utils.jsx';
-import * as Client from 'utils/client.jsx';
+import Client from 'utils/web_client.jsx';
 
 import React from 'react';
 import ReactDOM from 'react-dom';
@@ -38,12 +38,9 @@ export default class OAuthToEmail extends React.Component {
         state.error = null;
         this.setState(state);
 
-        var postData = {};
-        postData.password = password;
-        postData.email = this.props.email;
-        postData.team_name = this.props.teamName;
-
-        Client.oauthToEmail(postData,
+        Client.oauthToEmail(
+            this.props.email,
+            password,
             (data) => {
                 if (data.follow_link) {
                     browserHistory.push(data.follow_link);
@@ -87,10 +84,9 @@ export default class OAuthToEmail extends React.Component {
                     </p>
                     <p>
                         <FormattedMessage
-                            id='claim.oauth_to_email_newPwd'
-                            defaultMessage='Enter a new password for your {team} {site} account'
+                            id='claim.oauth_to_email.enterNewPwd'
+                            defaultMessage='Enter a new password for your {site} account'
                             values={{
-                                team: this.props.teamDisplayName,
                                 site: global.window.mm_config.SiteName
                             }}
                         />
@@ -137,8 +133,6 @@ export default class OAuthToEmail extends React.Component {
 OAuthToEmail.defaultProps = {
 };
 OAuthToEmail.propTypes = {
-    teamName: React.PropTypes.string,
-    teamDisplayName: React.PropTypes.string,
     currentType: React.PropTypes.string,
     email: React.PropTypes.string
 };