Merge branch 'master' of https://github.com/mattermost/platform into plt-383

1 files changed, 53 insertions, 52 deletions

diff --git a/web/react/components/admin_console/gitlab_settings.jsx b/web/react/components/admin_console/gitlab_settings.jsx
index 1e10c5592..759892ad3 100644
--- a/web/react/components/admin_console/gitlab_settings.jsx
+++ b/web/react/components/admin_console/gitlab_settings.jsx
@@ -12,7 +12,7 @@ export default class GitLabSettings extends React.Component {
         this.handleSubmit = this.handleSubmit.bind(this);
 
         this.state = {
-            Allow: this.props.config.GitLabSettings.Allow,
+            Enable: this.props.config.GitLabSettings.Enable,
             saveNeeded: false,
             serverError: null
         };
@@ -21,12 +21,12 @@ export default class GitLabSettings extends React.Component {
     handleChange(action) {
         var s = {saveNeeded: true, serverError: this.state.serverError};
 
-        if (action === 'AllowTrue') {
-            s.Allow = true;
+        if (action === 'EnableTrue') {
+            s.Enable = true;
         }
 
-        if (action === 'AllowFalse') {
-            s.Allow = false;
+        if (action === 'EnableFalse') {
+            s.Enable = false;
         }
 
         this.setState(s);
@@ -37,10 +37,9 @@ export default class GitLabSettings extends React.Component {
         $('#save-button').button('loading');
 
         var config = this.props.config;
-        config.GitLabSettings.Allow = React.findDOMNode(this.refs.Allow).checked;
+        config.GitLabSettings.Enable = React.findDOMNode(this.refs.Enable).checked;
         config.GitLabSettings.Secret = React.findDOMNode(this.refs.Secret).value.trim();
         config.GitLabSettings.Id = React.findDOMNode(this.refs.Id).value.trim();
-        config.GitLabSettings.Scope = React.findDOMNode(this.refs.Scope).value.trim();
         config.GitLabSettings.AuthEndpoint = React.findDOMNode(this.refs.AuthEndpoint).value.trim();
         config.GitLabSettings.TokenEndpoint = React.findDOMNode(this.refs.TokenEndpoint).value.trim();
         config.GitLabSettings.UserApiEndpoint = React.findDOMNode(this.refs.UserApiEndpoint).value.trim();
@@ -88,7 +87,7 @@ export default class GitLabSettings extends React.Component {
                     <div className='form-group'>
                         <label
                             className='control-label col-sm-4'
-                            htmlFor='Allow'
+                            htmlFor='Enable'
                         >
                             {'Enable Sign Up With GitLab: '}
                         </label>
@@ -96,21 +95,21 @@ export default class GitLabSettings extends React.Component {
                             <label className='radio-inline'>
                                 <input
                                     type='radio'
-                                    name='Allow'
+                                    name='Enable'
                                     value='true'
-                                    ref='Allow'
-                                    defaultChecked={this.props.config.GitLabSettings.Allow}
-                                    onChange={this.handleChange.bind(this, 'AllowTrue')}
+                                    ref='Enable'
+                                    defaultChecked={this.props.config.GitLabSettings.Enable}
+                                    onChange={this.handleChange.bind(this, 'EnableTrue')}
                                 />
                                     {'true'}
                             </label>
                             <label className='radio-inline'>
                                 <input
                                     type='radio'
-                                    name='Allow'
+                                    name='Enable'
                                     value='false'
-                                    defaultChecked={!this.props.config.GitLabSettings.Allow}
-                                    onChange={this.handleChange.bind(this, 'AllowFalse')}
+                                    defaultChecked={!this.props.config.GitLabSettings.Enable}
+                                    onChange={this.handleChange.bind(this, 'EnableFalse')}
                                 />
                                     {'false'}
                             </label>
@@ -121,28 +120,6 @@ export default class GitLabSettings extends React.Component {
                     <div className='form-group'>
                         <label
                             className='control-label col-sm-4'
-                            htmlFor='Secret'
-                        >
-                            {'Secret:'}
-                        </label>
-                        <div className='col-sm-8'>
-                            <input
-                                type='text'
-                                className='form-control'
-                                id='Secret'
-                                ref='Secret'
-                                placeholder='Ex "jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY"'
-                                defaultValue={this.props.config.GitLabSettings.Secret}
-                                onChange={this.handleChange}
-                                disabled={!this.state.Allow}
-                            />
-                            <p className='help-text'>{'Obtain this value via the instructions above for logging into GitLab.'}</p>
-                        </div>
-                    </div>
-
-                    <div className='form-group'>
-                        <label
-                            className='control-label col-sm-4'
                             htmlFor='Id'
                         >
                             {'Id:'}
@@ -156,7 +133,7 @@ export default class GitLabSettings extends React.Component {
                                 placeholder='Ex "jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY"'
                                 defaultValue={this.props.config.GitLabSettings.Id}
                                 onChange={this.handleChange}
-                                disabled={!this.state.Allow}
+                                disabled={!this.state.Enable}
                             />
                             <p className='help-text'>{'Obtain this value via the instructions above for logging into GitLab'}</p>
                         </div>
@@ -165,22 +142,22 @@ export default class GitLabSettings extends React.Component {
                     <div className='form-group'>
                         <label
                             className='control-label col-sm-4'
-                            htmlFor='Scope'
+                            htmlFor='Secret'
                         >
-                            {'Scope:'}
+                            {'Secret:'}
                         </label>
                         <div className='col-sm-8'>
                             <input
                                 type='text'
                                 className='form-control'
-                                id='Scope'
-                                ref='Scope'
-                                placeholder='Not currently used by GitLab. Please leave blank'
-                                defaultValue={this.props.config.GitLabSettings.Scope}
+                                id='Secret'
+                                ref='Secret'
+                                placeholder='Ex "jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY"'
+                                defaultValue={this.props.config.GitLabSettings.Secret}
                                 onChange={this.handleChange}
-                                disabled={!this.state.Allow}
+                                disabled={!this.state.Enable}
                             />
-                            <p className='help-text'>{'This field is not yet used by GitLab OAuth. Other OAuth providers may use this field to specify the scope of account data from OAuth provider that is sent to Mattermost.'}</p>
+                            <p className='help-text'>{'Obtain this value via the instructions above for logging into GitLab.'}</p>
                         </div>
                     </div>
 
@@ -200,9 +177,9 @@ export default class GitLabSettings extends React.Component {
                                 placeholder='Ex ""'
                                 defaultValue={this.props.config.GitLabSettings.AuthEndpoint}
                                 onChange={this.handleChange}
-                                disabled={!this.state.Allow}
+                                disabled={!this.state.Enable}
                             />
-                            <p className='help-text'>{'Enter <your-gitlab-url>/oauth/authorize (example http://localhost:3000/oauth/authorize).'}</p>
+                            <p className='help-text'>{'Enter <your-gitlab-url>/oauth/authorize (example http://localhost:3000/oauth/authorize).  Make sure you use HTTP or HTTPS in your URLs as appropriate.'}</p>
                         </div>
                     </div>
 
@@ -222,9 +199,9 @@ export default class GitLabSettings extends React.Component {
                                 placeholder='Ex ""'
                                 defaultValue={this.props.config.GitLabSettings.TokenEndpoint}
                                 onChange={this.handleChange}
-                                disabled={!this.state.Allow}
+                                disabled={!this.state.Enable}
                             />
-                            <p className='help-text'>{'Enter <your-gitlab-url>/oauth/token.'}</p>
+                            <p className='help-text'>{'Enter <your-gitlab-url>/oauth/token.   Make sure you use HTTP or HTTPS in your URLs as appropriate.'}</p>
                         </div>
                     </div>
 
@@ -244,9 +221,9 @@ export default class GitLabSettings extends React.Component {
                                 placeholder='Ex ""'
                                 defaultValue={this.props.config.GitLabSettings.UserApiEndpoint}
                                 onChange={this.handleChange}
-                                disabled={!this.state.Allow}
+                                disabled={!this.state.Enable}
                             />
-                            <p className='help-text'>{'Enter <your-gitlab-url>/api/v3/user.'}</p>
+                            <p className='help-text'>{'Enter <your-gitlab-url>/api/v3/user.  Make sure you use HTTP or HTTPS in your URLs as appropriate.'}</p>
                         </div>
                     </div>
 
@@ -272,6 +249,30 @@ export default class GitLabSettings extends React.Component {
     }
 }
 
+
+//config.GitLabSettings.Scope = React.findDOMNode(this.refs.Scope).value.trim();
+//  <div className='form-group'>
+//     <label
+//         className='control-label col-sm-4'
+//         htmlFor='Scope'
+//     >
+//         {'Scope:'}
+//     </label>
+//     <div className='col-sm-8'>
+//         <input
+//             type='text'
+//             className='form-control'
+//             id='Scope'
+//             ref='Scope'
+//             placeholder='Not currently used by GitLab. Please leave blank'
+//             defaultValue={this.props.config.GitLabSettings.Scope}
+//             onChange={this.handleChange}
+//             disabled={!this.state.Allow}
+//         />
+//         <p className='help-text'>{'This field is not yet used by GitLab OAuth. Other OAuth providers may use this field to specify the scope of account data from OAuth provider that is sent to Mattermost.'}</p>
+//     </div>
+// </div>
+
 GitLabSettings.propTypes = {
     config: React.PropTypes.object
 };