diff options
| author | enahum <nahumhbl@gmail.com> | 2016-07-05 15:49:00 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-05 15:49:00 -0400 |
| commit | 5f04dc4f45b9657d46380499f92ae6e5c1bf5506 (patch) | |
| tree | 86670cb20e038f9716eca3ab9dcb7f2f71263286 /utils | |
| parent | f91b9d4a654ff27777580651d853b6372a425af6 (diff) | |
| download | chat-5f04dc4f45b9657d46380499f92ae6e5c1bf5506.tar.gz chat-5f04dc4f45b9657d46380499f92ae6e5c1bf5506.tar.bz2 chat-5f04dc4f45b9657d46380499f92ae6e5c1bf5506.zip | |
SAML support (#3494)
* PLT-3073: Implement SAML/Okta Server side (EE) (#3422)
* PLT-3137 Support for SAML configuration
* PLT-3410 SAML Database Store
* PLT-3411 CLI to add Identity Provider Certificate and Service Provider Private Key
* PLT-3409 SAML Interface for EE
* PLT-3139 Handle SAML authentication server side
* Add localization messages
* PLT-3443 SAML Obtain SP metadata
* PLT-3142 Login & Switch to/from SAML
* Remove Certs for Database & Clean SAML Request
* Make required Username, FirstName and LastName
* PLT-3140 Add SAML to System Console (#3476)
* PLT-3140 Add SAML to System Console
* Move web_client functions to client.jsx
* Fix issues found by PM
* update package.json mattermost driver
* Fix text messages for SAML
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/config.go | 9 | ||||
| -rw-r--r-- | utils/license.go | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/utils/config.go b/utils/config.go index 922709786..abb24c085 100644 --- a/utils/config.go +++ b/utils/config.go @@ -192,6 +192,10 @@ func LoadConfig(fileName string) { // This restarts the job if nessisary (works for config reloads) ldapI.StartLdapSyncJob() } + + if samlI := einterfaces.GetSamlInterface(); samlI != nil { + samlI.ConfigureSP() + } } func getClientConfig(c *model.Config) map[string]string { @@ -277,6 +281,11 @@ func getClientConfig(c *model.Config) map[string]string { if *License.Features.Compliance { props["EnableCompliance"] = strconv.FormatBool(*c.ComplianceSettings.Enable) } + + if *License.Features.SAML { + props["EnableSaml"] = strconv.FormatBool(*c.SamlSettings.Enable) + props["SamlLoginButtonText"] = *c.SamlSettings.LoginButtonText + } } return props diff --git a/utils/license.go b/utils/license.go index 060beb525..b80e1abc2 100644 --- a/utils/license.go +++ b/utils/license.go @@ -121,6 +121,7 @@ func getClientLicense(l *model.License) map[string]string { props["Users"] = strconv.Itoa(*l.Features.Users) props["LDAP"] = strconv.FormatBool(*l.Features.LDAP) props["MFA"] = strconv.FormatBool(*l.Features.MFA) + props["SAML"] = strconv.FormatBool(*l.Features.SAML) props["GoogleSSO"] = strconv.FormatBool(*l.Features.GoogleSSO) props["Compliance"] = strconv.FormatBool(*l.Features.Compliance) props["CustomBrand"] = strconv.FormatBool(*l.Features.CustomBrand) |