Merge branch 'master' into post-metadata

2018-11-14 09:58:56 -05:00
--- a/model/channel_member.go
+++ b/model/channel_member.go
@@ -11,12 +11,16 @@ import (
 )

 const (
-	CHANNEL_NOTIFY_DEFAULT      = "default"
-	CHANNEL_NOTIFY_ALL          = "all"
-	CHANNEL_NOTIFY_MENTION      = "mention"
-	CHANNEL_NOTIFY_NONE         = "none"
-	CHANNEL_MARK_UNREAD_ALL     = "all"
-	CHANNEL_MARK_UNREAD_MENTION = "mention"
+	CHANNEL_NOTIFY_DEFAULT              = "default"
+	CHANNEL_NOTIFY_ALL                  = "all"
+	CHANNEL_NOTIFY_MENTION              = "mention"
+	CHANNEL_NOTIFY_NONE                 = "none"
+	CHANNEL_MARK_UNREAD_ALL             = "all"
+	CHANNEL_MARK_UNREAD_MENTION         = "mention"
+	IGNORE_CHANNEL_MENTIONS_DEFAULT     = "default"
+	IGNORE_CHANNEL_MENTIONS_OFF         = "off"
+	IGNORE_CHANNEL_MENTIONS_ON          = "on"
+	IGNORE_CHANNEL_MENTIONS_NOTIFY_PROP = "ignore_channel_mentions"
 )

 type ChannelUnread struct {
@@ -116,6 +120,12 @@ func (o *ChannelMember) IsValid() *AppError {
 		}
 	}

+	if ignoreChannelMentions, ok := o.NotifyProps[IGNORE_CHANNEL_MENTIONS_NOTIFY_PROP]; ok {
+		if len(ignoreChannelMentions) > 40 || !IsIgnoreChannelMentionsValid(ignoreChannelMentions) {
+			return NewAppError("ChannelMember.IsValid", "model.channel_member.is_valid.ignore_channel_mentions_value.app_error", nil, "ignore_channel_mentions="+ignoreChannelMentions, http.StatusBadRequest)
+		}
+	}
+
 	return nil
 }

@@ -146,11 +156,16 @@ func IsSendEmailValid(sendEmail string) bool {
 	return sendEmail == CHANNEL_NOTIFY_DEFAULT || sendEmail == "true" || sendEmail == "false"
 }

+func IsIgnoreChannelMentionsValid(ignoreChannelMentions string) bool {
+	return ignoreChannelMentions == IGNORE_CHANNEL_MENTIONS_ON || ignoreChannelMentions == IGNORE_CHANNEL_MENTIONS_OFF || ignoreChannelMentions == IGNORE_CHANNEL_MENTIONS_DEFAULT
+}
+
 func GetDefaultChannelNotifyProps() StringMap {
 	return StringMap{
-		DESKTOP_NOTIFY_PROP:     CHANNEL_NOTIFY_DEFAULT,
-		MARK_UNREAD_NOTIFY_PROP: CHANNEL_MARK_UNREAD_ALL,
-		PUSH_NOTIFY_PROP:        CHANNEL_NOTIFY_DEFAULT,
-		EMAIL_NOTIFY_PROP:       CHANNEL_NOTIFY_DEFAULT,
+		DESKTOP_NOTIFY_PROP:                 CHANNEL_NOTIFY_DEFAULT,
+		MARK_UNREAD_NOTIFY_PROP:             CHANNEL_MARK_UNREAD_ALL,
+		PUSH_NOTIFY_PROP:                    CHANNEL_NOTIFY_DEFAULT,
+		EMAIL_NOTIFY_PROP:                   CHANNEL_NOTIFY_DEFAULT,
+		IGNORE_CHANNEL_MENTIONS_NOTIFY_PROP: IGNORE_CHANNEL_MENTIONS_DEFAULT,
 	}
 }
--- a/model/client4.go
+++ b/model/client4.go
@@ -401,7 +401,7 @@ func (c *Client4) GetRedirectLocationRoute() string {
 	return fmt.Sprintf("/redirect_location")
 }

