IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

PLT-6268 Clear blue bar correctly when removing expiring license (#6247)

Browse Source 
* Don't sanitize license for system admin

* Clear blue bar error whe removing expiring license

* Fix unit test
This commit is contained in:
Joram Wilander
2017-04-27 10:57:58 -04:00
committed by Corey Hulen
parent 9a87bb3af6
commit 5a60ea0d75
3 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
api4/system.go
View File

@@ -231,6 +231,14 @@ func getClientLicense(c *Context, w http.ResponseWriter, r *http.Request) {
return
}
var clientLicense map[string]string
if app.SessionHasPermissionTo(c.Session, model.PERMISSION_MANAGE_SYSTEM) {
clientLicense = utils.ClientLicense
} else {
clientLicense = utils.GetSanitizedClientLicense()
}
w.Header().Set(model.HEADER_ETAG_SERVER, etag)
w.Write([]byte(model.MapToJson(utils.GetSanitizedClientLicense())))
w.Write([]byte(model.MapToJson(clientLicense)))
}

7
api4/system_test.go
View File

@@ -180,6 +180,13 @@ func TestGetOldClientLicense(t *testing.T) {
if _, err := Client.DoApiGet("/license/client?format=junk", ""); err == nil || err.StatusCode != http.StatusBadRequest {
t.Fatal("should have errored with 400")
}
license, resp = th.SystemAdminClient.GetOldClientLicense("")
CheckNoError(t, resp)
if len(license["IsLicensed"]) == 0 {
t.Fatal("license not returned correctly")
}
}
func TestGetAudits(t *testing.T) {