From 7381b4c0e579138e4c01f75c9c3ea504f1b2be39 Mon Sep 17 00:00:00 2001 From: Maria A Nunez Date: Mon, 12 Oct 2020 22:46:22 -0400 Subject: [PATCH] MM-27454 - Added CWSUrl to Client Config (#15916) --- config/client.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/config/client.go b/config/client.go index a64bef56a5..e7f34ca047 100644 --- a/config/client.go +++ b/config/client.go @@ -132,6 +132,8 @@ func GenerateClientConfig(c *model.Config, telemetryID string, license *model.Li props["DataRetentionMessageRetentionDays"] = "0" props["DataRetentionEnableFileDeletion"] = "false" props["DataRetentionFileRetentionDays"] = "0" + props["CWSUrl"] = "" + props["CustomUrlSchemes"] = strings.Join(c.DisplaySettings.CustomUrlSchemes, ",") props["IsDefaultMarketplace"] = strconv.FormatBool(*c.PluginSettings.MarketplaceUrl == model.PLUGIN_SETTINGS_DEFAULT_MARKETPLACE_URL) @@ -194,6 +196,10 @@ func GenerateClientConfig(c *model.Config, telemetryID string, license *model.Li props["DataRetentionEnableFileDeletion"] = strconv.FormatBool(*c.DataRetentionSettings.EnableFileDeletion) props["DataRetentionFileRetentionDays"] = strconv.FormatInt(int64(*c.DataRetentionSettings.FileRetentionDays), 10) } + + if *license.Features.Cloud { + props["CWSUrl"] = *c.CloudSettings.CWSUrl + } } return props @@ -283,6 +289,7 @@ func GenerateLimitedClientConfig(c *model.Config, telemetryID string, license *m props["SamlLoginButtonTextColor"] = "" props["EnableSignUpWithGoogle"] = "false" props["EnableSignUpWithOffice365"] = "false" + props["CWSUrl"] = "" props["EnableCustomBrand"] = strconv.FormatBool(*c.TeamSettings.EnableCustomBrand) props["CustomBrandText"] = *c.TeamSettings.CustomBrandText props["CustomDescriptionText"] = *c.TeamSettings.CustomDescriptionText