From 312edbe5315e97dc25857fc2590266734056af70 Mon Sep 17 00:00:00 2001 From: Saturnino Abril Date: Sat, 2 Jun 2018 06:33:59 +0800 Subject: [MM-10718] Move custom branding to TE (#8871) * move custom branding to TE * move brand's enterprise code to server and remove BrandInterface --- utils/config.go | 9 +++------ utils/license.go | 1 - 2 files changed, 3 insertions(+), 7 deletions(-) (limited to 'utils') 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 diff --git a/utils/license.go b/utils/license.go index 8bb214734..459318231 100644 --- a/utils/license.go +++ b/utils/license.go @@ -137,7 +137,6 @@ func GetClientLicense(l *model.License) map[string]string { props["GoogleOAuth"] = strconv.FormatBool(*l.Features.GoogleOAuth) props["Office365OAuth"] = strconv.FormatBool(*l.Features.Office365OAuth) props["Compliance"] = strconv.FormatBool(*l.Features.Compliance) - props["CustomBrand"] = strconv.FormatBool(*l.Features.CustomBrand) props["MHPNS"] = strconv.FormatBool(*l.Features.MHPNS) props["Announcement"] = strconv.FormatBool(*l.Features.Announcement) props["Elasticsearch"] = strconv.FormatBool(*l.Features.Elasticsearch) -- cgit v1.2.3-1-g7c22