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, 54 insertions, 51 deletions

diff --git a/webapp/components/admin_console/team_settings.jsx b/webapp/components/admin_console/team_settings.jsx
index 6c9828351..bbb7ec3c4 100644
--- a/webapp/components/admin_console/team_settings.jsx
+++ b/webapp/components/admin_console/team_settings.jsx
@@ -2,7 +2,7 @@
 // See License.txt for license information.
 
 import $ from 'jquery';
-import * as Client from 'utils/client.jsx';
+import Client from 'utils/web_client.jsx';
 import * as AsyncClient from 'utils/async_client.jsx';
 import * as Utils from 'utils/utils.jsx';
 
@@ -42,6 +42,7 @@ class TeamSettings extends React.Component {
         this.handleImageSubmit = this.handleImageSubmit.bind(this);
 
         this.uploading = false;
+        this.timestamp = 0;
 
         this.state = {
             saveNeeded: false,
@@ -53,7 +54,7 @@ class TeamSettings extends React.Component {
 
     componentWillMount() {
         if (global.window.mm_license.IsLicensed === 'true' && global.window.mm_license.CustomBrand === 'true') {
-            $.get('/api/v1/admin/get_brand_image').done(() => this.setState({brandImageExists: true}));
+            $.get(Client.getAdminRoute() + '/get_brand_image').done(() => this.setState({brandImageExists: true}));
         }
     }
 
@@ -89,6 +90,7 @@ class TeamSettings extends React.Component {
         if (element.prop('files').length > 0) {
             this.setState({fileSelected: true, brandImage: element.prop('files')[0]});
         }
+        $('#upload-button').button('reset');
     }
 
     handleSubmit(e) {
@@ -100,8 +102,8 @@ class TeamSettings extends React.Component {
         config.TeamSettings.RestrictCreationToDomains = this.refs.RestrictCreationToDomains.value.trim();
         config.TeamSettings.EnableTeamCreation = this.refs.EnableTeamCreation.checked;
         config.TeamSettings.EnableUserCreation = this.refs.EnableUserCreation.checked;
+        config.TeamSettings.EnableOpenServer = this.refs.EnableOpenServer.checked;
         config.TeamSettings.RestrictTeamNames = this.refs.RestrictTeamNames.checked;
-        config.TeamSettings.EnableTeamListing = this.refs.EnableTeamListing.checked;
 
         if (this.refs.EnableCustomBrand) {
             config.TeamSettings.EnableCustomBrand = this.refs.EnableCustomBrand.checked;
@@ -155,6 +157,7 @@ class TeamSettings extends React.Component {
         Client.uploadBrandImage(this.state.brandImage,
             () => {
                 $('#upload-button').button('complete');
+                this.timestamp = Utils.getTimestamp();
                 this.setState({brandImageExists: true, brandImage: null});
                 this.uploading = false;
             },
@@ -193,7 +196,7 @@ class TeamSettings extends React.Component {
                 img = (
                     <img
                         className='brand-img'
-                        src='/api/v1/admin/get_brand_image'
+                        src={Client.getAdminRoute() + '/get_brand_image?t=' + this.timestamp}
                     />
                 );
             } else {
@@ -537,6 +540,53 @@ class TeamSettings extends React.Component {
                     <div className='form-group'>
                         <label
                             className='control-label col-sm-4'
+                            htmlFor='EnableOpenServer'
+                        >
+                            <FormattedMessage
+                                id='admin.team.openServerTitle'
+                                defaultMessage='Enable Open Server: '
+                            />
+                        </label>
+                        <div className='col-sm-8'>
+                            <label className='radio-inline'>
+                                <input
+                                    type='radio'
+                                    name='EnableOpenServer'
+                                    value='true'
+                                    ref='EnableOpenServer'
+                                    defaultChecked={this.props.config.TeamSettings.EnableOpenServer}
+                                    onChange={this.handleChange}
+                                />
+                                    <FormattedMessage
+                                        id='admin.team.true'
+                                        defaultMessage='true'
+                                    />
+                            </label>
+                            <label className='radio-inline'>
+                                <input
+                                    type='radio'
+                                    name='EnableOpenServer'
+                                    value='false'
+                                    defaultChecked={!this.props.config.TeamSettings.EnableOpenServer}
+                                    onChange={this.handleChange}
+                                />
+                                    <FormattedMessage
+                                        id='admin.team.false'
+                                        defaultMessage='false'
+                                    />
+                            </label>
+                            <p className='help-text'>
+                                <FormattedMessage
+                                    id='admin.team.openServerDescription'
+                                    defaultMessage='When true, anyone can signup for a user account on this server without the need to be invited.'
+                                />
+                            </p>
+                        </div>
+                    </div>
+
+                    <div className='form-group'>
+                        <label
+                            className='control-label col-sm-4'
                             htmlFor='RestrictCreationToDomains'
                         >
                             <FormattedMessage
@@ -610,53 +660,6 @@ class TeamSettings extends React.Component {
                         </div>
                     </div>
 
-                    <div className='form-group'>
-                        <label
-                            className='control-label col-sm-4'
-                            htmlFor='EnableTeamListing'
-                        >
-                            <FormattedMessage
-                                id='admin.team.dirTitle'
-                                defaultMessage='Enable Team Directory: '
-                            />
-                        </label>
-                        <div className='col-sm-8'>
-                            <label className='radio-inline'>
-                                <input
-                                    type='radio'
-                                    name='EnableTeamListing'
-                                    value='true'
-                                    ref='EnableTeamListing'
-                                    defaultChecked={this.props.config.TeamSettings.EnableTeamListing}
-                                    onChange={this.handleChange}
-                                />
-                                    <FormattedMessage
-                                        id='admin.team.true'
-                                        defaultMessage='true'
-                                    />
-                            </label>
-                            <label className='radio-inline'>
-                                <input
-                                    type='radio'
-                                    name='EnableTeamListing'
-                                    value='false'
-                                    defaultChecked={!this.props.config.TeamSettings.EnableTeamListing}
-                                    onChange={this.handleChange}
-                                />
-                                    <FormattedMessage
-                                        id='admin.team.false'
-                                        defaultMessage='false'
-                                    />
-                            </label>
-                            <p className='help-text'>
-                                <FormattedMessage
-                                    id='admin.team.dirDesc'
-                                    defaultMessage='When true, teams that are configured to show in team directory will show on main page inplace of creating a new team.'
-                                />
-                            </p>
-                        </div>
-                    </div>
-
                     {brand}
 
                     <div className='form-group'>