diff options
| author | Elias Nahum <nahumhbl@gmail.com> | 2016-08-11 13:46:24 -0500 |
|---|---|---|
| committer | Elias Nahum <nahumhbl@gmail.com> | 2016-08-11 13:46:24 -0500 |
| commit | c6d5448c7540e06a78063b6b363b41a261fd66c3 (patch) | |
| tree | 8c9b39ea9917c1b7e0d0b7aac1a8d11c5583f2f6 /utils | |
| parent | a6bb9b87f7b9208ece16aa28816803763ab0ae80 (diff) | |
| parent | 20735470185e0b0ac1d15b975041ed9a2e0e43bc (diff) | |
| download | chat-c6d5448c7540e06a78063b6b363b41a261fd66c3.tar.gz chat-c6d5448c7540e06a78063b6b363b41a261fd66c3.tar.bz2 chat-c6d5448c7540e06a78063b6b363b41a261fd66c3.zip | |
Merge branch 'release-3.3' RC5
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/config.go | 4 | ||||
| -rw-r--r-- | utils/license.go | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/utils/config.go b/utils/config.go index 6646a341e..6a4c9c90c 100644 --- a/utils/config.go +++ b/utils/config.go @@ -299,11 +299,11 @@ func getClientConfig(c *model.Config) map[string]string { props["EnableCluster"] = strconv.FormatBool(*c.ClusterSettings.Enable) } - if *License.Features.GoogleSSO { + if *License.Features.GoogleOAuth { props["EnableSignUpWithGoogle"] = strconv.FormatBool(c.GoogleSettings.Enable) } - if *License.Features.Office365SSO { + if *License.Features.Office365OAuth { props["EnableSignUpWithOffice365"] = strconv.FormatBool(c.Office365Settings.Enable) } diff --git a/utils/license.go b/utils/license.go index 246cc553e..f0a91665e 100644 --- a/utils/license.go +++ b/utils/license.go @@ -123,8 +123,8 @@ func getClientLicense(l *model.License) map[string]string { props["MFA"] = strconv.FormatBool(*l.Features.MFA) props["SAML"] = strconv.FormatBool(*l.Features.SAML) props["Cluster"] = strconv.FormatBool(*l.Features.Cluster) - props["GoogleSSO"] = strconv.FormatBool(*l.Features.GoogleSSO) - props["Office365SSO"] = strconv.FormatBool(*l.Features.Office365SSO) + props["GoogleOAuth"] = strconv.FormatBool(*l.Features.GoogleOAuth) + props["Office365OAuth"] = strconv.FormatBool(*l.Features.Office365OAuth) props["Compliance"] = strconv.FormatBool(*l.Features.Compliance) props["CustomBrand"] = strconv.FormatBool(*l.Features.CustomBrand) props["MHPNS"] = strconv.FormatBool(*l.Features.MHPNS) |