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/config.go | |
| 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/config.go')
| -rw-r--r-- | app/config.go | 14 |
1 files changed, 14 insertions, 0 deletions
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 { |