From 5fe7c364579f86156b62ac014a27767340861bea Mon Sep 17 00:00:00 2001 From: Scott Bishel Date: Sat, 8 Mar 2025 09:13:19 -0600 Subject: [PATCH] make sure RestrictSystemAdmin returns for all users access system console (#30384) Co-authored-by: Mattermost Build --- server/channels/api4/config_test.go | 1 + server/public/model/config.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/server/channels/api4/config_test.go b/server/channels/api4/config_test.go index 7be9eef6a5..55e482d2c4 100644 --- a/server/channels/api4/config_test.go +++ b/server/channels/api4/config_test.go @@ -122,6 +122,7 @@ func TestGetConfigAnyFlagsAccess(t *testing.T) { require.NoError(t, err) t.Run("Can read value with permission", func(t *testing.T) { assert.NotNil(t, cfg.FeatureFlags) + assert.NotNil(t, cfg.ExperimentalSettings.RestrictSystemAdmin) }) } diff --git a/server/public/model/config.go b/server/public/model/config.go index 05ddb3114d..2de87a3a56 100644 --- a/server/public/model/config.go +++ b/server/public/model/config.go @@ -1137,7 +1137,7 @@ type ExperimentalSettings struct { ClientSideCertEnable *bool `access:"experimental_features,cloud_restrictable"` ClientSideCertCheck *string `access:"experimental_features,cloud_restrictable"` LinkMetadataTimeoutMilliseconds *int64 `access:"experimental_features,write_restrictable,cloud_restrictable"` - RestrictSystemAdmin *bool `access:"experimental_features,write_restrictable"` + RestrictSystemAdmin *bool `access:"*_read,write_restrictable"` EnableSharedChannels *bool `access:"experimental_features"` // Deprecated: use `ConnectedWorkspacesSettings.EnableSharedChannels` EnableRemoteClusterService *bool `access:"experimental_features"` // Deprecated: use `ConnectedWorkspacesSettings.EnableRemoteClusterService` DisableAppBar *bool `access:"experimental_features"`