#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
Этот коммит содержится в:
Harshil Sharma
2018-09-26 20:49:22 +00:00
коммит произвёл Jesse Hallam
родитель 4e59a27293
Коммит af275fe924
38 изменённых файлов: 933 добавлений и 44 удалений

Просмотреть файл

@@ -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 {