MM-10987 Turn on ExperimentalLimitClientConfig by default and remove setting (#9696)
Этот коммит содержится в:
коммит произвёл
George Goldberg
родитель
7393d23261
Коммит
159c2a44dc
@@ -253,7 +253,7 @@ func getClientConfig(c *Context, w http.ResponseWriter, r *http.Request) {
|
||||
}
|
||||
|
||||
var config map[string]string
|
||||
if *c.App.Config().ServiceSettings.ExperimentalLimitClientConfig && len(c.Session.UserId) == 0 {
|
||||
if len(c.Session.UserId) == 0 {
|
||||
config = c.App.LimitedClientConfigWithComputed()
|
||||
} else {
|
||||
config = c.App.ClientConfigWithComputed()
|
||||
|
||||
@@ -218,10 +218,9 @@ func TestGetOldClientConfig(t *testing.T) {
|
||||
testKey := "supersecretkey"
|
||||
th.App.UpdateConfig(func(cfg *model.Config) { cfg.ServiceSettings.GoogleDeveloperKey = testKey })
|
||||
|
||||
t.Run("with session, without limited config", func(t *testing.T) {
|
||||
t.Run("with session", func(t *testing.T) {
|
||||
th.App.UpdateConfig(func(cfg *model.Config) {
|
||||
cfg.ServiceSettings.GoogleDeveloperKey = testKey
|
||||
*cfg.ServiceSettings.ExperimentalLimitClientConfig = false
|
||||
})
|
||||
|
||||
Client := th.Client
|
||||
@@ -238,50 +237,9 @@ func TestGetOldClientConfig(t *testing.T) {
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("without session, without limited config", func(t *testing.T) {
|
||||
t.Run("without session", func(t *testing.T) {
|
||||
th.App.UpdateConfig(func(cfg *model.Config) {
|
||||
cfg.ServiceSettings.GoogleDeveloperKey = testKey
|
||||
*cfg.ServiceSettings.ExperimentalLimitClientConfig = false
|
||||
})
|
||||
|
||||
Client := th.CreateClient()
|
||||
|
||||
config, resp := Client.GetOldClientConfig("")
|
||||
CheckNoError(t, resp)
|
||||
|
||||
if len(config["Version"]) == 0 {
|
||||
t.Fatal("config not returned correctly")
|
||||
}
|
||||
|
||||
if config["GoogleDeveloperKey"] != testKey {
|
||||
t.Fatal("config missing developer key")
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("with session, with limited config", func(t *testing.T) {
|
||||
th.App.UpdateConfig(func(cfg *model.Config) {
|
||||
cfg.ServiceSettings.GoogleDeveloperKey = testKey
|
||||
*cfg.ServiceSettings.ExperimentalLimitClientConfig = true
|
||||
})
|
||||
|
||||
Client := th.Client
|
||||
|
||||
config, resp := Client.GetOldClientConfig("")
|
||||
CheckNoError(t, resp)
|
||||
|
||||
if len(config["Version"]) == 0 {
|
||||
t.Fatal("config not returned correctly")
|
||||
}
|
||||
|
||||
if config["GoogleDeveloperKey"] != testKey {
|
||||
t.Fatal("config missing developer key")
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("without session, without limited config", func(t *testing.T) {
|
||||
th.App.UpdateConfig(func(cfg *model.Config) {
|
||||
cfg.ServiceSettings.GoogleDeveloperKey = testKey
|
||||
*cfg.ServiceSettings.ExperimentalLimitClientConfig = true
|
||||
})
|
||||
|
||||
Client := th.CreateClient()
|
||||
|
||||
Ссылка в новой задаче
Block a user