Fixing merge conflict

1 files changed, 300 insertions, 0 deletions

diff --git a/web/react/components/user_settings/user_settings_security.jsx b/web/react/components/user_settings/user_settings_security.jsx
new file mode 100644
index 000000000..b59c08af0
--- /dev/null
+++ b/web/react/components/user_settings/user_settings_security.jsx
@@ -0,0 +1,300 @@
+// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+var SettingItemMin = require('../setting_item_min.jsx');
+var SettingItemMax = require('../setting_item_max.jsx');
+var Client = require('../../utils/client.jsx');
+var AsyncClient = require('../../utils/async_client.jsx');
+var Constants = require('../../utils/constants.jsx');
+
+export default class SecurityTab extends React.Component {
+    constructor(props) {
+        super(props);
+
+        this.submitPassword = this.submitPassword.bind(this);
+        this.updateCurrentPassword = this.updateCurrentPassword.bind(this);
+        this.updateNewPassword = this.updateNewPassword.bind(this);
+        this.updateConfirmPassword = this.updateConfirmPassword.bind(this);
+        this.handleClose = this.handleClose.bind(this);
+        this.setupInitialState = this.setupInitialState.bind(this);
+
+        this.state = this.setupInitialState();
+    }
+    submitPassword(e) {
+        e.preventDefault();
+
+        var user = this.props.user;
+        var currentPassword = this.state.currentPassword;
+        var newPassword = this.state.newPassword;
+        var confirmPassword = this.state.confirmPassword;
+
+        if (currentPassword === '') {
+            this.setState({passwordError: 'Please enter your current password', serverError: ''});
+            return;
+        }
+
+        if (newPassword.length < 5) {
+            this.setState({passwordError: 'New passwords must be at least 5 characters', serverError: ''});
+            return;
+        }
+
+        if (newPassword !== confirmPassword) {
+            this.setState({passwordError: 'The new passwords you entered do not match', serverError: ''});
+            return;
+        }
+
+        var data = {};
+        data.user_id = user.id;
+        data.current_password = currentPassword;
+        data.new_password = newPassword;
+
+        Client.updatePassword(data,
+            function success() {
+                this.props.updateSection('');
+                AsyncClient.getMe();
+                this.setState(this.setupInitialState());
+            }.bind(this),
+            function fail(err) {
+                var state = this.setupInitialState();
+                if (err.message) {
+                    state.serverError = err.message;
+                } else {
+                    state.serverError = err;
+                }
+                state.passwordError = '';
+                this.setState(state);
+            }.bind(this)
+        );
+    }
+    updateCurrentPassword(e) {
+        this.setState({currentPassword: e.target.value});
+    }
+    updateNewPassword(e) {
+        this.setState({newPassword: e.target.value});
+    }
+    updateConfirmPassword(e) {
+        this.setState({confirmPassword: e.target.value});
+    }
+    handleHistoryOpen() {
+        $('#user_settings').modal('hide');
+    }
+    handleDevicesOpen() {
+        $('#user_settings').modal('hide');
+    }
+    handleClose() {
+        $(React.findDOMNode(this)).find('.form-control').each(function resetValue() {
+            this.value = '';
+        });
+        this.setState({currentPassword: '', newPassword: '', confirmPassword: '', serverError: null, passwordError: null});
+
+        this.props.updateTab('general');
+    }
+    setupInitialState() {
+        return {currentPassword: '', newPassword: '', confirmPassword: ''};
+    }
+    componentDidMount() {
+        $('#user_settings').on('hidden.bs.modal', this.handleClose);
+    }
+    componentWillUnmount() {
+        $('#user_settings').off('hidden.bs.modal', this.handleClose);
+        this.props.updateSection('');
+    }
+    render() {
+        var serverError;
+        if (this.state.serverError) {
+            serverError = this.state.serverError;
+        }
+        var passwordError;
+        if (this.state.passwordError) {
+            passwordError = this.state.passwordError;
+        }
+
+        var updateSectionStatus;
+        var passwordSection;
+        if (this.props.activeSection === 'password') {
+            var inputs = [];
+            var submit = null;
+
+            if (this.props.user.auth_service === '') {
+                inputs.push(
+                    <div
+                        key='currentPasswordUpdateForm'
+                        className='form-group'
+                    >
+                        <label className='col-sm-5 control-label'>Current Password</label>
+                        <div className='col-sm-7'>
+                            <input
+                                className='form-control'
+                                type='password'
+                                onChange={this.updateCurrentPassword}
+                                value={this.state.currentPassword}
+                            />
+                        </div>
+                    </div>
+                );
+                inputs.push(
+                    <div
+                        key='newPasswordUpdateForm'
+                        className='form-group'
+                    >
+                        <label className='col-sm-5 control-label'>New Password</label>
+                        <div className='col-sm-7'>
+                            <input
+                                className='form-control'
+                                type='password'
+                                onChange={this.updateNewPassword}
+                                value={this.state.newPassword}
+                            />
+                        </div>
+                    </div>
+                );
+                inputs.push(
+                    <div
+                        key='retypeNewPasswordUpdateForm'
+                        className='form-group'
+                    >
+                        <label className='col-sm-5 control-label'>Retype New Password</label>
+                        <div className='col-sm-7'>
+                            <input
+                                className='form-control'
+                                type='password'
+                                onChange={this.updateConfirmPassword}
+                                value={this.state.confirmPassword}
+                            />
+                        </div>
+                    </div>
+                );
+
+                submit = this.submitPassword;
+            } else {
+                inputs.push(
+                    <div
+                        key='oauthPasswordInfo'
+                        className='form-group'
+                    >
+                        <label className='col-sm-12'>Log in occurs through GitLab. Please see your GitLab account settings page to update your password.</label>
+                    </div>
+                );
+            }
+
+            updateSectionStatus = function resetSection(e) {
+                this.props.updateSection('');
+                this.setState({currentPassword: '', newPassword: '', confirmPassword: '', serverError: null, passwordError: null});
+                e.preventDefault();
+            }.bind(this);
+
+            passwordSection = (
+                <SettingItemMax
+                    title='Password'
+                    inputs={inputs}
+                    submit={submit}
+                    server_error={serverError}
+                    client_error={passwordError}
+                    updateSection={updateSectionStatus}
+                />
+            );
+        } else {
+            var describe;
+            if (this.props.user.auth_service === '') {
+                var d = new Date(this.props.user.last_password_update);
+                var hour = '12';
+                if (d.getHours() % 12) {
+                    hour = String(d.getHours() % 12);
+                }
+                var min = String(d.getMinutes());
+                if (d.getMinutes() < 10) {
+                    min = '0' + d.getMinutes();
+                }
+                var timeOfDay = ' am';
+                if (d.getHours() >= 12) {
+                    timeOfDay = ' pm';
+                }
+
+                describe = 'Last updated ' + Constants.MONTHS[d.getMonth()] + ' ' + d.getDate() + ', ' + d.getFullYear() + ' at ' + hour + ':' + min + timeOfDay;
+            } else {
+                describe = 'Log in done through GitLab';
+            }
+
+            updateSectionStatus = function updateSection() {
+                this.props.updateSection('password');
+            }.bind(this);
+
+            passwordSection = (
+                <SettingItemMin
+                    title='Password'
+                    describe={describe}
+                    updateSection={updateSectionStatus}
+                />
+            );
+        }
+
+        return (
+            <div>
+                <div className='modal-header'>
+                    <button
+                        type='button'
+                        className='close'
+                        data-dismiss='modal'
+                        aria-label='Close'
+                    >
+                        <span aria-hidden='true'>&times;</span>
+                    </button>
+                    <h4
+                        className='modal-title'
+                        ref='title'
+                    >
+                        <i className='modal-back'></i>Security Settings
+                    </h4>
+                </div>
+                <div className='user-settings'>
+                    <h3 className='tab-header'>Security Settings</h3>
+                    <div className='divider-dark first'/>
+                    {passwordSection}
+                    <div className='divider-dark'/>
+                    <ul
+                        className='section-min'
+                    >
+                        <li className='col-sm-10 section-title'>{'Version ' + global.window.config.Version}</li>
+                        <li className='col-sm-7 section-describe'>
+                            <div className='text-nowrap'>{'Build Number: ' + global.window.config.BuildNumber}</div>
+                            <div className='text-nowrap'>{'Build Date: ' + global.window.config.BuildDate}</div>
+                            <div className='text-nowrap'>{'Build Hash: ' + global.window.config.BuildHash}</div>
+                        </li>
+                    </ul>
+                    <div className='divider-dark'/>
+                    <br></br>
+                    <a
+                        data-toggle='modal'
+                        className='security-links theme'
+                        data-target='#access-history'
+                        href='#'
+                        onClick={this.handleHistoryOpen}
+                    >
+                        <i className='fa fa-clock-o'></i>View Access History
+                    </a>
+                    <b> </b>
+                    <a
+                        data-toggle='modal'
+                        className='security-links theme'
+                        data-target='#activity-log'
+                        href='#'
+                        onClick={this.handleDevicesOpen}
+                    >
+                        <i className='fa fa-globe'></i>View and Logout of Active Sessions
+                    </a>
+                </div>
+            </div>
+        );
+    }
+}
+
+SecurityTab.defaultProps = {
+    user: {},
+    activeSection: ''
+};
+SecurityTab.propTypes = {
+    user: React.PropTypes.object,
+    activeSection: React.PropTypes.string,
+    updateSection: React.PropTypes.func,
+    updateTab: React.PropTypes.func
+};