summaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
Diffstat (limited to 'utils')
-rw-r--r--utils/config.go9
-rw-r--r--utils/license.go1
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)