diff options
author | Joram Wilander <jwawilander@gmail.com> | 2017-04-27 10:57:58 -0400 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2017-04-27 07:57:58 -0700 |
commit | 5a60ea0d756531fef4e6e94be1377c10a7022260 (patch) | |
tree | 894421b688ec276dbae0f0e530eca100d4da4541 /api4 | |
parent | 9a87bb3af68216b53ee8f89d6604c715c7b85b2d (diff) | |
download | chat-5a60ea0d756531fef4e6e94be1377c10a7022260.tar.gz chat-5a60ea0d756531fef4e6e94be1377c10a7022260.tar.bz2 chat-5a60ea0d756531fef4e6e94be1377c10a7022260.zip |
PLT-6268 Clear blue bar correctly when removing expiring license (#6247)
* Don't sanitize license for system admin
* Clear blue bar error whe removing expiring license
* Fix unit test
Diffstat (limited to 'api4')
-rw-r--r-- | api4/system.go | 10 | ||||
-rw-r--r-- | api4/system_test.go | 7 |
2 files changed, 16 insertions, 1 deletions
diff --git a/api4/system.go b/api4/system.go index 7e860ba76..1f4589bf5 100644 --- a/api4/system.go +++ b/api4/system.go @@ -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))) } diff --git a/api4/system_test.go b/api4/system_test.go index ba30dd1eb..850705040 100644 --- a/api4/system_test.go +++ b/api4/system_test.go @@ -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) { |