From f8b6b6b0edd9c0f2e78f677fdfc6e6be2eb02cd5 Mon Sep 17 00:00:00 2001 From: Nathaniel Allred Date: Thu, 22 Dec 2022 11:32:23 -0600 Subject: [PATCH] always set CWSURL in client config (#21940) --- config/client.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/config/client.go b/config/client.go index b8160993fd..e26c2bea40 100644 --- a/config/client.go +++ b/config/client.go @@ -92,6 +92,8 @@ func GenerateClientConfig(c *model.Config, telemetryID string, license *model.Li props["EnableEmailInvitations"] = strconv.FormatBool(*c.ServiceSettings.EnableEmailInvitations) + props["CWSURL"] = *c.CloudSettings.CWSURL + // Set default values for all options that require a license. props["ExperimentalEnableAuthenticationTransfer"] = "true" props["LdapNicknameAttributeSet"] = "false" @@ -123,7 +125,6 @@ func GenerateClientConfig(c *model.Config, telemetryID string, license *model.Li props["DataRetentionFileRetentionDays"] = "0" props["DataRetentionEnableBoardsDeletion"] = "false" props["DataRetentionBoardsRetentionDays"] = "0" - props["CWSURL"] = "" props["CustomUrlSchemes"] = strings.Join(c.DisplaySettings.CustomURLSchemes, ",") props["IsDefaultMarketplace"] = strconv.FormatBool(*c.PluginSettings.MarketplaceURL == model.PluginSettingsDefaultMarketplaceURL) @@ -195,10 +196,6 @@ func GenerateClientConfig(c *model.Config, telemetryID string, license *model.Li props["DataRetentionBoardsRetentionDays"] = strconv.FormatInt(int64(*c.DataRetentionSettings.BoardsRetentionDays), 10) } - if license.IsCloud() { - props["CWSURL"] = *c.CloudSettings.CWSURL - } - if *license.Features.SharedChannels { props["ExperimentalSharedChannels"] = strconv.FormatBool(*c.ExperimentalSettings.EnableSharedChannels) props["ExperimentalRemoteClusterService"] = strconv.FormatBool(c.FeatureFlags.EnableRemoteClusterService && *c.ExperimentalSettings.EnableRemoteClusterService)