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 /model/license.go | |
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 '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 { |