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, 105 insertions, 28 deletions

diff --git a/webapp/components/admin_console/user_item.jsx b/webapp/components/admin_console/user_item.jsx
index 5bd05d063..b8f21d77e 100644
--- a/webapp/components/admin_console/user_item.jsx
+++ b/webapp/components/admin_console/user_item.jsx
@@ -1,13 +1,13 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import * as Client from 'utils/client.jsx';
+import Client from 'utils/web_client.jsx';
 import * as Utils from 'utils/utils.jsx';
 import UserStore from 'stores/user_store.jsx';
 import ConfirmModal from '../confirm_modal.jsx';
 import TeamStore from 'stores/team_store.jsx';
 
-import {FormattedMessage} from 'react-intl';
+import {FormattedMessage, FormattedHTMLMessage} from 'react-intl';
 
 import React from 'react';
 import {browserHistory} from 'react-router';
@@ -22,6 +22,7 @@ export default class UserItem extends React.Component {
         this.handleMakeAdmin = this.handleMakeAdmin.bind(this);
         this.handleMakeSystemAdmin = this.handleMakeSystemAdmin.bind(this);
         this.handleResetPassword = this.handleResetPassword.bind(this);
+        this.handleResetMfa = this.handleResetMfa.bind(this);
         this.handleDemote = this.handleDemote.bind(this);
         this.handleDemoteSubmit = this.handleDemoteSubmit.bind(this);
         this.handleDemoteCancel = this.handleDemoteCancel.bind(this);
@@ -40,12 +41,9 @@ export default class UserItem extends React.Component {
         if (this.props.user.id === me.id) {
             this.handleDemote(this.props.user, '');
         } else {
-            const data = {
-                user_id: this.props.user.id,
-                new_roles: ''
-            };
-
-            Client.updateRoles(data,
+            Client.updateRoles(
+                this.props.user.id,
+                '',
                 () => {
                     this.props.refreshProfiles();
                 },
@@ -86,12 +84,9 @@ export default class UserItem extends React.Component {
         if (this.props.user.id === me.id) {
             this.handleDemote(this.props.user, 'admin');
         } else {
-            const data = {
-                user_id: this.props.user.id,
-                new_roles: 'admin'
-            };
-
-            Client.updateRoles(data,
+            Client.updateRoles(
+                this.props.user.id,
+                'admin',
                 () => {
                     this.props.refreshProfiles();
                 },
@@ -104,12 +99,10 @@ export default class UserItem extends React.Component {
 
     handleMakeSystemAdmin(e) {
         e.preventDefault();
-        const data = {
-            user_id: this.props.user.id,
-            new_roles: 'system_admin'
-        };
 
-        Client.updateRoles(data,
+        Client.updateRoles(
+            this.props.user.id,
+            'system_admin',
             () => {
                 this.props.refreshProfiles();
             },
@@ -124,6 +117,19 @@ export default class UserItem extends React.Component {
         this.props.doPasswordReset(this.props.user);
     }
 
+    handleResetMfa(e) {
+        e.preventDefault();
+
+        Client.adminResetMfa(this.props.user.id,
+            () => {
+                this.props.refreshProfiles();
+            },
+            (err) => {
+                this.setState({serverError: err.message});
+            }
+        );
+    }
+
     handleDemote(user, role) {
         this.setState({
             serverError: this.state.serverError,
@@ -143,12 +149,9 @@ export default class UserItem extends React.Component {
     }
 
     handleDemoteSubmit() {
-        const data = {
-            user_id: this.props.user.id,
-            new_roles: this.state.role
-        };
-
-        Client.updateRoles(data,
+        Client.updateRoles(
+            this.props.user.id,
+            this.state.role,
             () => {
                 this.setState({
                     serverError: null,
@@ -211,10 +214,15 @@ export default class UserItem extends React.Component {
 
         const email = user.email;
         let showMakeMember = user.roles === 'admin' || user.roles === 'system_admin';
-        let showMakeAdmin = user.roles === '' || user.roles === 'system_admin';
+
+        //let showMakeAdmin = user.roles === '' || user.roles === 'system_admin';
+        let showMakeAdmin = false;
+
         let showMakeSystemAdmin = user.roles === '' || user.roles === 'admin';
         let showMakeActive = false;
         let showMakeNotActive = user.roles !== 'system_admin';
+        let mfaEnabled = global.window.mm_license.IsLicensed === 'true' && global.window.mm_license.MFA === 'true' && global.window.mm_config.EnableMultifactorAuthentication === 'true';
+        let showMfaReset = mfaEnabled && user.mfa_active;
 
         if (user.delete_at > 0) {
             currentRoles = (
@@ -319,6 +327,64 @@ export default class UserItem extends React.Component {
                 </li>
             );
         }
+
+        let mfaReset = null;
+        if (showMfaReset) {
+            mfaReset = (
+                <li role='presentation'>
+                    <a
+                        role='menuitem'
+                        href='#'
+                        onClick={this.handleResetMfa}
+                    >
+                        <FormattedMessage
+                            id='admin.user_item.resetMfa'
+                            defaultMessage='Remove MFA'
+                        />
+                    </a>
+                </li>
+            );
+        }
+
+        let mfaActiveText;
+        if (mfaEnabled) {
+            if (user.mfa_active) {
+                mfaActiveText = (
+                    <FormattedHTMLMessage
+                        id='admin.user_item.mfaYes'
+                        defaultMessage=', <strong>MFA</strong>: Yes'
+                    />
+                );
+            } else {
+                mfaActiveText = (
+                    <FormattedHTMLMessage
+                        id='admin.user_item.mfaNo'
+                        defaultMessage=', <strong>MFA</strong>: No'
+                    />
+                );
+            }
+        }
+
+        let authServiceText;
+        if (user.auth_service) {
+            authServiceText = (
+                <FormattedHTMLMessage
+                    id='admin.user_item.authServiceNotEmail'
+                    defaultMessage=', <strong>Sign-in Method:</strong> {service}'
+                    values={{
+                        service: Utils.toTitleCase(user.auth_service)
+                    }}
+                />
+            );
+        } else {
+            authServiceText = (
+                <FormattedHTMLMessage
+                    id='admin.user_item.authServiceEmail'
+                    defaultMessage=', <strong>Sign-in Method:</strong> Email'
+                />
+            );
+        }
+
         const me = UserStore.getCurrentUser();
         let makeDemoteModal = null;
         if (this.props.user.id === me.id) {
@@ -368,13 +434,23 @@ export default class UserItem extends React.Component {
             <div className='more-modal__row'>
                 <img
                     className='more-modal__image pull-left'
-                    src={`/api/v1/users/${user.id}/image?time=${user.update_at}`}
+                    src={`${Client.getUsersRoute()}/${user.id}/image?time=${user.update_at}`}
                     height='36'
                     width='36'
                 />
                 <div className='more-modal__details'>
                     <div className='more-modal__name'>{Utils.getDisplayName(user)}</div>
-                    <div className='more-modal__description'>{email}</div>
+                    <div className='more-modal__description'>
+                        <FormattedHTMLMessage
+                            id='admin.user_item.emailTitle'
+                            defaultMessage='<strong>Email:</strong> {email}'
+                            values={{
+                                email
+                            }}
+                        />
+                        {authServiceText}
+                        {mfaActiveText}
+                    </div>
                 </div>
                 <div className='more-modal__actions'>
                     <div className='dropdown member-drop'>
@@ -397,6 +473,7 @@ export default class UserItem extends React.Component {
                             {makeActive}
                             {makeNotActive}
                             {makeSystemAdmin}
+                            {mfaReset}
                             <li role='presentation'>
                                 <a
                                     role='menuitem'