summaryrefslogtreecommitdiffstats
path: root/webapp/components/user_settings
diff options
context:
space:
mode:
authorenahum <nahumhbl@gmail.com>2016-11-14 09:40:12 -0300
committerChristopher Speller <crspeller@gmail.com>2016-11-14 07:40:12 -0500
commit6e7555a5757dddfa9276c304d2f9480fed9e1150 (patch)
tree00829d0fa86df7dd287541d866c178d7b2c9f3ee /webapp/components/user_settings
parent4824ad1e1aefc88859e88f5d113994c8f58e4392 (diff)
downloadchat-6e7555a5757dddfa9276c304d2f9480fed9e1150.tar.gz
chat-6e7555a5757dddfa9276c304d2f9480fed9e1150.tar.bz2
chat-6e7555a5757dddfa9276c304d2f9480fed9e1150.zip
PLT-4502 Fix SAML user settings password help text (#4484)
Diffstat (limited to 'webapp/components/user_settings')
-rw-r--r--webapp/components/user_settings/user_settings_security.jsx23
1 files changed, 22 insertions, 1 deletions
diff --git a/webapp/components/user_settings/user_settings_security.jsx b/webapp/components/user_settings/user_settings_security.jsx
index 0cee3dfca..1f049c4bd 100644
--- a/webapp/components/user_settings/user_settings_security.jsx
+++ b/webapp/components/user_settings/user_settings_security.jsx
@@ -473,6 +473,20 @@ export default class SecurityTab extends React.Component {
</div>
</div>
);
+ } else if (this.props.user.auth_service === Constants.SAML_SERVICE) {
+ inputs.push(
+ <div
+ key='oauthEmailInfo'
+ className='form-group'
+ >
+ <div className='setting-list__hint'>
+ <FormattedMessage
+ id='user.settings.security.passwordSamlCantUpdate'
+ defaultMessage='This field is handled through your login provider. If you want to change it, you need to do so through your login provider.'
+ />
+ </div>
+ </div>
+ );
}
updateSectionStatus = function resetSection(e) {
@@ -533,7 +547,7 @@ export default class SecurityTab extends React.Component {
describe = (
<FormattedMessage
id='user.settings.security.loginGitlab'
- defaultMessage='Login done through Gitlab'
+ defaultMessage='Login done through GitLab'
/>
);
} else if (this.props.user.auth_service === Constants.LDAP_SERVICE) {
@@ -543,6 +557,13 @@ export default class SecurityTab extends React.Component {
defaultMessage='Login done through AD/LDAP'
/>
);
+ } else if (this.props.user.auth_service === Constants.SAML_SERVICE) {
+ describe = (
+ <FormattedMessage
+ id='user.settings.security.loginSaml'
+ defaultMessage='Login done through SAML'
+ />
+ );
}
updateSectionStatus = function updateSection() {