diff options
-rw-r--r-- | webapp/components/user_settings/user_settings_security.jsx | 42 | ||||
-rw-r--r-- | webapp/i18n/en.json | 4 |
2 files changed, 46 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() { diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index d3d9e0051..aae21a8e6 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -2132,6 +2132,8 @@ "user.settings.security.lastUpdated": "Last updated {date} at {time}", "user.settings.security.ldap": "AD/LDAP", "user.settings.security.loginGitlab": "Login done through GitLab", + "user.settings.security.loginGoogle": "Login done through Google Apps", + "user.settings.security.loginOffice365": "Login done through Office 365", "user.settings.security.loginLdap": "Login done through AD/LDAP", "user.settings.security.loginSaml": "Login done through SAML", "user.settings.security.logoutActiveSessions": "View and Logout of Active Sessions", @@ -2161,6 +2163,8 @@ "user.settings.security.passwordErrorUppercaseNumberSymbol": "Your password must contain at least {min} characters made up of at least one uppercase letter, at least one number, and at least one symbol (e.g. \"~!@#$%^&*()\").", "user.settings.security.passwordErrorUppercaseSymbol": "Your password must contain at least {min} characters made up of at least one uppercase letter and at least one symbol (e.g. \"~!@#$%^&*()\").", "user.settings.security.passwordGitlabCantUpdate": "Login occurs through GitLab. Password cannot be updated.", + "user.settings.security.passwordGoogleCantUpdate": "Login occurs through Google Apps. Password cannot be updated.", + "user.settings.security.passwordOffice365CantUpdate": "Login occurs through Office 365. Password cannot be updated.", "user.settings.security.passwordLdapCantUpdate": "Login occurs through AD/LDAP. Password cannot be updated.", "user.settings.security.passwordMatchError": "The new passwords you entered do not match.", "user.settings.security.passwordMinLength": "Invalid minimum length, cannot show preview.", |