diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2016-08-11 14:35:08 -0400 |
|---|---|---|
| committer | enahum <nahumhbl@gmail.com> | 2016-08-11 13:35:08 -0500 |
| commit | 20735470185e0b0ac1d15b975041ed9a2e0e43bc (patch) | |
| tree | 3673bb31f3563a3b6a8bd7f7dc4d6b019f7619c7 /model/license.go | |
| parent | 7bb6a439a8b4f714f544d1c350ad395aefb21880 (diff) | |
| download | chat-20735470185e0b0ac1d15b975041ed9a2e0e43bc.tar.gz chat-20735470185e0b0ac1d15b975041ed9a2e0e43bc.tar.bz2 chat-20735470185e0b0ac1d15b975041ed9a2e0e43bc.zip | |
Update licensing switches for Office365 and Google SSO through OAuth2 (#3786)
Diffstat (limited to 'model/license.go')
| -rw-r--r-- | model/license.go | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/model/license.go b/model/license.go index a27b36263..98b88fdeb 100644 --- a/model/license.go +++ b/model/license.go @@ -35,8 +35,8 @@ type Features struct { Users *int `json:"users"` LDAP *bool `json:"ldap"` MFA *bool `json:"mfa"` - GoogleSSO *bool `json:"google_sso"` - Office365SSO *bool `json:"office365_sso"` + GoogleOAuth *bool `json:"google_oauth"` + Office365OAuth *bool `json:"office365_oauth"` Compliance *bool `json:"compliance"` Cluster *bool `json:"cluster"` CustomBrand *bool `json:"custom_brand"` @@ -67,14 +67,14 @@ func (f *Features) SetDefaults() { *f.MFA = *f.FutureFeatures } - if f.GoogleSSO == nil { - f.GoogleSSO = new(bool) - *f.GoogleSSO = true + if f.GoogleOAuth == nil { + f.GoogleOAuth = new(bool) + *f.GoogleOAuth = *f.FutureFeatures } - if f.Office365SSO == nil { - f.Office365SSO = new(bool) - *f.Office365SSO = true + if f.Office365OAuth == nil { + f.Office365OAuth = new(bool) + *f.Office365OAuth = *f.FutureFeatures } if f.Compliance == nil { |