From dcd4e50bdebaf1f89226f3a7d72e83f3c7e8dc00 Mon Sep 17 00:00:00 2001
From: Nick Misasi <nick.misasi@mattermost.com>
Date: Fri, 21 Jan 2022 11:32:03 -0500
Subject: [PATCH] If the license is cloud, use the SiteURL instead of the
 X-Forwarded-Proto header (#19393)

---
 web/handlers.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/web/handlers.go b/web/handlers.go
index bb1040d4fe..073d875690 100644
--- a/web/handlers.go
+++ b/web/handlers.go
@@ -207,6 +207,9 @@ func (h Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 
 	subpath, _ := utils.GetSubpathFromConfig(c.App.Config())
 	siteURLHeader := app.GetProtocol(r) + "://" + r.Host + subpath
+	if c.App.Srv().License() != nil && *c.App.Srv().License().Features.Cloud {
+		siteURLHeader = *c.App.Config().ServiceSettings.SiteURL + subpath
+	}
 	c.SetSiteURLHeader(siteURLHeader)
 
 	w.Header().Set(model.HeaderRequestId, c.AppContext.RequestId())