summaryrefslogtreecommitdiffstats
path: root/vendor/github.com/mattermost/platform/model/license.go
diff options
context:
space:
mode:
authorWim <wim@42.be>2016-07-22 23:14:13 +0200
committerWim <wim@42.be>2016-07-22 23:15:59 +0200
commit911c597377b1f28533d1adee3f3bcff1c776927c (patch)
treea365b345cb2f4c93340306ec6c251c6ee9263406 /vendor/github.com/mattermost/platform/model/license.go
parent28244ffd9a6bad6228fbe53d73040ec29780b8a7 (diff)
downloadmatterbridge-msglm-911c597377b1f28533d1adee3f3bcff1c776927c.tar.gz
matterbridge-msglm-911c597377b1f28533d1adee3f3bcff1c776927c.tar.bz2
matterbridge-msglm-911c597377b1f28533d1adee3f3bcff1c776927c.zip
Sync with mattermost 3.2.0
Diffstat (limited to 'vendor/github.com/mattermost/platform/model/license.go')
-rw-r--r--vendor/github.com/mattermost/platform/model/license.go28
1 files changed, 20 insertions, 8 deletions
diff --git a/vendor/github.com/mattermost/platform/model/license.go b/vendor/github.com/mattermost/platform/model/license.go
index bc72ff9a..a77a7349 100644
--- a/vendor/github.com/mattermost/platform/model/license.go
+++ b/vendor/github.com/mattermost/platform/model/license.go
@@ -32,14 +32,16 @@ type Customer struct {
}
type Features struct {
- Users *int `json:"users"`
- LDAP *bool `json:"ldap"`
- MFA *bool `json:"mfa"`
- GoogleSSO *bool `json:"google_sso"`
- Compliance *bool `json:"compliance"`
- CustomBrand *bool `json:"custom_brand"`
- MHPNS *bool `json:"mhpns"`
- FutureFeatures *bool `json:"future_features"`
+ Users *int `json:"users"`
+ LDAP *bool `json:"ldap"`
+ MFA *bool `json:"mfa"`
+ GoogleSSO *bool `json:"google_sso"`
+ Compliance *bool `json:"compliance"`
+ CustomBrand *bool `json:"custom_brand"`
+ MHPNS *bool `json:"mhpns"`
+ SAML *bool `json:"saml"`
+ PasswordRequirements *bool `json:"password_requirements"`
+ FutureFeatures *bool `json:"future_features"`
}
func (f *Features) SetDefaults() {
@@ -82,6 +84,16 @@ func (f *Features) SetDefaults() {
f.MHPNS = new(bool)
*f.MHPNS = *f.FutureFeatures
}
+
+ if f.SAML == nil {
+ f.SAML = new(bool)
+ *f.SAML = *f.FutureFeatures
+ }
+
+ if f.PasswordRequirements == nil {
+ f.PasswordRequirements = new(bool)
+ *f.PasswordRequirements = *f.FutureFeatures
+ }
}
func (l *License) IsExpired() bool {