From 839f1ad444849db1dd18c9da0c3b7380b355a047 Mon Sep 17 00:00:00 2001
From: Corey Hulen <corey@hulen.com>
Date: Thu, 25 Aug 2016 04:32:44 -0800
Subject: Fixing license (#3878)

* Fixing sanitize license

* Fixing license

* Fixing unit tests
---
 api/license.go | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'api/license.go')

diff --git a/api/license.go b/api/license.go
index f9ecce486..b7bf8a234 100644
--- a/api/license.go
+++ b/api/license.go
@@ -173,12 +173,18 @@ func RemoveLicense() *model.AppError {
 }
 
 func getClientLicenceConfig(c *Context, w http.ResponseWriter, r *http.Request) {
-	etag := utils.GetClientLicenseEtag()
+	etag := utils.GetClientLicenseEtag(!c.IsSystemAdmin())
 	if HandleEtag(etag, w, r) {
 		return
 	}
 
-	clientLicense := utils.ClientLicense
+	var clientLicense map[string]string
+
+	if c.IsSystemAdmin() {
+		clientLicense = utils.ClientLicense
+	} else {
+		clientLicense = utils.GetSanitizedClientLicense()
+	}
 
 	w.Header().Set(model.HEADER_ETAG_SERVER, etag)
 	w.Write([]byte(model.MapToJson(clientLicense)))
-- 
cgit v1.2.3-1-g7c22