diff options
| author | Wim <wim@42.be> | 2016-08-15 18:47:31 +0200 |
|---|---|---|
| committer | Wim <wim@42.be> | 2016-08-15 18:47:31 +0200 |
| commit | 24defcb970838133eb82f4fbbc516630fb81cae6 (patch) | |
| tree | de88bd0761b08ee35d8f2ddbcb133f7899b4264d /vendor/github.com/mattermost/platform/model/license.go | |
| parent | a1a11a88b334a4deb78915336def0113eec9738b (diff) | |
| download | matterbridge-msglm-24defcb970838133eb82f4fbbc516630fb81cae6.tar.gz matterbridge-msglm-24defcb970838133eb82f4fbbc516630fb81cae6.tar.bz2 matterbridge-msglm-24defcb970838133eb82f4fbbc516630fb81cae6.zip | |
Sync with mattermost 3.3.0
Diffstat (limited to 'vendor/github.com/mattermost/platform/model/license.go')
| -rw-r--r-- | vendor/github.com/mattermost/platform/model/license.go | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/vendor/github.com/mattermost/platform/model/license.go b/vendor/github.com/mattermost/platform/model/license.go index a77a7349..98b88fde 100644 --- a/vendor/github.com/mattermost/platform/model/license.go +++ b/vendor/github.com/mattermost/platform/model/license.go @@ -35,8 +35,10 @@ type Features struct { Users *int `json:"users"` LDAP *bool `json:"ldap"` MFA *bool `json:"mfa"` - GoogleSSO *bool `json:"google_sso"` + GoogleOAuth *bool `json:"google_oauth"` + Office365OAuth *bool `json:"office365_oauth"` Compliance *bool `json:"compliance"` + Cluster *bool `json:"cluster"` CustomBrand *bool `json:"custom_brand"` MHPNS *bool `json:"mhpns"` SAML *bool `json:"saml"` @@ -65,9 +67,14 @@ func (f *Features) SetDefaults() { *f.MFA = *f.FutureFeatures } - if f.GoogleSSO == nil { - f.GoogleSSO = new(bool) - *f.GoogleSSO = *f.FutureFeatures + if f.GoogleOAuth == nil { + f.GoogleOAuth = new(bool) + *f.GoogleOAuth = *f.FutureFeatures + } + + if f.Office365OAuth == nil { + f.Office365OAuth = new(bool) + *f.Office365OAuth = *f.FutureFeatures } if f.Compliance == nil { @@ -75,6 +82,11 @@ func (f *Features) SetDefaults() { *f.Compliance = *f.FutureFeatures } + if f.Cluster == nil { + f.Cluster = new(bool) + *f.Cluster = *f.FutureFeatures + } + if f.CustomBrand == nil { f.CustomBrand = new(bool) *f.CustomBrand = *f.FutureFeatures |