diff options
Diffstat (limited to 'webapp')
| -rw-r--r-- | webapp/components/admin_console/saml_settings.jsx | 4 | ||||
| -rw-r--r-- | webapp/components/user_settings/user_settings_general.jsx | 4 | ||||
| -rw-r--r-- | webapp/i18n/en.json | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/webapp/components/admin_console/saml_settings.jsx b/webapp/components/admin_console/saml_settings.jsx index 9fb78f472..fe8acaf16 100644 --- a/webapp/components/admin_console/saml_settings.jsx +++ b/webapp/components/admin_console/saml_settings.jsx @@ -455,7 +455,7 @@ export default class SamlSettings extends AdminSettings { helpText={ <FormattedMessage id='admin.saml.firstnameAttrDesc' - defaultMessage='The attribute in the SAML Assertion that will be used to populate the first name of users in Mattermost.' + defaultMessage='(Optional) The attribute in the SAML Assertion that will be used to populate the first name of users in Mattermost.' /> } value={this.state.firstNameAttribute} @@ -474,7 +474,7 @@ export default class SamlSettings extends AdminSettings { helpText={ <FormattedMessage id='admin.saml.lastnameAttrDesc' - defaultMessage='The attribute in the SAML Assertion that will be used to populate the last name of users in Mattermost.' + defaultMessage='(Optional) The attribute in the SAML Assertion that will be used to populate the last name of users in Mattermost.' /> } value={this.state.lastNameAttribute} diff --git a/webapp/components/user_settings/user_settings_general.jsx b/webapp/components/user_settings/user_settings_general.jsx index 07af50059..abf94fa6b 100644 --- a/webapp/components/user_settings/user_settings_general.jsx +++ b/webapp/components/user_settings/user_settings_general.jsx @@ -630,7 +630,7 @@ class UserSettingsGeneralTab extends React.Component { let extraInfo; let submit = null; if (this.props.user.auth_service === '' || - (this.props.user.auth_service === 'ldap' && + ((this.props.user.auth_service === 'ldap' || this.props.user.auth_service === Constants.SAML_SERVICE) && (global.window.mm_config.FirstNameAttributeSet === 'false' || global.window.mm_config.LastNameAttributeSet === 'false'))) { inputs.push( <div @@ -765,7 +765,7 @@ class UserSettingsGeneralTab extends React.Component { if (this.props.activeSection === 'nickname') { let extraInfo; let submit = null; - if (this.props.user.auth_service === 'ldap' && global.window.mm_config.NicknameAttributeSet === 'true') { + if ((this.props.user.auth_service === 'ldap' || this.props.user.auth_service === Constants.SAML_SERVICE) && global.window.mm_config.NicknameAttributeSet === 'true') { extraInfo = ( <span> <FormattedMessage diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 7d502351f..344696b24 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -563,7 +563,7 @@ "admin.saml.enableTitle": "Enable Login With SAML:", "admin.saml.encryptDescription": "When true, Mattermost will decrypt SAML Assertions encrypted with your Service Provider Public Certificate.", "admin.saml.encryptTitle": "Enable Encryption:", - "admin.saml.firstnameAttrDesc": "The attribute in the SAML Assertion that will be used to populate the first name of users in Mattermost.", + "admin.saml.firstnameAttrDesc": "(Optional) The attribute in the SAML Assertion that will be used to populate the first name of users in Mattermost.", "admin.saml.firstnameAttrEx": "Ex \"FirstName\"", "admin.saml.firstnameAttrTitle": "First Name Attribute:", "admin.saml.idpCertificateFileDesc": "The public authentication certificate issued by your Identity Provider.", @@ -575,7 +575,7 @@ "admin.saml.idpUrlDesc": "The URL where Mattermost sends a SAML request to start login sequence.", "admin.saml.idpUrlEx": "Ex \"https://idp.example.org/SAML2/SSO/Login\"", "admin.saml.idpUrlTitle": "SAML SSO URL:", - "admin.saml.lastnameAttrDesc": "The attribute in the SAML Assertion that will be used to populate the last name of users in Mattermost.", + "admin.saml.lastnameAttrDesc": "(Optional) The attribute in the SAML Assertion that will be used to populate the last name of users in Mattermost.", "admin.saml.lastnameAttrEx": "Ex \"LastName\"", "admin.saml.lastnameAttrTitle": "Last Name Attribute:", "admin.saml.localeAttrDesc": "(Optional) The attribute in the SAML Assertion that will be used to populate the language of users in Mattermost.", |