diff options
author | Harshil Sharma <harshil.sharma@joshtechnologygroup.com> | 2018-09-26 20:49:22 +0000 |
---|---|---|
committer | Jesse Hallam <jesse.hallam@gmail.com> | 2018-09-26 16:49:22 -0400 |
commit | af275fe9242303581192258ef4f6457fa45a58e4 (patch) | |
tree | df05afdb0894d577574cbee5d056ffddeec3a93e /app | |
parent | 4e59a27293394b6d5529efd13ad711daebbc0eb3 (diff) | |
download | chat-af275fe9242303581192258ef4f6457fa45a58e4.tar.gz chat-af275fe9242303581192258ef4f6457fa45a58e4.tar.bz2 chat-af275fe9242303581192258ef4f6457fa45a58e4.zip |
#MM-12130 changes for custom service terms (#9450)
* #MM-12130 changes for custom service terms
* Fixed styling
* Added getServiceTerms API
* removed unnecessary panic
* removed custom service terms text from flat config
* reverted user sql store as those changes are no longer needed
* added tests
* Updated a config key to be more standard
* Added copyright info
* Loading service terms only if the feature is enabled
* Loading service terms only if the feature is enabled
* removed unused index
* added createservice termns API
* made a param to bool instead of string
* added createservice termns API
* review fixes
* fixed styling
* Minor refactoring
* removed saveConfig and loadConfig magic
* added empty service terms text check to createServiceTerms API
* refactoed some urls to be terms_of_service instead of service_terms
* removed check for support settings
* changed URLs in tests
* removed unused code
* fixed a bug
* added service termd id in conif
* fixed a test
* review fixes
* minor fixes
* Fixed TestCreateServiceTerms
Diffstat (limited to 'app')
-rw-r--r-- | app/admin.go | 1 | ||||
-rw-r--r-- | app/app.go | 1 | ||||
-rw-r--r-- | app/config.go | 14 | ||||
-rw-r--r-- | app/diagnostics.go | 1 | ||||
-rw-r--r-- | app/diagnostics_test.go | 2 | ||||
-rw-r--r-- | app/service_terms.go | 45 | ||||
-rw-r--r-- | app/user.go | 20 | ||||
-rw-r--r-- | app/user_test.go | 40 |
8 files changed, 122 insertions, 2 deletions
diff --git a/app/admin.go b/app/admin.go index 3b7f21dda..6055803a5 100644 --- a/app/admin.go +++ b/app/admin.go @@ -179,6 +179,7 @@ func (a *App) SaveConfig(cfg *model.Config, sendConfigChangeClusterMessage bool) } a.DisableConfigWatch() + a.UpdateConfig(func(update *model.Config) { *update = *cfg }) diff --git a/app/app.go b/app/app.go index 1cec749da..dabd00571 100644 --- a/app/app.go +++ b/app/app.go @@ -218,6 +218,7 @@ func New(options ...Option) (outApp *App, outErr error) { } app.Srv.Store = app.newStore() + app.AddConfigListener(func(_, current *model.Config) { if current.SqlSettings.EnablePublicChannelsMaterialization != nil && !*current.SqlSettings.EnablePublicChannelsMaterialization { app.Srv.Store.Channel().DisableExperimentalPublicChannelsMaterialization() diff --git a/app/config.go b/app/config.go index a63650a58..fde38c13e 100644 --- a/app/config.go +++ b/app/config.go @@ -23,6 +23,10 @@ import ( "github.com/mattermost/mattermost-server/utils" ) +const ( + ERROR_SERVICE_TERMS_NO_ROWS_FOUND = "store.sql_service_terms_store.get.no_rows.app_error" +) + func (a *App) Config() *model.Config { if cfg := a.config.Load(); cfg != nil { return cfg.(*model.Config) @@ -242,6 +246,16 @@ func (a *App) AsymmetricSigningKey() *ecdsa.PrivateKey { func (a *App) regenerateClientConfig() { a.clientConfig = utils.GenerateClientConfig(a.Config(), a.DiagnosticId(), a.License()) + + if a.clientConfig["EnableCustomServiceTerms"] == "true" { + serviceTerms, err := a.GetLatestServiceTerms() + if err != nil { + mlog.Err(err) + } else { + a.clientConfig["CustomServiceTermsId"] = serviceTerms.Id + } + } + a.limitedClientConfig = utils.GenerateLimitedClientConfig(a.Config(), a.DiagnosticId(), a.License()) if key := a.AsymmetricSigningKey(); key != nil { diff --git a/app/diagnostics.go b/app/diagnostics.go index f0d6153e6..c84bd7367 100644 --- a/app/diagnostics.go +++ b/app/diagnostics.go @@ -263,6 +263,7 @@ func (a *App) trackConfig() { "experimental_limit_client_config": *cfg.ServiceSettings.ExperimentalLimitClientConfig, "enable_email_invitations": *cfg.ServiceSettings.EnableEmailInvitations, "experimental_channel_organization": *cfg.ServiceSettings.ExperimentalChannelOrganization, + "custom_service_terms_enabled": *cfg.SupportSettings.CustomServiceTermsEnabled, }) a.SendDiagnostic(TRACK_CONFIG_TEAM, map[string]interface{}{ diff --git a/app/diagnostics_test.go b/app/diagnostics_test.go index 8d4e57107..8e8c03935 100644 --- a/app/diagnostics_test.go +++ b/app/diagnostics_test.go @@ -103,7 +103,7 @@ func TestDiagnostics(t *testing.T) { info := "" // Collect the info sent. - Loop: + Loop: for { select { case result := <-data: diff --git a/app/service_terms.go b/app/service_terms.go new file mode 100644 index 000000000..85808ddd4 --- /dev/null +++ b/app/service_terms.go @@ -0,0 +1,45 @@ +// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. +// See License.txt for license information. + +package app + +import ( + "github.com/mattermost/mattermost-server/model" +) + +func (a *App) CreateServiceTerms(text, userId string) (*model.ServiceTerms, *model.AppError) { + serviceTerms := &model.ServiceTerms{ + Text: text, + UserId: userId, + } + + if _, err := a.GetUser(userId); err != nil { + return nil, err + } + + result := <-a.Srv.Store.ServiceTerms().Save(serviceTerms) + if result.Err != nil { + return nil, result.Err + } + + serviceTerms = result.Data.(*model.ServiceTerms) + return serviceTerms, nil +} + +func (a *App) GetLatestServiceTerms() (*model.ServiceTerms, *model.AppError) { + if result := <-a.Srv.Store.ServiceTerms().GetLatest(true); result.Err != nil { + return nil, result.Err + } else { + serviceTerms := result.Data.(*model.ServiceTerms) + return serviceTerms, nil + } +} + +func (a *App) GetServiceTerms(id string) (*model.ServiceTerms, *model.AppError) { + if result := <-a.Srv.Store.ServiceTerms().Get(id, true); result.Err != nil { + return nil, result.Err + } else { + serviceTerms := result.Data.(*model.ServiceTerms) + return serviceTerms, nil + } +} diff --git a/app/user.go b/app/user.go index c8df2ca26..86f44db4e 100644 --- a/app/user.go +++ b/app/user.go @@ -245,7 +245,6 @@ func (a *App) createUser(user *model.User) (*model.User, *model.AppError) { } ruser.Sanitize(map[string]bool{}) - return ruser, nil } } @@ -1616,3 +1615,22 @@ func (a *App) UpdateOAuthUserAttrs(userData io.Reader, user *model.User, provide return nil } + +func (a *App) RecordUserServiceTermsAction(userId, serviceTermsId string, accepted bool) *model.AppError { + user, err := a.GetUser(userId) + if err != nil { + return err + } + + if accepted { + user.AcceptedServiceTermsId = serviceTermsId + } else { + user.AcceptedServiceTermsId = "" + } + _, err = a.UpdateUser(user, false) + if err != nil { + return err + } + + return nil +} diff --git a/app/user_test.go b/app/user_test.go index 92ff4d62a..a007f93d5 100644 --- a/app/user_test.go +++ b/app/user_test.go @@ -524,3 +524,43 @@ func TestPermanentDeleteUser(t *testing.T) { t.Fatal("GetFileInfo after DeleteUser is nil") } } + +func TestRecordUserServiceTermsAction(t *testing.T) { + th := Setup().InitBasic() + defer th.TearDown() + + user := &model.User{ + Email: strings.ToLower(model.NewId()) + "success+test@example.com", + Nickname: "Luke Skywalker", // trying to bring balance to the "Force", one test user at a time + Username: "luke" + model.NewId(), + Password: "passwd1", + AuthService: "", + } + user, err := th.App.CreateUser(user) + if err != nil { + t.Fatalf("failed to create user: %v", err) + } + + defer th.App.PermanentDeleteUser(user) + + serviceTerms, err := th.App.CreateServiceTerms("text", user.Id) + if err != nil { + t.Fatalf("failed to create service terms: %v", err) + } + + err = th.App.RecordUserServiceTermsAction(user.Id, serviceTerms.Id, true) + if err != nil { + t.Fatalf("failed to record user action: %v", err) + } + + nuser, err := th.App.GetUser(user.Id) + assert.Equal(t, serviceTerms.Id, nuser.AcceptedServiceTermsId) + + err = th.App.RecordUserServiceTermsAction(user.Id, serviceTerms.Id, false) + if err != nil { + t.Fatalf("failed to record user action: %v", err) + } + + nuser, err = th.App.GetUser(user.Id) + assert.Empty(t, nuser.AcceptedServiceTermsId) +} |