Skip to content

Commit

Permalink
Add text banner to SAML System Console settings (mattermost#4195)
Browse files Browse the repository at this point in the history
* Update saml_settings.jsx

* Update en.json

* Text tweak

* Fix build error

* Use classnames in saml_settings.jsx to fix build errors
  • Loading branch information
jasonblais authored and jwilander committed Oct 11, 2016
1 parent 7fb818d commit fe1503d
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
10 changes: 9 additions & 1 deletion webapp/components/admin_console/saml_settings.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,14 @@ export default class SamlSettings extends AdminSettings {

return (
<SettingsGroup>
<div className='banner'>
<div className='banner__content'>
<FormattedMessage
id='admin.saml.bannerDesc'
defaultMessage='If a user attribute changes on the SAML server it will be updated the next time the user enters their credentials to log in to Mattermost. This includes if a user is made inactive or removed from a SAML Identity Provider. Remote logout with SAML servers is considered in a future release.'
/>
</div>
</div>
<BooleanSetting
id='enable'
label={
Expand Down Expand Up @@ -541,4 +549,4 @@ export default class SamlSettings extends AdminSettings {
</SettingsGroup>
);
}
}
}
1 change: 1 addition & 0 deletions webapp/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -567,6 +567,7 @@
"admin.saml.assertionConsumerServiceURLDesc": "Enter https://<your-mattermost-url>/login/sso/saml. Make sure you use HTTP or HTTPS in your URL depending on your server configuration. This field is also known as the Assertion Consumer Service URL.",
"admin.saml.assertionConsumerServiceURLEx": "E.g.: \"https://<your-mattermost-url>/login/sso/saml\"",
"admin.saml.assertionConsumerServiceURLTitle": "Service Provider Login URL:",
"admin.saml.bannerDesc": "If a user attribute changes on the SAML server it will be updated the next time the user enters their credentials to log in to Mattermost. This includes if a user is made inactive or removed from a SAML Identity Provider. Remote logout with SAML servers is considered in a future release.",
"admin.saml.emailAttrDesc": "The attribute in the SAML Assertion that will be used to populate the email addresses of users in Mattermost.",
"admin.saml.emailAttrEx": "E.g.: \"Email\" or \"PrimaryEmail\"",
"admin.saml.emailAttrTitle": "Email Attribute:",
Expand Down

0 comments on commit fe1503d

Please sign in to comment.