Merge branch 'master' into advanced-permissions-phase-1

1 files changed, 16 insertions, 1 deletions

diff --git a/app/config.go b/app/config.go
index b4925e8fb..35a0c9a3f 100644
--- a/app/config.go
+++ b/app/config.go
@@ -12,7 +12,9 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
+	"net/url"
 	"runtime/debug"
+	"strings"
 
 	l4g "github.com/alecthomas/log4go"
 
@@ -53,7 +55,7 @@ func (a *App) LoadConfig(configFile string) *model.AppError {
 
 	a.config.Store(cfg)
 
-	utils.SetSiteURL(*cfg.ServiceSettings.SiteURL)
+	a.siteURL = strings.TrimRight(*cfg.ServiceSettings.SiteURL, "/")
 
 	a.InvokeConfigListeners(old, cfg)
 	return nil
@@ -254,3 +256,16 @@ func (a *App) Desanitize(cfg *model.Config) {
 		cfg.SqlSettings.DataSourceSearchReplicas[i] = actual.SqlSettings.DataSourceSearchReplicas[i]
 	}
 }
+
+func (a *App) GetCookieDomain() string {
+	if *a.Config().ServiceSettings.AllowCookiesForSubdomains {
+		if siteURL, err := url.Parse(*a.Config().ServiceSettings.SiteURL); err == nil {
+			return siteURL.Hostname()
+		}
+	}
+	return ""
+}
+
+func (a *App) GetSiteURL() string {
+	return a.siteURL
+}