diff options
author | Joram Wilander <jwawilander@gmail.com> | 2017-01-10 10:05:58 -0500 |
---|---|---|
committer | George Goldberg <george@gberg.me> | 2017-01-10 15:05:58 +0000 |
commit | 99493bc5fa11d8e50d46c19e2678ddb2c99c0bbb (patch) | |
tree | 2cf7a8ea88c919940600531db911040f1c378a0c /webapp/components/user_settings/user_settings_security.jsx | |
parent | 0cba48d155ac0703d6c85e71327d29447c0c8e42 (diff) | |
download | chat-99493bc5fa11d8e50d46c19e2678ddb2c99c0bbb.tar.gz chat-99493bc5fa11d8e50d46c19e2678ddb2c99c0bbb.tar.bz2 chat-99493bc5fa11d8e50d46c19e2678ddb2c99c0bbb.zip |
PLT-5212 Add password setting text for google and office365 (#5029)
Diffstat (limited to 'webapp/components/user_settings/user_settings_security.jsx')
-rw-r--r-- | webapp/components/user_settings/user_settings_security.jsx | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/webapp/components/user_settings/user_settings_security.jsx b/webapp/components/user_settings/user_settings_security.jsx index bc13437b0..e936f5b96 100644 --- a/webapp/components/user_settings/user_settings_security.jsx +++ b/webapp/components/user_settings/user_settings_security.jsx @@ -427,6 +427,34 @@ export default class SecurityTab extends React.Component { </div> </div> ); + } else if (this.props.user.auth_service === Constants.GOOGLE_SERVICE) { + inputs.push( + <div + key='oauthEmailInfo' + className='form-group' + > + <div className='setting-list__hint'> + <FormattedMessage + id='user.settings.security.passwordGoogleCantUpdate' + defaultMessage='Login occurs through Google Apps. Password cannot be updated.' + /> + </div> + </div> + ); + } else if (this.props.user.auth_service === Constants.OFFICE365_SERVICE) { + inputs.push( + <div + key='oauthEmailInfo' + className='form-group' + > + <div className='setting-list__hint'> + <FormattedMessage + id='user.settings.security.passwordOffice365CantUpdate' + defaultMessage='Login occurs through Office 365. Password cannot be updated.' + /> + </div> + </div> + ); } updateSectionStatus = function resetSection(e) { @@ -504,6 +532,20 @@ export default class SecurityTab extends React.Component { defaultMessage='Login done through SAML' /> ); + } else if (this.props.user.auth_service === Constants.GOOGLE_SERVICE) { + describe = ( + <FormattedMessage + id='user.settings.security.loginGoogle' + defaultMessage='Login done through Google Apps' + /> + ); + } else if (this.props.user.auth_service === Constants.OFFICE365_SERVICE) { + describe = ( + <FormattedMessage + id='user.settings.security.loginOffice365' + defaultMessage='Login done through Office 365' + /> + ); } updateSectionStatus = function updateSection() { |