-func (c *Client4) GetRegisterTermsOfServiceRoute(userId string) string {
+func (c *Client4) GetUserTermsOfServiceRoute(userId string) string {
 	return c.GetUserRoute(userId) + "/terms_of_service"
 }

@@ -3771,7 +3771,7 @@ func (c *Client4) GetPluginStatuses() (PluginStatuses, *Response) {
 	}
 }

-// RemovePlugin will deactivate and delete a plugin.
+// RemovePlugin will disable and delete a plugin.
 // WARNING: PLUGINS ARE STILL EXPERIMENTAL. THIS FUNCTION IS SUBJECT TO CHANGE.
 func (c *Client4) RemovePlugin(id string) (bool, *Response) {
 	if r, err := c.DoApiDelete(c.GetPluginRoute(id)); err != nil {
@@ -3793,7 +3793,7 @@ func (c *Client4) GetWebappPlugins() ([]*Manifest, *Response) {
 	}
 }

-// ActivatePlugin will activate an plugin installed.
+// EnablePlugin will enable an plugin installed.
 // WARNING: PLUGINS ARE STILL EXPERIMENTAL. THIS FUNCTION IS SUBJECT TO CHANGE.
 func (c *Client4) EnablePlugin(id string) (bool, *Response) {
 	if r, err := c.DoApiPost(c.GetPluginRoute(id)+"/enable", ""); err != nil {
@@ -3804,7 +3804,7 @@ func (c *Client4) EnablePlugin(id string) (bool, *Response) {
 	}
 }

-// DeactivatePlugin will deactivate an active plugin.
+// DisablePlugin will disable an enabled plugin.
 // WARNING: PLUGINS ARE STILL EXPERIMENTAL. THIS FUNCTION IS SUBJECT TO CHANGE.
 func (c *Client4) DisablePlugin(id string) (bool, *Response) {
 	if r, err := c.DoApiPost(c.GetPluginRoute(id)+"/disable", ""); err != nil {
@@ -3849,7 +3849,7 @@ func (c *Client4) GetRedirectLocation(urlParam, etag string) (string, *Response)
 }

 func (c *Client4) RegisteTermsOfServiceAction(userId, termsOfServiceId string, accepted bool) (*bool, *Response) {
-	url := c.GetRegisterTermsOfServiceRoute(userId)
+	url := c.GetUserTermsOfServiceRoute(userId)
 	data := map[string]interface{}{"termsOfServiceId": termsOfServiceId, "accepted": accepted}

 	if r, err := c.DoApiPost(url, StringInterfaceToJson(data)); err != nil {
@@ -3871,11 +3871,22 @@ func (c *Client4) GetTermsOfService(etag string) (*TermsOfService, *Response) {
 	}
 }

+func (c *Client4) GetUserTermsOfService(userId, etag string) (*UserTermsOfService, *Response) {
+	url := c.GetUserTermsOfServiceRoute(userId)
+
+	if r, err := c.DoApiGet(url, etag); err != nil {
+		return nil, BuildErrorResponse(r, err)
+	} else {
+		defer closeBody(r)
+		return UserTermsOfServiceFromJson(r.Body), BuildResponse(r)
+	}
+}
+
 func (c *Client4) CreateTermsOfService(text, userId string) (*TermsOfService, *Response) {
 	url := c.GetTermsOfServiceRoute()

-	data := map[string]string{"text": text}
-	if r, err := c.DoApiPost(url, MapToJson(data)); err != nil {
+	data := map[string]interface{}{"text": text}
+	if r, err := c.DoApiPost(url, StringInterfaceToJson(data)); err != nil {
 		return nil, BuildErrorResponse(r, err)
 	} else {
 		defer closeBody(r)
--- a/model/config.go
+++ b/model/config.go
@@ -112,6 +112,7 @@ const (
 	SUPPORT_SETTINGS_DEFAULT_HELP_LINK             = "https://about.mattermost.com/default-help/"
 	SUPPORT_SETTINGS_DEFAULT_REPORT_A_PROBLEM_LINK = "https://about.mattermost.com/default-report-a-problem/"
 	SUPPORT_SETTINGS_DEFAULT_SUPPORT_EMAIL         = "feedback@mattermost.com"
+	SUPPORT_SETTINGS_DEFAULT_RE_ACCEPTANCE_PERIOD  = 365

 	LDAP_SETTINGS_DEFAULT_FIRST_NAME_ATTRIBUTE = ""
 	LDAP_SETTINGS_DEFAULT_LAST_NAME_ATTRIBUTE  = ""
@@ -1030,13 +1031,14 @@ type PrivacySettings struct {
 }

 type SupportSettings struct {
-	TermsOfServiceLink          *string
-	PrivacyPolicyLink           *string
-	AboutLink                   *string
-	HelpLink                    *string
-	ReportAProblemLink          *string
-	SupportEmail                *string
-	CustomTermsOfServiceEnabled *bool
+	TermsOfServiceLink                     *string
+	PrivacyPolicyLink                      *string
+	AboutLink                              *string
+	HelpLink                               *string
+	ReportAProblemLink                     *string
+	SupportEmail                           *string
+	CustomTermsOfServiceEnabled            *bool
+	CustomTermsOfServiceReAcceptancePeriod *int
 }

 func (s *SupportSettings) SetDefaults() {
@@ -1087,6 +1089,10 @@ func (s *SupportSettings) SetDefaults() {
 	if s.CustomTermsOfServiceEnabled == nil {
 		s.CustomTermsOfServiceEnabled = NewBool(false)
 	}
+
+	if s.CustomTermsOfServiceReAcceptancePeriod == nil {
+		s.CustomTermsOfServiceReAcceptancePeriod = NewInt(SUPPORT_SETTINGS_DEFAULT_RE_ACCEPTANCE_PERIOD)
+	}
 }

 type AnnouncementSettings struct {
--- a/model/file_info.go
+++ b/model/file_info.go
@@ -85,7 +85,7 @@ func (o *FileInfo) IsValid() *AppError {
 		return NewAppError("FileInfo.IsValid", "model.file_info.is_valid.id.app_error", nil, "", http.StatusBadRequest)
 	}

-	if len(o.CreatorId) != 26 {
+	if len(o.CreatorId) != 26 && o.CreatorId != "nouser" {
 		return NewAppError("FileInfo.IsValid", "model.file_info.is_valid.user_id.app_error", nil, "id="+o.Id, http.StatusBadRequest)
 	}

--- a/model/manifest.go
+++ b/model/manifest.go
@@ -5,6 +5,7 @@ package model

 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -12,6 +13,7 @@ import (
 	"path/filepath"
 	"strings"

+	"github.com/blang/semver"
 	"gopkg.in/yaml.v2"
 )

@@ -111,6 +113,11 @@ type Manifest struct {
 	// A version number for your plugin. Semantic versioning is recommended: http://semver.org
 	Version string `json:"version" yaml:"version"`

+	// The minimum Mattermost server version required for your plugin.
+	//
+	// Minimum server version: 5.6
+	MinServerVersion string `json:"min_server_version,omitempty" yaml:"min_server_version,omitempty"`
+
 	// Server defines the server-side portion of your plugin.
 	Server *ManifestServer `json:"server,omitempty" yaml:"server,omitempty"`

@@ -242,6 +249,18 @@ func (m *Manifest) HasWebapp() bool {
 	return m.Webapp != nil
 }

+func (m *Manifest) MeetMinServerVersion(serverVersion string) (bool, error) {
+	minServerVersion, err := semver.Parse(m.MinServerVersion)
+	if err != nil {
+		return false, errors.New("failed to parse MinServerVersion")
+	}
+	sv := semver.MustParse(serverVersion)
+	if sv.LT(minServerVersion) {
+		return false, nil
+	}
+	return true, nil
+}
+
 // FindManifest will find and parse the manifest in a given directory.
 //
 // In all cases other than a does-not-exist error, path is set to the path of the manifest file that was
@@ -254,25 +273,23 @@ func FindManifest(dir string) (manifest *Manifest, path string, err error) {
 		f, ferr := os.Open(path)
 		if ferr != nil {
 			if !os.IsNotExist(ferr) {
-				err = ferr
-				return
+				return nil, "", ferr
 			}
 			continue
 		}
 		b, ioerr := ioutil.ReadAll(f)
 		f.Close()
 		if ioerr != nil {
-			err = ioerr
-			return
+			return nil, path, ioerr
 		}
 		var parsed Manifest
 		err = yaml.Unmarshal(b, &parsed)
 		if err != nil {
-			return
+			return nil, path, err
 		}
 		manifest = &parsed
 		manifest.Id = strings.ToLower(manifest.Id)
-		return
+		return manifest, path, nil
 	}

 	path = filepath.Join(dir, "plugin.json")
@@ -281,16 +298,15 @@ func FindManifest(dir string) (manifest *Manifest, path string, err error) {
 		if os.IsNotExist(ferr) {
 			path = ""
 		}
-		err = ferr
-		return
+		return nil, path, ferr
 	}
 	defer f.Close()
 	var parsed Manifest
 	err = json.NewDecoder(f).Decode(&parsed)
 	if err != nil {
-		return
+		return nil, path, err
 	}
 	manifest = &parsed
 	manifest.Id = strings.ToLower(manifest.Id)
-	return
+	return manifest, path, nil
 }
--- a/model/manifest_test.go
+++ b/model/manifest_test.go
@@ -63,7 +63,8 @@ func TestFindManifest(t *testing.T) {

 func TestManifestUnmarshal(t *testing.T) {
 	expected := Manifest{
-		Id: "theid",
+		Id:               "theid",
+		MinServerVersion: "5.6.0",
 		Server: &ManifestServer{
 			Executable: "theexecutable",
 			Executables: &ManifestExecutables{
@@ -101,6 +102,7 @@ func TestManifestUnmarshal(t *testing.T) {
 	var yamlResult Manifest
 	require.NoError(t, yaml.Unmarshal([]byte(`
 id: theid
+min_server_version: 5.6.0
 server:
    executable: theexecutable
    executables:
@@ -129,6 +131,7 @@ settings_schema:
 	var jsonResult Manifest
 	require.NoError(t, json.Unmarshal([]byte(`{
 	"id": "theid",
+  "min_server_version": "5.6.0",
 	"server": {
 		"executable": "theexecutable",
 		"executables": {
@@ -182,6 +185,27 @@ func TestFindManifest_FileErrors(t *testing.T) {
 	}
 }

+func TestFindManifest_FolderPermission(t *testing.T) {
+	for _, tc := range []string{"plugin.yaml", "plugin.json"} {
+		dir, err := ioutil.TempDir("", "mm-plugin-test")
+		defer os.RemoveAll(dir)
+
+		path := filepath.Join(dir, tc)
+		require.NoError(t, os.Mkdir(path, 0700))
+
+		//User does not have permission in the plugin folder
+		err = os.Chmod(dir, 0066)
+		require.NoError(t, err)
+
+		m, mpath, err := FindManifest(dir)
+		assert.Nil(t, m)
+		assert.Equal(t, "", mpath)
+		assert.Error(t, err, tc)
+		assert.False(t, os.IsNotExist(err), tc)
+
+	}
+}
+
 func TestManifestJson(t *testing.T) {
 	manifest := &Manifest{
 		Id: "theid",
@@ -246,10 +270,11 @@ func TestManifestHasClient(t *testing.T) {

 func TestManifestClientManifest(t *testing.T) {
 	manifest := &Manifest{
-		Id:          "theid",
-		Name:        "thename",
-		Description: "thedescription",
-		Version:     "0.0.1",
+		Id:               "theid",
+		Name:             "thename",
+		Description:      "thedescription",
+		Version:          "0.0.1",
+		MinServerVersion: "5.6.0",
 		Server: &ManifestServer{
 			Executable: "theexecutable",
 		},
@@ -284,6 +309,7 @@ func TestManifestClientManifest(t *testing.T) {

 	assert.Equal(t, manifest.Id, sanitized.Id)
 	assert.Equal(t, manifest.Version, sanitized.Version)
+	assert.Equal(t, manifest.MinServerVersion, sanitized.MinServerVersion)
 	assert.Equal(t, "/static/theid/theid_000102030405060708090a0b0c0d0e0f_bundle.js", sanitized.Webapp.BundlePath)
 	assert.Equal(t, manifest.Webapp.BundleHash, sanitized.Webapp.BundleHash)
 	assert.Equal(t, manifest.SettingsSchema, sanitized.SettingsSchema)
@@ -293,6 +319,7 @@ func TestManifestClientManifest(t *testing.T) {

 	assert.NotEmpty(t, manifest.Id)
 	assert.NotEmpty(t, manifest.Version)
+	assert.NotEmpty(t, manifest.MinServerVersion)
 	assert.NotEmpty(t, manifest.Webapp)
 	assert.NotEmpty(t, manifest.Name)
 	assert.NotEmpty(t, manifest.Description)
@@ -594,3 +621,53 @@ func TestManifestHasWebapp(t *testing.T) {
 		})
 	}
 }
+
+func TestManifestMeetMinServerVersion(t *testing.T) {
+	for name, test := range map[string]struct {
+		MinServerVersion string
+		ServerVersion    string
+		ShouldError      bool
+		ShouldFulfill    bool
+	}{
+		"generously fulfilled": {
+			MinServerVersion: "5.5.0",
+			ServerVersion:    "5.6.0",
+			ShouldError:      false,
+			ShouldFulfill:    true,
+		},
+		"exactly fulfilled": {
+			MinServerVersion: "5.6.0",
+			ServerVersion:    "5.6.0",
+			ShouldError:      false,
+			ShouldFulfill:    true,
+		},
+		"not fulfilled": {
+			MinServerVersion: "5.6.0",
+			ServerVersion:    "5.5.0",
+			ShouldError:      false,
+			ShouldFulfill:    false,
+		},
+		"fail to parse MinServerVersion": {
+			MinServerVersion: "abc",
+			ServerVersion:    "5.5.0",
+			ShouldError:      true,
+		},
+	} {
+		t.Run(name, func(t *testing.T) {
+			assert := assert.New(t)
+
+			manifest := Manifest{
+				MinServerVersion: test.MinServerVersion,
+			}
+			fulfilled, err := manifest.MeetMinServerVersion(test.ServerVersion)
+
+			if test.ShouldError {
+				assert.NotNil(err)
+				assert.False(fulfilled)
+				return
+			}
+			assert.Nil(err)
+			assert.Equal(test.ShouldFulfill, fulfilled)
+		})
+	}
+}
--- a/model/saml.go
+++ b/model/saml.go
@@ -10,7 +10,7 @@ import (

 const (
 	USER_AUTH_SERVICE_SAML      = "saml"
-	USER_AUTH_SERVICE_SAML_TEXT = "With SAML"
+	USER_AUTH_SERVICE_SAML_TEXT = "SAML"
 )

 type SamlAuthRequest struct {
--- a/model/terms_of_service.go
+++ b/model/terms_of_service.go
@@ -11,7 +11,6 @@ import (
 	"unicode/utf8"
 )

-// we only ever need the latest version of terms of service
 const TERMS_OF_SERVICE_CACHE_SIZE = 1

 type TermsOfService struct {
@@ -58,7 +57,7 @@ func InvalidTermsOfServiceError(fieldName string, termsOfServiceId string) *AppE
 	if termsOfServiceId != "" {
 		details = "terms_of_service_id=" + termsOfServiceId
 	}
-	return NewAppError("TermsOfServiceStore.IsValid", id, map[string]interface{}{"MaxLength": POST_MESSAGE_MAX_RUNES_V2}, details, http.StatusBadRequest)
+	return NewAppError("TermsOfService.IsValid", id, map[string]interface{}{"MaxLength": POST_MESSAGE_MAX_RUNES_V2}, details, http.StatusBadRequest)
 }

 func (t *TermsOfService) PreSave() {
--- a/model/terms_of_service_test.go
+++ b/model/terms_of_service_test.go
@@ -4,9 +4,10 @@
 package model

 import (
-	"github.com/stretchr/testify/assert"
 	"strings"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )

 func TestTermsOfServiceIsValid(t *testing.T) {
--- a/model/user.go
+++ b/model/user.go
@@ -50,33 +50,32 @@ const (
 )

 type User struct {
-	Id                       string    `json:"id"`
-	CreateAt                 int64     `json:"create_at,omitempty"`
-	UpdateAt                 int64     `json:"update_at,omitempty"`
-	DeleteAt                 int64     `json:"delete_at"`
-	Username                 string    `json:"username"`
-	Password                 string    `json:"password,omitempty"`
-	AuthData                 *string   `json:"auth_data,omitempty"`
-	AuthService              string    `json:"auth_service"`
-	Email                    string    `json:"email"`
-	EmailVerified            bool      `json:"email_verified,omitempty"`
-	Nickname                 string    `json:"nickname"`
-	FirstName                string    `json:"first_name"`
-	LastName                 string    `json:"last_name"`
-	Position                 string    `json:"position"`
-	Roles                    string    `json:"roles"`
-	AllowMarketing           bool      `json:"allow_marketing,omitempty"`
-	Props                    StringMap `json:"props,omitempty"`
-	NotifyProps              StringMap `json:"notify_props,omitempty"`
-	LastPasswordUpdate       int64     `json:"last_password_update,omitempty"`
-	LastPictureUpdate        int64     `json:"last_picture_update,omitempty"`
-	FailedAttempts           int       `json:"failed_attempts,omitempty"`
-	Locale                   string    `json:"locale"`
-	Timezone                 StringMap `json:"timezone"`
-	MfaActive                bool      `json:"mfa_active,omitempty"`
-	MfaSecret                string    `json:"mfa_secret,omitempty"`
-	LastActivityAt           int64     `db:"-" json:"last_activity_at,omitempty"`
-	AcceptedTermsOfServiceId string    `json:"accepted_terms_of_service_id,omitempty"` // TODO remove this field when new TOS user action table is created
+	Id                 string    `json:"id"`
+	CreateAt           int64     `json:"create_at,omitempty"`
+	UpdateAt           int64     `json:"update_at,omitempty"`
+	DeleteAt           int64     `json:"delete_at"`
+	Username           string    `json:"username"`
+	Password           string    `json:"password,omitempty"`
+	AuthData           *string   `json:"auth_data,omitempty"`
+	AuthService        string    `json:"auth_service"`
+	Email              string    `json:"email"`
+	EmailVerified      bool      `json:"email_verified,omitempty"`
+	Nickname           string    `json:"nickname"`
+	FirstName          string    `json:"first_name"`
+	LastName           string    `json:"last_name"`
+	Position           string    `json:"position"`
+	Roles              string    `json:"roles"`
+	AllowMarketing     bool      `json:"allow_marketing,omitempty"`
+	Props              StringMap `json:"props,omitempty"`
+	NotifyProps        StringMap `json:"notify_props,omitempty"`
+	LastPasswordUpdate int64     `json:"last_password_update,omitempty"`
+	LastPictureUpdate  int64     `json:"last_picture_update,omitempty"`
+	FailedAttempts     int       `json:"failed_attempts,omitempty"`
+	Locale             string    `json:"locale"`
+	Timezone           StringMap `json:"timezone"`
+	MfaActive          bool      `json:"mfa_active,omitempty"`
+	MfaSecret          string    `json:"mfa_secret,omitempty"`
+	LastActivityAt     int64     `db:"-" json:"last_activity_at,omitempty"`
 }

 type UserPatch struct {
--- a/model/user_terms_of_Service_test.go
+++ b/model/user_terms_of_Service_test.go
@@ -0,0 +1,46 @@
+// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+package model
+
+import (
+	"github.com/stretchr/testify/assert"
+	"strings"
+	"testing"
+)
+
+func TestUserTermsOfServiceIsValid(t *testing.T) {
+	s := UserTermsOfService{}
+
+	if err := s.IsValid(); err == nil {
+		t.Fatal("should be invalid")
+	}
+
+	s.UserId = NewId()
+	if err := s.IsValid(); err == nil {
+		t.Fatal("should be invalid")
+	}
+
+	s.TermsOfServiceId = NewId()
+	if err := s.IsValid(); err == nil {
+		t.Fatal("should be invalid")
+	}
+
+	s.CreateAt = GetMillis()
+	if err := s.IsValid(); err != nil {
+		t.Fatal("should be valid")
+	}
+}
+
+func TestUserTermsOfServiceJson(t *testing.T) {
+	o := UserTermsOfService{
+		UserId:           NewId(),
+		TermsOfServiceId: NewId(),
+		CreateAt:         GetMillis(),
+	}
+	j := o.ToJson()
+	ro := UserTermsOfServiceFromJson(strings.NewReader(j))
+
+	assert.NotNil(t, ro)
+	assert.Equal(t, o, *ro)
+}
--- a/model/user_terms_of_service.go
+++ b/model/user_terms_of_service.go
@@ -0,0 +1,61 @@
+// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+package model
+
+import (
+	"encoding/json"
+	"fmt"
+	"io"
+	"net/http"
+)
+
+type UserTermsOfService struct {
+	UserId           string `json:"user_id"`
+	TermsOfServiceId string `json:"terms_of_service_id"`
+	CreateAt         int64  `json:"create_at"`
+}
+
+func (ut *UserTermsOfService) IsValid() *AppError {
+	if len(ut.UserId) != 26 {
+		return InvalidUserTermsOfServiceError("user_id", ut.UserId)
+	}
+
+	if len(ut.TermsOfServiceId) != 26 {
+		return InvalidUserTermsOfServiceError("terms_of_service_id", ut.UserId)
+	}
+
+	if ut.CreateAt == 0 {
+		return InvalidUserTermsOfServiceError("create_at", ut.UserId)
+	}
+
+	return nil
+}
+
+func (ut *UserTermsOfService) ToJson() string {
+	b, _ := json.Marshal(ut)
+	return string(b)
+}
+
+func (ut *UserTermsOfService) PreSave() {
+	if ut.UserId == "" {
+		ut.UserId = NewId()
+	}
+
+	ut.CreateAt = GetMillis()
+}
+
+func UserTermsOfServiceFromJson(data io.Reader) *UserTermsOfService {
+	var userTermsOfService *UserTermsOfService
+	json.NewDecoder(data).Decode(&userTermsOfService)
+	return userTermsOfService
+}
+
+func InvalidUserTermsOfServiceError(fieldName string, userTermsOfServiceId string) *AppError {
+	id := fmt.Sprintf("model.user_terms_of_service.is_valid.%s.app_error", fieldName)
+	details := ""
+	if userTermsOfServiceId != "" {
+		details = "user_terms_of_service_user_id=" + userTermsOfServiceId
+	}
+	return NewAppError("UserTermsOfService.IsValid", id, nil, details, http.StatusBadRequest)
+}
--- a/model/version.go
+++ b/model/version.go
@@ -13,6 +13,7 @@ import (
 // It should be maintained in chronological order with most current
 // release at the front of the list.
 var versions = []string{
+	"5.5.0",
 	"5.4.0",
 	"5.3.0",
 	"5.2.0",