From 88e5a71e8c93b495cedaa07931a4f8052d9f12ed Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Tue, 22 Sep 2015 12:12:50 -0700
Subject: Adding service settings to admin console

---
 .../components/admin_console/admin_controller.jsx  |   6 +-
 .../components/admin_console/admin_sidebar.jsx     |   9 +
 .../components/admin_console/email_settings.jsx    |  98 +++++++-
 .../components/admin_console/image_settings.jsx    |  45 ++++
 .../components/admin_console/log_settings.jsx      |  24 +-
 .../components/admin_console/service_settings.jsx  | 262 +++++++++++++++++++++
 .../components/admin_console/sql_settings.jsx      |   2 +-
 web/react/components/login.jsx                     |   4 +-
 web/react/components/signup_team.jsx               |   8 +-
 web/react/components/signup_user_complete.jsx      |   4 +-
 web/react/components/team_signup_choose_auth.jsx   |   4 +-
 web/react/utils/client.jsx                         |   2 -
 12 files changed, 438 insertions(+), 30 deletions(-)
 create mode 100644 web/react/components/admin_console/service_settings.jsx

(limited to 'web/react')

diff --git a/web/react/components/admin_console/admin_controller.jsx b/web/react/components/admin_console/admin_controller.jsx
index 72b5d5c9d..ce7d61ca9 100644
--- a/web/react/components/admin_console/admin_controller.jsx
+++ b/web/react/components/admin_console/admin_controller.jsx
@@ -15,7 +15,7 @@ var RateSettingsTab = require('./rate_settings.jsx');
 var GitLabSettingsTab = require('./gitlab_settings.jsx');
 var SqlSettingsTab = require('./sql_settings.jsx');
 var TeamSettingsTab = require('./team_settings.jsx');
