Sync with mattermost 2.2.0 release

1 files changed, 15 insertions, 15 deletions

diff --git a/vendor/github.com/mattermost/platform/model/license.go b/vendor/github.com/mattermost/platform/model/license.go
index cab22a68..abb1be09 100644
--- a/vendor/github.com/mattermost/platform/model/license.go
+++ b/vendor/github.com/mattermost/platform/model/license.go
@@ -32,14 +32,19 @@ 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"`
+	Users          *int  `json:"users"`
+	LDAP           *bool `json:"ldap"`
+	GoogleSSO      *bool `json:"google_sso"`
+	MHPNS          *bool `json:"mhpns"`
+	FutureFeatures *bool `json:"future_features"`
 }
 
 func (f *Features) SetDefaults() {
+	if f.FutureFeatures == nil {
+		f.FutureFeatures = new(bool)
+		*f.FutureFeatures = true
+	}
+
 	if f.Users == nil {
 		f.Users = new(int)
 		*f.Users = 0
@@ -47,22 +52,17 @@ func (f *Features) SetDefaults() {
 
 	if f.LDAP == nil {
 		f.LDAP = new(bool)
-		*f.LDAP = true
-	}
-
-	if f.MFA == nil {
-		f.MFA = new(bool)
-		*f.MFA = true
+		*f.LDAP = *f.FutureFeatures
 	}
 
 	if f.GoogleSSO == nil {
 		f.GoogleSSO = new(bool)
-		*f.GoogleSSO = true
+		*f.GoogleSSO = *f.FutureFeatures
 	}
 
-	if f.Compliance == nil {
-		f.Compliance = new(bool)
-		*f.Compliance = true
+	if f.MHPNS == nil {
+		f.MHPNS = new(bool)
+		*f.MHPNS = *f.FutureFeatures
 	}
 }