diff options
| author | Saturnino Abril <saturnino.abril@gmail.com> | 2018-06-02 06:33:59 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-02 06:33:59 +0800 |
| commit | 312edbe5315e97dc25857fc2590266734056af70 (patch) | |
| tree | 4dc477389e10aa2078651c99bd1e7597276c0e2a /utils/config.go | |
| parent | ebdceb8e529810cd89599b8fbfda0157a659f3b5 (diff) | |
| download | chat-312edbe5315e97dc25857fc2590266734056af70.tar.gz chat-312edbe5315e97dc25857fc2590266734056af70.tar.bz2 chat-312edbe5315e97dc25857fc2590266734056af70.zip | |
[MM-10718] Move custom branding to TE (#8871)
* move custom branding to TE
* move brand's enterprise code to server and remove BrandInterface
Diffstat (limited to 'utils/config.go')
| -rw-r--r-- | utils/config.go | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/utils/config.go b/utils/config.go index 8feb7d882..64085fcff 100644 --- a/utils/config.go +++ b/utils/config.go @@ -612,18 +612,15 @@ func GenerateClientConfig(c *model.Config, diagnosticId string, license *model.L props["PasswordRequireNumber"] = strconv.FormatBool(*c.PasswordSettings.Number) props["PasswordRequireSymbol"] = strconv.FormatBool(*c.PasswordSettings.Symbol) props["CustomUrlSchemes"] = strings.Join(*c.DisplaySettings.CustomUrlSchemes, ",") + props["EnableCustomBrand"] = strconv.FormatBool(*c.TeamSettings.EnableCustomBrand) + props["CustomBrandText"] = *c.TeamSettings.CustomBrandText + props["CustomDescriptionText"] = *c.TeamSettings.CustomDescriptionText if license != nil { props["ExperimentalHideTownSquareinLHS"] = strconv.FormatBool(*c.TeamSettings.ExperimentalHideTownSquareinLHS) props["ExperimentalTownSquareIsReadOnly"] = strconv.FormatBool(*c.TeamSettings.ExperimentalTownSquareIsReadOnly) props["ExperimentalEnableAuthenticationTransfer"] = strconv.FormatBool(*c.ServiceSettings.ExperimentalEnableAuthenticationTransfer) - if *license.Features.CustomBrand { - props["EnableCustomBrand"] = strconv.FormatBool(*c.TeamSettings.EnableCustomBrand) - props["CustomBrandText"] = *c.TeamSettings.CustomBrandText - props["CustomDescriptionText"] = *c.TeamSettings.CustomDescriptionText - } - if *license.Features.LDAP { props["EnableLdap"] = strconv.FormatBool(*c.LdapSettings.Enable) props["LdapLoginFieldName"] = *c.LdapSettings.LoginFieldName |