-
+var ServiceSettingsTab = require('./service_settings.jsx');
 
 export default class AdminController extends React.Component {
     constructor(props) {
@@ -26,7 +26,7 @@ export default class AdminController extends React.Component {
 
         this.state = {
             config: null,
-            selected: 'team_settings'
+            selected: 'service_settings'
         };
     }
 
@@ -72,6 +72,8 @@ export default class AdminController extends React.Component {
                 tab = <SqlSettingsTab config={this.state.config} />;
             } else if (this.state.selected === 'team_settings') {
                 tab = <TeamSettingsTab config={this.state.config} />;
+            } else if (this.state.selected === 'service_settings') {
+                tab = <ServiceSettingsTab config={this.state.config} />;
             }
         }
 
diff --git a/web/react/components/admin_console/admin_sidebar.jsx b/web/react/components/admin_console/admin_sidebar.jsx
index 2b7159e1d..0983c1276 100644
--- a/web/react/components/admin_console/admin_sidebar.jsx
+++ b/web/react/components/admin_console/admin_sidebar.jsx
@@ -38,6 +38,15 @@ export default class AdminSidebar extends React.Component {
                     <ul className='nav nav-pills nav-stacked'>
                         <li>
                             <ul className='nav nav__sub-menu'>
+                                <li>
+                                    <a
+                                        href='#'
+                                        className={this.isSelected('service_settings')}
+                                        onClick={this.handleClick.bind(this, 'service_settings')}
+                                    >
+                                        {'Service Settings'}
+                                    </a>
+                                </li>
                                 <li>
                                     <a
                                         href='#'
diff --git a/web/react/components/admin_console/email_settings.jsx b/web/react/components/admin_console/email_settings.jsx
index a87dfc4da..d94859cdd 100644
--- a/web/react/components/admin_console/email_settings.jsx
+++ b/web/react/components/admin_console/email_settings.jsx
@@ -3,6 +3,7 @@
 
 var Client = require('../../utils/client.jsx');
 var AsyncClient = require('../../utils/async_client.jsx');
+var crypto = require('crypto');
 
 export default class EmailSettings extends React.Component {
     constructor(props) {
@@ -12,6 +13,8 @@ export default class EmailSettings extends React.Component {
         this.handleTestConnection = this.handleTestConnection.bind(this);
         this.handleSubmit = this.handleSubmit.bind(this);
         this.buildConfig = this.buildConfig.bind(this);
+        this.handleGenerateInvite = this.handleGenerateInvite.bind(this);
+        this.handleGenerateReset = this.handleGenerateReset.bind(this);
 
         this.state = {
             sendEmailNotifications: this.props.config.EmailSettings.SendEmailNotifications,
@@ -38,7 +41,7 @@ export default class EmailSettings extends React.Component {
 
     buildConfig() {
         var config = this.props.config;
-        config.EmailSettings.AllowSignUpWithEmail = React.findDOMNode(this.refs.allowSignUpWithEmail).checked;
+        config.EmailSettings.EnableSignUpWithEmail = React.findDOMNode(this.refs.allowSignUpWithEmail).checked;
         config.EmailSettings.SendEmailNotifications = React.findDOMNode(this.refs.sendEmailNotifications).checked;
         config.EmailSettings.RequireEmailVerification = React.findDOMNode(this.refs.requireEmailVerification).checked;
         config.EmailSettings.SendEmailNotifications = React.findDOMNode(this.refs.sendEmailNotifications).checked;
@@ -49,9 +52,36 @@ export default class EmailSettings extends React.Component {
         config.EmailSettings.SMTPUsername = React.findDOMNode(this.refs.SMTPUsername).value.trim();
         config.EmailSettings.SMTPPassword = React.findDOMNode(this.refs.SMTPPassword).value.trim();
         config.EmailSettings.ConnectionSecurity = React.findDOMNode(this.refs.ConnectionSecurity).value.trim();
+
+        config.EmailSettings.InviteSalt = React.findDOMNode(this.refs.InviteSalt).value.trim();
+        if (config.EmailSettings.InviteSalt === '') {
+            config.EmailSettings.InviteSalt = crypto.randomBytes(256).toString('base64').substring(0, 31);
+            React.findDOMNode(this.refs.InviteSalt).value = config.EmailSettings.InviteSalt;
+        }
+
+        config.EmailSettings.PasswordResetSalt = React.findDOMNode(this.refs.PasswordResetSalt).value.trim();
+        if (config.EmailSettings.PasswordResetSalt === '') {
+            config.EmailSettings.PasswordResetSalt = crypto.randomBytes(256).toString('base64').substring(0, 31);
+            React.findDOMNode(this.refs.PasswordResetSalt).value = config.EmailSettings.PasswordResetSalt;
+        }
+
         return config;
     }
 
+    handleGenerateInvite(e) {
+        e.preventDefault();
+        React.findDOMNode(this.refs.InviteSalt).value = crypto.randomBytes(256).toString('base64').substring(0, 31);
+        var s = {saveNeeded: true, serverError: this.state.serverError};
+        this.setState(s);
+    }
+
+    handleGenerateReset(e) {
+        e.preventDefault();
+        React.findDOMNode(this.refs.PasswordResetSalt).value = crypto.randomBytes(256).toString('base64').substring(0, 31);
+        var s = {saveNeeded: true, serverError: this.state.serverError};
+        this.setState(s);
+    }
+
     handleTestConnection(e) {
         e.preventDefault();
         $('#connection-button').button('loading');
@@ -166,7 +196,7 @@ export default class EmailSettings extends React.Component {
                                     name='allowSignUpWithEmail'
                                     value='true'
                                     ref='allowSignUpWithEmail'
-                                    defaultChecked={this.props.config.EmailSettings.AllowSignUpWithEmail}
+                                    defaultChecked={this.props.config.EmailSettings.EnableSignUpWithEmail}
                                     onChange={this.handleChange.bind(this, 'allowSignUpWithEmail_true')}
                                 />
                                     {'true'}
@@ -176,7 +206,7 @@ export default class EmailSettings extends React.Component {
                                     type='radio'
                                     name='allowSignUpWithEmail'
                                     value='false'
-                                    defaultChecked={!this.props.config.EmailSettings.AllowSignUpWithEmail}
+                                    defaultChecked={!this.props.config.EmailSettings.EnableSignUpWithEmail}
                                     onChange={this.handleChange.bind(this, 'allowSignUpWithEmail_false')}
                                 />
                                     {'false'}
@@ -431,6 +461,68 @@ export default class EmailSettings extends React.Component {
                         </div>
                     </div>
 
+                    <div className='form-group'>
+                        <label
+                            className='control-label col-sm-4'
+                            htmlFor='InviteSalt'
+                        >
+                            {'Invite Salt:'}
+                        </label>
+                        <div className='col-sm-8'>
+                            <input
+                                type='text'
+                                className='form-control'
+                                id='InviteSalt'
+                                ref='InviteSalt'
+                                placeholder='Ex "bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo"'
+                                defaultValue={this.props.config.EmailSettings.InviteSalt}
+                                onChange={this.handleChange}
+                                disabled={!this.state.sendEmailNotifications}
+                            />
+                            <p className='help-text'>{'32-character salt added to signing of email invites.'}</p>
+                            <div className='help-text'>
+                                <button
+                                    className='help-link'
+                                    onClick={this.handleGenerateInvite}
+                                    disabled={!this.state.sendEmailNotifications}
+                                >
+                                    {'Re-Generate'}
+                                </button>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div className='form-group'>
+                        <label
+                            className='control-label col-sm-4'
+                            htmlFor='PasswordResetSalt'
+                        >
+                            {'Password Reset Salt:'}
+                        </label>
+                        <div className='col-sm-8'>
+                            <input
+                                type='text'
+                                className='form-control'
+                                id='PasswordResetSalt'
+                                ref='PasswordResetSalt'
+                                placeholder='Ex "bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo"'
+                                defaultValue={this.props.config.EmailSettings.PasswordResetSalt}
+                                onChange={this.handleChange}
+                                disabled={!this.state.sendEmailNotifications}
+                            />
+                            <p className='help-text'>{'32-character salt added to signing of password reset emails.'}</p>
+                            <div className='help-text'>
+                                <button
+                                    className='help-link'
+                                    onClick={this.handleGenerateReset}
+                                    disabled={!this.state.sendEmailNotifications}
+                                >
+                                    {'Re-Generate'}
+                                </button>
+                            </div>
+                        </div>
+                    </div>
+
                     <div className='form-group'>
                         <div className='col-sm-12'>
                             {serverError}
diff --git a/web/react/components/admin_console/image_settings.jsx b/web/react/components/admin_console/image_settings.jsx
index c0cbb5aa6..80da0a47f 100644
--- a/web/react/components/admin_console/image_settings.jsx
+++ b/web/react/components/admin_console/image_settings.jsx
@@ -3,6 +3,7 @@
 
 var Client = require('../../utils/client.jsx');
 var AsyncClient = require('../../utils/async_client.jsx');
+var crypto = require('crypto');
 
 export default class ImageSettings extends React.Component {
     constructor(props) {
@@ -10,6 +11,7 @@ export default class ImageSettings extends React.Component {
 
         this.handleChange = this.handleChange.bind(this);
         this.handleSubmit = this.handleSubmit.bind(this);
+        this.handleGenerate = this.handleGenerate.bind(this);
 
         this.state = {
             saveNeeded: false,
@@ -28,6 +30,13 @@ export default class ImageSettings extends React.Component {
         this.setState(s);
     }
 
+    handleGenerate(e) {
+        e.preventDefault();
+        React.findDOMNode(this.refs.PublicLinkSalt).value = crypto.randomBytes(256).toString('base64').substring(0, 31);
+        var s = {saveNeeded: true, serverError: this.state.serverError};
+        this.setState(s);
+    }
+
     handleSubmit(e) {
         e.preventDefault();
         $('#save-button').button('loading');
@@ -41,6 +50,13 @@ export default class ImageSettings extends React.Component {
         config.ImageSettings.AmazonS3Region = React.findDOMNode(this.refs.AmazonS3Region).value;
         config.ImageSettings.EnablePublicLink = React.findDOMNode(this.refs.EnablePublicLink).checked;
 
+        config.ImageSettings.PublicLinkSalt = React.findDOMNode(this.refs.PublicLinkSalt).value.trim();
+
+        if (config.ImageSettings.PublicLinkSalt === '') {
+            config.ImageSettings.PublicLinkSalt = crypto.randomBytes(256).toString('base64').substring(0, 31);
+            React.findDOMNode(this.refs.PublicLinkSalt).value = config.ImageSettings.PublicLinkSalt;
+        }
+
         var thumbnailWidth = 120;
         if (!isNaN(parseInt(React.findDOMNode(this.refs.ThumbnailWidth).value, 10))) {
             thumbnailWidth = parseInt(React.findDOMNode(this.refs.ThumbnailWidth).value, 10);
@@ -424,6 +440,35 @@ export default class ImageSettings extends React.Component {
                         </div>
                     </div>
 
+                    <div className='form-group'>
+                        <label
+                            className='control-label col-sm-4'
+                            htmlFor='PublicLinkSalt'
+                        >
+                            {'Public Link Salt:'}
+                        </label>
+                        <div className='col-sm-8'>
+                            <input
+                                type='text'
+                                className='form-control'
+                                id='PublicLinkSalt'
+                                ref='PublicLinkSalt'
+                                placeholder='Ex "gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6"'
+                                defaultValue={this.props.config.ImageSettings.PublicLinkSalt}
+                                onChange={this.handleChange}
+                            />
+                            <p className='help-text'>{'32-character salt added to signing of public image links.'}</p>
+                            <div className='help-text'>
+                                <button
+                                    className='help-link'
+                                    onClick={this.handleGenerate}
+                                >
+                                    {'Re-Generate'}
+                                </button>
+                            </div>
+                        </div>
+                    </div>
+
                     <div className='form-group'>
                         <div className='col-sm-12'>
                             {serverError}
diff --git a/web/react/components/admin_console/log_settings.jsx b/web/react/components/admin_console/log_settings.jsx
index 2707ce6b6..d66801431 100644
--- a/web/react/components/admin_console/log_settings.jsx
+++ b/web/react/components/admin_console/log_settings.jsx
@@ -12,8 +12,8 @@ export default class LogSettings extends React.Component {
         this.handleSubmit = this.handleSubmit.bind(this);
 
         this.state = {
-            consoleEnable: this.props.config.LogSettings.ConsoleEnable,
-            fileEnable: this.props.config.LogSettings.FileEnable,
+            consoleEnable: this.props.config.LogSettings.EnableConsole,
+            fileEnable: this.props.config.LogSettings.EnableFile,
             saveNeeded: false,
             serverError: null
         };
@@ -46,9 +46,9 @@ export default class LogSettings extends React.Component {
         $('#save-button').button('loading');
 
         var config = this.props.config;
-        config.LogSettings.ConsoleEnable = React.findDOMNode(this.refs.consoleEnable).checked;
+        config.LogSettings.EnableConsole = React.findDOMNode(this.refs.consoleEnable).checked;
         config.LogSettings.ConsoleLevel = React.findDOMNode(this.refs.consoleLevel).value;
-        config.LogSettings.FileEnable = React.findDOMNode(this.refs.fileEnable).checked;
+        config.LogSettings.EnableFile = React.findDOMNode(this.refs.fileEnable).checked;
         config.LogSettings.FileLevel = React.findDOMNode(this.refs.fileLevel).value;
         config.LogSettings.FileLocation = React.findDOMNode(this.refs.fileLocation).value.trim();
         config.LogSettings.FileFormat = React.findDOMNode(this.refs.fileFormat).value.trim();
@@ -58,8 +58,8 @@ export default class LogSettings extends React.Component {
             () => {
                 AsyncClient.getConfig();
                 this.setState({
-                    consoleEnable: config.LogSettings.ConsoleEnable,
-                    fileEnable: config.LogSettings.FileEnable,
+                    consoleEnable: config.LogSettings.EnableConsole,
+                    fileEnable: config.LogSettings.EnableFile,
                     serverError: null,
                     saveNeeded: false
                 });
@@ -67,8 +67,8 @@ export default class LogSettings extends React.Component {
             },
             (err) => {
                 this.setState({
-                    consoleEnable: config.LogSettings.ConsoleEnable,
-                    fileEnable: config.LogSettings.FileEnable,
+                    consoleEnable: config.LogSettings.EnableConsole,
+                    fileEnable: config.LogSettings.EnableFile,
                     serverError: err.message,
                     saveNeeded: true
                 });
@@ -110,7 +110,7 @@ export default class LogSettings extends React.Component {
                                     name='consoleEnable'
                                     value='true'
                                     ref='consoleEnable'
-                                    defaultChecked={this.props.config.LogSettings.ConsoleEnable}
+                                    defaultChecked={this.props.config.LogSettings.EnableConsole}
                                     onChange={this.handleChange.bind(this, 'console_true')}
                                 />
                                     {'true'}
@@ -120,7 +120,7 @@ export default class LogSettings extends React.Component {
                                     type='radio'
                                     name='consoleEnable'
                                     value='false'
-                                    defaultChecked={!this.props.config.LogSettings.ConsoleEnable}
+                                    defaultChecked={!this.props.config.LogSettings.EnableConsole}
                                     onChange={this.handleChange.bind(this, 'console_false')}
                                 />
                                     {'false'}
@@ -166,7 +166,7 @@ export default class LogSettings extends React.Component {
                                     name='fileEnable'
                                     ref='fileEnable'
                                     value='true'
-                                    defaultChecked={this.props.config.LogSettings.FileEnable}
+                                    defaultChecked={this.props.config.LogSettings.EnableFile}
                                     onChange={this.handleChange.bind(this, 'file_true')}
                                 />
                                     {'true'}
@@ -176,7 +176,7 @@ export default class LogSettings extends React.Component {
                                     type='radio'
                                     name='fileEnable'
                                     value='false'
-                                    defaultChecked={!this.props.config.LogSettings.FileEnable}
+                                    defaultChecked={!this.props.config.LogSettings.EnableFile}
                                     onChange={this.handleChange.bind(this, 'file_false')}
                                 />
                                     {'false'}
diff --git a/web/react/components/admin_console/service_settings.jsx b/web/react/components/admin_console/service_settings.jsx
new file mode 100644
index 000000000..fcb8f800d
--- /dev/null
+++ b/web/react/components/admin_console/service_settings.jsx
@@ -0,0 +1,262 @@
+// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+var Client = require('../../utils/client.jsx');
+var AsyncClient = require('../../utils/async_client.jsx');
+
+export default class ServiceSettings extends React.Component {
+    constructor(props) {
+        super(props);
+
+        this.handleChange = this.handleChange.bind(this);
+        this.handleSubmit = this.handleSubmit.bind(this);
+
+        this.state = {
+            saveNeeded: false,
+            serverError: null
+        };
+    }
+
+    handleChange() {
+        var s = {saveNeeded: true, serverError: this.state.serverError};
+        this.setState(s);
+    }
+
+    handleSubmit(e) {
+        e.preventDefault();
+        $('#save-button').button('loading');
+
+        var config = this.props.config;
+        config.ServiceSettings.ListenAddress = React.findDOMNode(this.refs.ListenAddress).value.trim();
+        if (config.ServiceSettings.ListenAddress === '') {
+            config.ServiceSettings.ListenAddress = ':8065';
+            React.findDOMNode(this.refs.ListenAddress).value = config.ServiceSettings.ListenAddress;
+        }
+
+        config.ServiceSettings.SegmentDeveloperKey = React.findDOMNode(this.refs.SegmentDeveloperKey).value.trim();
+        config.ServiceSettings.GoogleDeveloperKey = React.findDOMNode(this.refs.GoogleDeveloperKey).value.trim();
+        config.ServiceSettings.EnableOAuthServiceProvider = React.findDOMNode(this.refs.EnableOAuthServiceProvider).checked;
+        config.ServiceSettings.EnableTesting = React.findDOMNode(this.refs.EnableTesting).checked;
+
+        var MaximumLoginAttempts = 10;
+        if (!isNaN(parseInt(React.findDOMNode(this.refs.MaximumLoginAttempts).value, 10))) {
+            MaximumLoginAttempts = parseInt(React.findDOMNode(this.refs.MaximumLoginAttempts).value, 10);
+        }
+        config.ServiceSettings.MaximumLoginAttempts = MaximumLoginAttempts;
+        React.findDOMNode(this.refs.MaximumLoginAttempts).value = MaximumLoginAttempts;
+
+        Client.saveConfig(
+            config,
+            () => {
+                AsyncClient.getConfig();
+                this.setState({
+                    serverError: null,
+                    saveNeeded: false
+                });
+                $('#save-button').button('reset');
+            },
+            (err) => {
+                this.setState({
+                    serverError: err.message,
+                    saveNeeded: true
+                });
+                $('#save-button').button('reset');
+            }
+        );
+    }
+
+    render() {
+        var serverError = '';
+        if (this.state.serverError) {
+            serverError = <div className='form-group has-error'><label className='control-label'>{this.state.serverError}</label></div>;
+        }
+
+        var saveClass = 'btn';
+        if (this.state.saveNeeded) {
+            saveClass = 'btn btn-primary';
+        }
+
+        return (
+            <div className='wrapper--fixed'>
+
+                <h3>{'Service Settings'}</h3>
+                <form
+                    className='form-horizontal'
+                    role='form'
+                >
+
+                    <div className='form-group'>
+                        <label
+                            className='control-label col-sm-4'
+                            htmlFor='ListenAddress'
+                        >
+                            {'Listen Address:'}
+                        </label>
+                        <div className='col-sm-8'>
+                            <input
+                                type='text'
+                                className='form-control'
+                                id='ListenAddress'
+                                ref='ListenAddress'
+                                placeholder='Ex ":8065"'
+                                defaultValue={this.props.config.ServiceSettings.ListenAddress}
+                                onChange={this.handleChange}
+                            />
+                            <p className='help-text'>{'The address to bind to and listen.  ":8065" will bind to all interfaces or you can choose one like "127.0.0.1:8065".  Changing this will require a server restart before taking effect.'}</p>
+                        </div>
+                    </div>
+
+                    <div className='form-group'>
+                        <label
+                            className='control-label col-sm-4'
+                            htmlFor='MaximumLoginAttempts'
+                        >
+                            {'Maximum Login Attempts:'}
+                        </label>
+                        <div className='col-sm-8'>
+                            <input
+                                type='text'
+                                className='form-control'
+                                id='MaximumLoginAttempts'
+                                ref='MaximumLoginAttempts'
+                                placeholder='Ex "10"'
+                                defaultValue={this.props.config.ServiceSettings.MaximumLoginAttempts}
+                                onChange={this.handleChange}
+                            />
+                            <p className='help-text'>{'Login attempts allowed before user is locked out and required to reset password via email.'}</p>
+                        </div>
+                    </div>
+
+                    <div className='form-group'>
+                        <label
+                            className='control-label col-sm-4'
+                            htmlFor='SegmentDeveloperKey'
+                        >
+                            {'Segment Developer Key:'}
+                        </label>
+                        <div className='col-sm-8'>
+                            <input
+                                type='text'
+                                className='form-control'
+                                id='SegmentDeveloperKey'
+                                ref='SegmentDeveloperKey'
+                                placeholder='Ex "g3fgGOXJAQ43QV7rAh6iwQCkV4cA1Gs"'
+                                defaultValue={this.props.config.ServiceSettings.SegmentDeveloperKey}
+                                onChange={this.handleChange}
+                            />
+                            <p className='help-text'>{'For users running a SaaS services, sign up for a key at Segment.com to track metrics.'}</p>
+                        </div>
+                    </div>
+
+                    <div className='form-group'>
+                        <label
+                            className='control-label col-sm-4'
+                            htmlFor='GoogleDeveloperKey'
+                        >
+                            {'Google Developer Key:'}
+                        </label>
+                        <div className='col-sm-8'>
+                            <input
+                                type='text'
+                                className='form-control'
+                                id='GoogleDeveloperKey'
+                                ref='GoogleDeveloperKey'
+                                placeholder='Ex "7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QV"'
+                                defaultValue={this.props.config.ServiceSettings.GoogleDeveloperKey}
+                                onChange={this.handleChange}
+                            />
+                            <p className='help-text'>{'Set this key to enable embedding of YouTube video previews based on hyperlinks appearing in messages or comments. Instructions to obtain a key available at '}<a href='https://www.youtube.com/watch?v=Im69kzhpR3I'>{'https://www.youtube.com/watch?v=Im69kzhpR3I'}</a>{'. Leaving field blank disables the automatic generation of YouTube video previews from links.'}</p>
+                        </div>
+                    </div>
+
+                    <div className='form-group'>
+                        <label
+                            className='control-label col-sm-4'
+                            htmlFor='EnableOAuthServiceProvider'
+                        >
+                            {'Enable OAuth Service Provider: '}
+                        </label>
+                        <div className='col-sm-8'>
+                            <label className='radio-inline'>
+                                <input
+                                    type='radio'
+                                    name='EnableOAuthServiceProvider'
+                                    value='true'
+                                    ref='EnableOAuthServiceProvider'
+                                    defaultChecked={this.props.config.ServiceSettings.EnableOAuthServiceProvider}
+                                    onChange={this.handleChange}
+                                />
+                                    {'true'}
+                            </label>
+                            <label className='radio-inline'>
+                                <input
+                                    type='radio'
+                                    name='EnableOAuthServiceProvider'
+                                    value='false'
+                                    defaultChecked={!this.props.config.ServiceSettings.EnableOAuthServiceProvider}
+                                    onChange={this.handleChange}
+                                />
+                                    {'false'}
+                            </label>
+                            <p className='help-text'>{'When enabled Mattermost will act as an Oauth2 Provider.  Changing this will require a server restart before taking effect.'}</p>
+                        </div>
+                    </div>
+
+                    <div className='form-group'>
+                        <label
+                            className='control-label col-sm-4'
+                            htmlFor='EnableTesting'
+                        >
+                            {'Enable Testing: '}
+                        </label>
+                        <div className='col-sm-8'>
+                            <label className='radio-inline'>
+                                <input
+                                    type='radio'
+                                    name='EnableTesting'
+                                    value='true'
+                                    ref='EnableTesting'
+                                    defaultChecked={this.props.config.ServiceSettings.EnableTesting}
+                                    onChange={this.handleChange}
+                                />
+                                    {'true'}
+                            </label>
+                            <label className='radio-inline'>
+                                <input
+                                    type='radio'
+                                    name='EnableTesting'
+                                    value='false'
+                                    defaultChecked={!this.props.config.ServiceSettings.EnableTesting}
+                                    onChange={this.handleChange}
+                                />
+                                    {'false'}
+                            </label>
+                            <p className='help-text'>{'When true slash commands like /loadtest are enabled in the add comment box.  Changing this will require a server restart before taking effect.  Typically used for development.'}</p>
+                        </div>
+                    </div>
+
+                    <div className='form-group'>
+                        <div className='col-sm-12'>
+                            {serverError}
+                            <button
+                                disabled={!this.state.saveNeeded}
+                                type='submit'
+                                className={saveClass}
+                                onClick={this.handleSubmit}
+                                id='save-button'
+                                data-loading-text={'<span class=\'glyphicon glyphicon-refresh glyphicon-refresh-animate\'></span> Saving Config...'}
+                            >
+                                {'Save'}
+                            </button>
+                        </div>
+                    </div>
+
+                </form>
+            </div>
+        );
+    }
+}
+
+ServiceSettings.propTypes = {
+    config: React.PropTypes.object
+};
diff --git a/web/react/components/admin_console/sql_settings.jsx b/web/react/components/admin_console/sql_settings.jsx
index 35810f7ee..cac017770 100644
--- a/web/react/components/admin_console/sql_settings.jsx
+++ b/web/react/components/admin_console/sql_settings.jsx
@@ -207,7 +207,7 @@ export default class SqlSettings extends React.Component {
                                 className='form-control'
                                 id='AtRestEncryptKey'
                                 ref='AtRestEncryptKey'
-                                placeholder='Ex "10"'
+                                placeholder='Ex "gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6"'
                                 defaultValue={this.props.config.SqlSettings.AtRestEncryptKey}
                                 onChange={this.handleChange}
                             />
diff --git a/web/react/components/login.jsx b/web/react/components/login.jsx
index b12c5d988..8cc4f1483 100644
--- a/web/react/components/login.jsx
+++ b/web/react/components/login.jsx
@@ -95,7 +95,7 @@ export default class Login extends React.Component {
         }
 
         let loginMessage = [];
-        if (global.window.config.AllowSignUpWithGitLab === 'true') {
+        if (global.window.config.EnableSignUpWithGitLab === 'true') {
             loginMessage.push(
                     <a
                         className='btn btn-custom-login gitlab'
@@ -113,7 +113,7 @@ export default class Login extends React.Component {
         }
 
         let emailSignup;
-        if (global.window.config.AllowSignUpWithEmail === 'true') {
+        if (global.window.config.EnableSignUpWithEmail === 'true') {
             emailSignup = (
                 <div>
                     <div className={'form-group' + errorClass}>
diff --git a/web/react/components/signup_team.jsx b/web/react/components/signup_team.jsx
index d08608c9b..7f320e0b2 100644
--- a/web/react/components/signup_team.jsx
+++ b/web/react/components/signup_team.jsx
@@ -14,19 +14,19 @@ export default class TeamSignUp extends React.Component {
 
         var count = 0;
 
-        if (global.window.config.AllowSignUpWithEmail === 'true') {
+        if (global.window.config.EnableSignUpWithEmail === 'true') {
             count = count + 1;
         }
 
-        if (global.window.config.AllowSignUpWithGitLab === 'true') {
+        if (global.window.config.EnableSignUpWithGitLab === 'true') {
             count = count + 1;
         }
 
         if (count > 1) {
             this.state = {page: 'choose'};
-        } else if (global.window.config.AllowSignUpWithEmail === 'true') {
+        } else if (global.window.config.EnableSignUpWithEmail === 'true') {
             this.state = {page: 'email'};
-        } else if (global.window.config.AllowSignUpWithGitLab === 'true') {
+        } else if (global.window.config.EnableSignUpWithGitLab === 'true') {
             this.state = {page: 'gitlab'};
         }
     }
diff --git a/web/react/components/signup_user_complete.jsx b/web/react/components/signup_user_complete.jsx
index 237169f17..4dad1ef4f 100644
--- a/web/react/components/signup_user_complete.jsx
+++ b/web/react/components/signup_user_complete.jsx
@@ -161,7 +161,7 @@ export default class SignupUserComplete extends React.Component {
         );
 
         var signupMessage = [];
-        if (global.window.config.AllowSignUpWithGitLab === 'true') {
+        if (global.window.config.EnableSignUpWithGitLab === 'true') {
             signupMessage.push(
                     <a
                         className='btn btn-custom-login gitlab'
@@ -174,7 +174,7 @@ export default class SignupUserComplete extends React.Component {
         }
 
         var emailSignup;
-        if (global.window.config.AllowSignUpWithEmail === 'true') {
+        if (global.window.config.EnableSignUpWithEmail === 'true') {
             emailSignup = (
                 <div>
                     <div className='inner__content'>
diff --git a/web/react/components/team_signup_choose_auth.jsx b/web/react/components/team_signup_choose_auth.jsx
index 4aeae8f08..b8264b887 100644
--- a/web/react/components/team_signup_choose_auth.jsx
+++ b/web/react/components/team_signup_choose_auth.jsx
@@ -8,7 +8,7 @@ export default class ChooseAuthPage extends React.Component {
     }
     render() {
         var buttons = [];
-        if (global.window.config.AllowSignUpWithGitLab === 'true') {
+        if (global.window.config.EnableSignUpWithGitLab === 'true') {
             buttons.push(
                     <a
                         className='btn btn-custom-login gitlab btn-full'
@@ -26,7 +26,7 @@ export default class ChooseAuthPage extends React.Component {
             );
         }
 
-        if (global.window.config.AllowSignUpWithEmail === 'true') {
+        if (global.window.config.EnableSignUpWithEmail === 'true') {
             buttons.push(
                     <a
                         className='btn btn-custom-login email btn-full'
diff --git a/web/react/utils/client.jsx b/web/react/utils/client.jsx
index b3fb28e99..b01e2bb24 100644
--- a/web/react/utils/client.jsx
+++ b/web/react/utils/client.jsx
@@ -4,12 +4,10 @@ var BrowserStore = require('../stores/browser_store.jsx');
 var TeamStore = require('../stores/team_store.jsx');
 
 export function track(category, action, label, prop, val) {
-    global.window.snowplow('trackStructEvent', category, action, label, prop, val);
     global.window.analytics.track(action, {category: category, label: label, property: prop, value: val});
 }
 
 export function trackPage() {
-    global.window.snowplow('trackPageView');
     global.window.analytics.page();
 }
 
-- 
cgit v1.2.3-1-g7c22