From 159c2a44dced5d6331f5fc5e7220e561e6468ad1 Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Wed, 24 Oct 2018 06:52:53 -0400 Subject: MM-10987 Turn on ExperimentalLimitClientConfig by default and remove setting (#9696) --- api4/system.go | 2 +- api4/system_test.go | 46 ++-------------------------------------------- 2 files changed, 3 insertions(+), 45 deletions(-) (limited to 'api4') diff --git a/api4/system.go b/api4/system.go index ddeac4df4..870e0058c 100644 --- a/api4/system.go +++ b/api4/system.go @@ -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() diff --git a/api4/system_test.go b/api4/system_test.go index 32fadd380..fe56794aa 100644 --- a/api4/system_test.go +++ b/api4/system_test.go @@ -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() -- cgit v1.2.3-1-g7c22