opensource/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-09-19 02:06:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

MM-21254: Removing unnused/unnecesary getClientLicense etag (#13436)

Browse Source
This commit is contained in:
Mattermost Build
2019-12-19 17:40:47 +01:00
committed by Jesús Espino
parent a271139a2c
commit e542798b11
3 changed files with 0 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api4/license.go
-6
View File
@@ -30,11 +30,6 @@ func getClientLicense(c *Context, w http.ResponseWriter, r *http.Request) {
return
}
etag := c.App.GetClientLicenseEtag(true)
if c.HandleEtag(etag, "Get Client License", w, r) {
return
}
var clientLicense map[string]string
if c.App.SessionHasPermissionTo(c.App.Session, model.PERMISSION_MANAGE_SYSTEM) {
@@ -43,7 +38,6 @@ func getClientLicense(c *Context, w http.ResponseWriter, r *http.Request) {
clientLicense = c.App.GetSanitizedClientLicense()
}
w.Header().Set(model.HEADER_ETAG_SERVER, etag)
w.Write([]byte(model.MapToJson(clientLicense)))
}
app/license.go
-18
View File
@@ -4,8 +4,6 @@
package app
import (
"crypto/md5"
"fmt"
"net/http"
"strings"
@@ -191,22 +189,6 @@ func (a *App) RemoveLicenseListener(id string) {
delete(a.Srv.licenseListeners, id)
}
func (a *App) GetClientLicenseEtag(useSanitized bool) string {
value := ""
lic := a.ClientLicense()
if useSanitized {
lic = a.GetSanitizedClientLicense()
}
for k, v := range lic {
value += fmt.Sprintf("%s:%s;", k, v)
}
return model.Etag(fmt.Sprintf("%x", md5.Sum([]byte(value))))
}
func (a *App) GetSanitizedClientLicense() map[string]string {
sanitizedLicense := make(map[string]string)
app/license_test.go
-17
View File
@@ -58,23 +58,6 @@ func TestSetLicense(t *testing.T) {
require.True(t, ok, "license should have passed")
}
func TestClientLicenseEtag(t *testing.T) {
th := Setup(t)
defer th.TearDown()
etag1 := th.App.GetClientLicenseEtag(false)
th.App.SetClientLicense(map[string]string{"SomeFeature": "true", "IsLicensed": "true"})
etag2 := th.App.GetClientLicenseEtag(false)
require.NotEqual(t, etag1, etag2, "etags should not match")
th.App.SetClientLicense(map[string]string{"SomeFeature": "true", "IsLicensed": "false"})
etag3 := th.App.GetClientLicenseEtag(false)
require.NotEqual(t, etag2, etag3, "etags should not match")
}
func TestGetSanitizedClientLicense(t *testing.T) {
th := Setup(t)
defer th.TearDown()