From 93254308599357fac665fce604f3506ee8a845fa Mon Sep 17 00:00:00 2001 From: Martin Kraft Date: Mon, 12 Feb 2018 12:49:29 -0500 Subject: [PATCH] XYZ-73: Removes EnableOnlyAdminIntegrations uses. (#8245) --- api/command_test.go | 3 --- api4/post_test.go | 3 --- 2 files changed, 6 deletions(-) diff --git a/api/command_test.go b/api/command_test.go index 7eadca1240..7f9c6dcff3 100644 --- a/api/command_test.go +++ b/api/command_test.go @@ -202,13 +202,10 @@ func TestDeleteCommand(t *testing.T) { Client := th.SystemAdminClient enableCommands := *th.App.Config().ServiceSettings.EnableCommands - onlyAdminIntegration := *th.App.Config().ServiceSettings.EnableOnlyAdminIntegrations defer func() { th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableCommands = enableCommands }) - th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableOnlyAdminIntegrations = onlyAdminIntegration }) }() th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableCommands = true }) - th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableOnlyAdminIntegrations = false }) cmd := &model.Command{URL: "http://nowhere.com", Method: model.COMMAND_METHOD_POST, Trigger: "trigger"} cmd = Client.Must(Client.CreateCommand(cmd)).Data.(*model.Command) diff --git a/api4/post_test.go b/api4/post_test.go index 52326c4b0c..dba3a1c2dc 100644 --- a/api4/post_test.go +++ b/api4/post_test.go @@ -131,17 +131,14 @@ func testCreatePostWithOutgoingHook( channel := th.BasicChannel enableOutgoingHooks := th.App.Config().ServiceSettings.EnableOutgoingWebhooks - enableAdminOnlyHooks := th.App.Config().ServiceSettings.EnableOnlyAdminIntegrations allowedInternalConnections := *th.App.Config().ServiceSettings.AllowedUntrustedInternalConnections defer func() { th.App.UpdateConfig(func(cfg *model.Config) { cfg.ServiceSettings.EnableOutgoingWebhooks = enableOutgoingHooks }) - th.App.UpdateConfig(func(cfg *model.Config) { cfg.ServiceSettings.EnableOnlyAdminIntegrations = enableAdminOnlyHooks }) th.App.UpdateConfig(func(cfg *model.Config) { cfg.ServiceSettings.AllowedUntrustedInternalConnections = &allowedInternalConnections }) }() th.App.UpdateConfig(func(cfg *model.Config) { cfg.ServiceSettings.EnableOutgoingWebhooks = true }) - th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableOnlyAdminIntegrations = true }) th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.AllowedUntrustedInternalConnections = "localhost 127.0.0.1" })