MM-21254: Removing unnused/unnecesary getClientLicense etag (#13416)
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
3bccc03df3
Коммит
fc9d49b2d2
@@ -30,11 +30,6 @@ func getClientLicense(c *Context, w http.ResponseWriter, r *http.Request) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
etag := c.App.GetClientLicenseEtag(true)
|
|
||||||
if c.HandleEtag(etag, "Get Client License", w, r) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
var clientLicense map[string]string
|
var clientLicense map[string]string
|
||||||
|
|
||||||
if c.App.SessionHasPermissionTo(c.App.Session, model.PERMISSION_MANAGE_SYSTEM) {
|
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()
|
clientLicense = c.App.GetSanitizedClientLicense()
|
||||||
}
|
}
|
||||||
|
|
||||||
w.Header().Set(model.HEADER_ETAG_SERVER, etag)
|
|
||||||
w.Write([]byte(model.MapToJson(clientLicense)))
|
w.Write([]byte(model.MapToJson(clientLicense)))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -4,8 +4,6 @@
|
|||||||
package app
|
package app
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"crypto/md5"
|
|
||||||
"fmt"
|
|
||||||
"net/http"
|
"net/http"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
@@ -191,22 +189,6 @@ func (a *App) RemoveLicenseListener(id string) {
|
|||||||
delete(a.Srv.licenseListeners, id)
|
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 {
|
func (a *App) GetSanitizedClientLicense() map[string]string {
|
||||||
sanitizedLicense := make(map[string]string)
|
sanitizedLicense := make(map[string]string)
|
||||||
|
|
||||||
|
|||||||
@@ -58,23 +58,6 @@ func TestSetLicense(t *testing.T) {
|
|||||||
require.True(t, ok, "license should have passed")
|
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) {
|
func TestGetSanitizedClientLicense(t *testing.T) {
|
||||||
th := Setup(t)
|
th := Setup(t)
|
||||||
defer th.TearDown()
|
defer th.TearDown()
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user