diff options
Diffstat (limited to 'webapp/components/user_settings')
6 files changed, 27 insertions, 26 deletions
diff --git a/webapp/components/user_settings/import_theme_modal.jsx b/webapp/components/user_settings/import_theme_modal.jsx index 2fc75ca13..32da296bf 100644 --- a/webapp/components/user_settings/import_theme_modal.jsx +++ b/webapp/components/user_settings/import_theme_modal.jsx @@ -5,7 +5,7 @@ import ReactDOM from 'react-dom'; import ModalStore from 'stores/modal_store.jsx'; import UserStore from 'stores/user_store.jsx'; import * as Utils from 'utils/utils.jsx'; -import * as Client from 'utils/client.jsx'; +import Client from 'utils/web_client.jsx'; import {Modal} from 'react-bootstrap'; import AppDispatcher from '../../dispatcher/app_dispatcher.jsx'; diff --git a/webapp/components/user_settings/manage_languages.jsx b/webapp/components/user_settings/manage_languages.jsx index 094eaa127..bbf3a2e40 100644 --- a/webapp/components/user_settings/manage_languages.jsx +++ b/webapp/components/user_settings/manage_languages.jsx @@ -3,7 +3,7 @@ import SettingItemMax from '../setting_item_max.jsx'; -import * as Client from 'utils/client.jsx'; +import Client from 'utils/web_client.jsx'; import * as I18n from 'i18n/i18n.jsx'; import * as GlobalActions from 'action_creators/global_actions.jsx'; diff --git a/webapp/components/user_settings/user_settings_general.jsx b/webapp/components/user_settings/user_settings_general.jsx index eddbc1efe..c6a05d1ee 100644 --- a/webapp/components/user_settings/user_settings_general.jsx +++ b/webapp/components/user_settings/user_settings_general.jsx @@ -9,7 +9,7 @@ import SettingPicture from '../setting_picture.jsx'; import UserStore from 'stores/user_store.jsx'; import ErrorStore from 'stores/error_store.jsx'; -import * as Client from 'utils/client.jsx'; +import Client from 'utils/web_client.jsx'; import Constants from 'utils/constants.jsx'; import * as AsyncClient from 'utils/async_client.jsx'; import * as Utils from 'utils/utils.jsx'; @@ -225,11 +225,9 @@ class UserSettingsGeneralTab extends React.Component { return; } - var formData = new FormData(); - formData.append('image', picture, picture.name); this.setState({loadingPicture: true}); - Client.uploadProfileImage(formData, + Client.uploadProfileImage(picture, () => { this.submitActive = false; AsyncClient.getMe(); @@ -781,7 +779,7 @@ class UserSettingsGeneralTab extends React.Component { <SettingPicture title={formatMessage(holders.profilePicture)} submit={this.submitPicture} - src={'/api/v1/users/' + user.id + '/image?time=' + user.last_picture_update} + src={Client.getUsersRoute() + '/' + user.id + '/image?time=' + user.last_picture_update} server_error={serverError} client_error={clientError} updateSection={(e) => { diff --git a/webapp/components/user_settings/user_settings_notifications.jsx b/webapp/components/user_settings/user_settings_notifications.jsx index b119c42f9..fa84ce2d6 100644 --- a/webapp/components/user_settings/user_settings_notifications.jsx +++ b/webapp/components/user_settings/user_settings_notifications.jsx @@ -8,7 +8,7 @@ import SettingItemMax from '../setting_item_max.jsx'; import UserStore from 'stores/user_store.jsx'; -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'; diff --git a/webapp/components/user_settings/user_settings_security.jsx b/webapp/components/user_settings/user_settings_security.jsx index ff5a898a9..f28e34197 100644 --- a/webapp/components/user_settings/user_settings_security.jsx +++ b/webapp/components/user_settings/user_settings_security.jsx @@ -10,7 +10,7 @@ import ToggleModalButton from '../toggle_modal_button.jsx'; import TeamStore from 'stores/team_store.jsx'; -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'; import Constants from 'utils/constants.jsx'; @@ -96,12 +96,10 @@ class SecurityTab extends React.Component { return; } - var data = {}; - data.user_id = user.id; - data.current_password = currentPassword; - data.new_password = newPassword; - - Client.updatePassword(data, + Client.updatePassword( + user.id, + currentPassword, + newPassword, () => { this.props.updateSection(''); AsyncClient.getMe(); @@ -120,11 +118,9 @@ class SecurityTab extends React.Component { ); } activateMfa() { - const data = {}; - data.activate = true; - data.token = this.state.mfaToken; - - Client.updateMfa(data, + Client.updateMfa( + this.state.mfaToken, + true, () => { this.props.updateSection(''); AsyncClient.getMe(); @@ -224,7 +220,7 @@ class SecurityTab extends React.Component { <div className='col-sm-7'> <img className='qr-code-img' - src={'/api/v1/users/generate_mfa_qr?time=' + this.props.user.update_at} + src={Client.getUsersRoute() + '/generate_mfa_qr?time=' + this.props.user.update_at} /> </div> <br/> @@ -531,9 +527,9 @@ class SecurityTab extends React.Component { if (global.window.mm_config.EnableSignUpWithEmail === 'true' && user.auth_service !== '') { let link; if (user.auth_service === Constants.LDAP_SERVICE) { - link = '/' + teamName + '/claim/ldap_to_email?email=' + encodeURIComponent(user.email); + link = '/claim/ldap_to_email?email=' + encodeURIComponent(user.email); } else { - link = '/' + teamName + '/claim/oauth_to_email?email=' + encodeURIComponent(user.email) + '&old_type=' + user.auth_service; + link = '/claim/oauth_to_email?email=' + encodeURIComponent(user.email) + '&old_type=' + user.auth_service; } emailOption = ( @@ -558,7 +554,7 @@ class SecurityTab extends React.Component { <div> <Link className='btn btn-primary' - to={'/' + teamName + '/claim/email_to_oauth?email=' + encodeURIComponent(user.email) + '&old_type=' + user.auth_service + '&new_type=' + Constants.GITLAB_SERVICE} + to={'/claim/email_to_oauth?email=' + encodeURIComponent(user.email) + '&old_type=' + user.auth_service + '&new_type=' + Constants.GITLAB_SERVICE} > <FormattedMessage id='user.settings.security.switchGitlab' @@ -594,7 +590,7 @@ class SecurityTab extends React.Component { <div> <Link className='btn btn-primary' - to={'/' + teamName + '/claim/email_to_ldap?email=' + encodeURIComponent(user.email)} + to={'/claim/email_to_ldap?email=' + encodeURIComponent(user.email)} > <FormattedMessage id='user.settings.security.switchLdap' @@ -660,6 +656,13 @@ class SecurityTab extends React.Component { defaultMessage='GitLab SSO' /> ); + } else if (this.props.user.auth_service === Constants.LDAP_SERVICE) { + describe = ( + <FormattedMessage + id='user.settings.security.ldap' + defaultMessage='LDAP' + /> + ); } return ( diff --git a/webapp/components/user_settings/user_settings_theme.jsx b/webapp/components/user_settings/user_settings_theme.jsx index 14991037d..f19538f71 100644 --- a/webapp/components/user_settings/user_settings_theme.jsx +++ b/webapp/components/user_settings/user_settings_theme.jsx @@ -11,7 +11,7 @@ import SettingItemMax from '../setting_item_max.jsx'; import UserStore from 'stores/user_store.jsx'; import AppDispatcher from '../../dispatcher/app_dispatcher.jsx'; -import * as Client from 'utils/client.jsx'; +import Client from 'utils/web_client.jsx'; import * as Utils from 'utils/utils.jsx'; import Constants from 'utils/constants.jsx'; |