From fbbd1193dcced98a0df9c7cb61c82a377bf7dbdd Mon Sep 17 00:00:00 2001 From: Devin Binnie <52460000+devinbinnie@users.noreply.github.com> Date: Thu, 19 Aug 2021 10:05:30 -0400 Subject: [PATCH] [MM-37682] Expose SiteURL to non-authenticated sessions (#18146) Co-authored-by: Mattermod --- config/client.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/client.go b/config/client.go index d758a86462..9b9bdfd21a 100644 --- a/config/client.go +++ b/config/client.go @@ -15,7 +15,6 @@ import ( func GenerateClientConfig(c *model.Config, telemetryID string, license *model.License) map[string]string { props := GenerateLimitedClientConfig(c, telemetryID, license) - props["SiteURL"] = strings.TrimRight(*c.ServiceSettings.SiteURL, "/") props["EnableCustomUserStatuses"] = strconv.FormatBool(*c.TeamSettings.EnableCustomUserStatuses) props["EnableUserDeactivation"] = strconv.FormatBool(*c.TeamSettings.EnableUserDeactivation) props["RestrictDirectMessage"] = *c.TeamSettings.RestrictDirectMessage @@ -232,6 +231,7 @@ func GenerateLimitedClientConfig(c *model.Config, telemetryID string, license *m props["EnableFile"] = strconv.FormatBool(*c.LogSettings.EnableFile) props["FileLevel"] = *c.LogSettings.FileLevel + props["SiteURL"] = strings.TrimRight(*c.ServiceSettings.SiteURL, "/") props["SiteName"] = *c.TeamSettings.SiteName props["WebsocketURL"] = strings.TrimRight(*c.ServiceSettings.WebsocketURL, "/") props["WebsocketPort"] = fmt.Sprintf("%v", *c.ServiceSettings.WebsocketPort)