diff --git a/e2e-tests/cypress/tests/integration/channels/enterprise/saml/okta_login_spec.js b/e2e-tests/cypress/tests/integration/channels/enterprise/saml/okta_login_spec.js index 98c1887d53..c37fabb6e7 100644 --- a/e2e-tests/cypress/tests/integration/channels/enterprise/saml/okta_login_spec.js +++ b/e2e-tests/cypress/tests/integration/channels/enterprise/saml/okta_login_spec.js @@ -59,9 +59,6 @@ context('Okta', () => { UsernameAttribute: 'Username', LoginButtonText: loginButtonText, }, - ExperimentalSettings: { - UseNewSAMLLibrary: true, - }, GuestAccountsSettings: { Enable: true, }, diff --git a/e2e-tests/cypress/tests/integration/channels/enterprise/saml/saml_automated_spec.js b/e2e-tests/cypress/tests/integration/channels/enterprise/saml/saml_automated_spec.js index 27924c07a1..70d8950c5e 100644 --- a/e2e-tests/cypress/tests/integration/channels/enterprise/saml/saml_automated_spec.js +++ b/e2e-tests/cypress/tests/integration/channels/enterprise/saml/saml_automated_spec.js @@ -55,9 +55,6 @@ context('LDAP SAML - Automated Tests (SAML TESTS)', () => { UsernameAttribute: 'Username', LoginButtonText: loginButtonText, }, - ExperimentalSettings: { - UseNewSAMLLibrary: false, - }, GuestAccountsSettings: { Enable: true, }, diff --git a/e2e-tests/cypress/tests/support/api/on_prem_default_config.json b/e2e-tests/cypress/tests/support/api/on_prem_default_config.json index 97581d850f..6d38f90781 100644 --- a/e2e-tests/cypress/tests/support/api/on_prem_default_config.json +++ b/e2e-tests/cypress/tests/support/api/on_prem_default_config.json @@ -484,7 +484,6 @@ "ClientSideCertCheck": "secondary", "LinkMetadataTimeoutMilliseconds": 5000, "RestrictSystemAdmin": false, - "UseNewSAMLLibrary": false, "EnableSharedChannels": false, "EnableRemoteClusterService": false, "DisableAppBar": false, diff --git a/e2e-tests/playwright/support/server/default_config.ts b/e2e-tests/playwright/support/server/default_config.ts index 7cb69410af..8bb8b5e759 100644 --- a/e2e-tests/playwright/support/server/default_config.ts +++ b/e2e-tests/playwright/support/server/default_config.ts @@ -573,7 +573,6 @@ const defaultServerConfig: AdminConfig = { ClientSideCertCheck: 'secondary', LinkMetadataTimeoutMilliseconds: 5000, RestrictSystemAdmin: false, - UseNewSAMLLibrary: false, EnableSharedChannels: false, EnableRemoteClusterService: false, DisableAppBar: false, diff --git a/server/channels/app/channels.go b/server/channels/app/channels.go index af2b224e67..9a9e9a5d72 100644 --- a/server/channels/app/channels.go +++ b/server/channels/app/channels.go @@ -110,8 +110,8 @@ func NewChannels(s *Server) (*Channels, error) { if notificationInterface != nil { ch.Notification = notificationInterface(New(ServerConnector(ch))) } - if samlInterfaceNew != nil { - ch.Saml = samlInterfaceNew(New(ServerConnector(ch))) + if samlInterface != nil { + ch.Saml = samlInterface(New(ServerConnector(ch))) if err := ch.Saml.ConfigureSP(request.EmptyContext(s.Log())); err != nil { s.Log().Error("An error occurred while configuring SAML Service Provider", mlog.Err(err)) } diff --git a/server/channels/app/enterprise.go b/server/channels/app/enterprise.go index 08a24438a7..deb4c92613 100644 --- a/server/channels/app/enterprise.go +++ b/server/channels/app/enterprise.go @@ -74,10 +74,10 @@ func RegisterCloudInterface(f func(*Server) einterfaces.CloudInterface) { cloudInterface = f } -var samlInterfaceNew func(*App) einterfaces.SamlInterface +var samlInterface func(*App) einterfaces.SamlInterface -func RegisterNewSamlInterface(f func(*App) einterfaces.SamlInterface) { - samlInterfaceNew = f +func RegisterSamlInterface(f func(*App) einterfaces.SamlInterface) { + samlInterface = f } var notificationInterface func(*App) einterfaces.NotificationInterface diff --git a/server/channels/app/enterprise_test.go b/server/channels/app/enterprise_test.go index 738d0c3e0b..35c508fb05 100644 --- a/server/channels/app/enterprise_test.go +++ b/server/channels/app/enterprise_test.go @@ -18,37 +18,32 @@ import ( func TestSAMLSettings(t *testing.T) { tt := []struct { - name string - setNewInterface bool - useNewSAMLLibrary bool - isNil bool - metadata string + name string + setInterface bool + isNil bool + metadata string }{ { - name: "No SAML Interfaces, default setting", - setNewInterface: false, - useNewSAMLLibrary: false, - isNil: true, + name: "No SAML Interfaces, default setting", + setInterface: false, + isNil: true, }, { - name: "No SAML Interfaces, set config true", - setNewInterface: false, - useNewSAMLLibrary: true, - isNil: true, + name: "No SAML Interfaces, set config true", + setInterface: false, + isNil: true, }, { - name: "Both SAML Interfaces, default setting", - setNewInterface: true, - useNewSAMLLibrary: false, - isNil: false, - metadata: "samlTwo", + name: "Both SAML Interfaces, default setting", + setInterface: true, + isNil: false, + metadata: "samlTwo", }, { - name: "Both SAML Interfaces, config true", - setNewInterface: true, - useNewSAMLLibrary: true, - isNil: false, - metadata: "samlTwo", + name: "Both SAML Interfaces, config true", + setInterface: true, + isNil: false, + metadata: "samlTwo", }, } @@ -57,12 +52,12 @@ func TestSAMLSettings(t *testing.T) { saml2 := &mocks.SamlInterface{} saml2.Mock.On("ConfigureSP", mock.AnythingOfType("*request.Context")).Return(nil) saml2.Mock.On("GetMetadata", mock.AnythingOfType("*request.Context")).Return("samlTwo", nil) - if tc.setNewInterface { - RegisterNewSamlInterface(func(_ *App) einterfaces.SamlInterface { + if tc.setInterface { + RegisterSamlInterface(func(_ *App) einterfaces.SamlInterface { return saml2 }) } else { - RegisterNewSamlInterface(nil) + RegisterSamlInterface(nil) } th := SetupEnterpriseWithStoreMock(t) @@ -84,12 +79,6 @@ func TestSAMLSettings(t *testing.T) { mockStore.On("Post").Return(&mockPostStore) mockStore.On("System").Return(&mockSystemStore) - if tc.useNewSAMLLibrary { - th.App.UpdateConfig(func(cfg *model.Config) { - *cfg.ExperimentalSettings.UseNewSAMLLibrary = tc.useNewSAMLLibrary - }) - } - if tc.isNil { assert.Nil(t, th.App.Channels().Saml) } else { diff --git a/server/platform/services/telemetry/telemetry.go b/server/platform/services/telemetry/telemetry.go index 7a8b7499a9..e6c44dc821 100644 --- a/server/platform/services/telemetry/telemetry.go +++ b/server/platform/services/telemetry/telemetry.go @@ -775,7 +775,6 @@ func (ts *TelemetryService) trackConfig() { "isdefault_client_side_cert_check": isDefault(*cfg.ExperimentalSettings.ClientSideCertCheck, model.ClientSideCertCheckPrimaryAuth), "link_metadata_timeout_milliseconds": *cfg.ExperimentalSettings.LinkMetadataTimeoutMilliseconds, "restrict_system_admin": *cfg.ExperimentalSettings.RestrictSystemAdmin, - "use_new_saml_library": *cfg.ExperimentalSettings.UseNewSAMLLibrary, "enable_shared_channels": *cfg.ExperimentalSettings.EnableSharedChannels, "enable_remote_cluster_service": *cfg.ExperimentalSettings.EnableRemoteClusterService && cfg.FeatureFlags.EnableRemoteClusterService, "enable_app_bar": !*cfg.ExperimentalSettings.DisableAppBar, diff --git a/server/public/model/config.go b/server/public/model/config.go index 01b59eebb6..9416de2576 100644 --- a/server/public/model/config.go +++ b/server/public/model/config.go @@ -1009,7 +1009,6 @@ type ExperimentalSettings struct { ClientSideCertCheck *string `access:"experimental_features,cloud_restrictable"` LinkMetadataTimeoutMilliseconds *int64 `access:"experimental_features,write_restrictable,cloud_restrictable"` RestrictSystemAdmin *bool `access:"experimental_features,write_restrictable"` - UseNewSAMLLibrary *bool `access:"experimental_features,cloud_restrictable"` EnableSharedChannels *bool `access:"experimental_features"` EnableRemoteClusterService *bool `access:"experimental_features"` DisableAppBar *bool `access:"experimental_features"` @@ -1034,10 +1033,6 @@ func (s *ExperimentalSettings) SetDefaults() { s.RestrictSystemAdmin = NewBool(false) } - if s.UseNewSAMLLibrary == nil { - s.UseNewSAMLLibrary = NewBool(false) - } - if s.EnableSharedChannels == nil { s.EnableSharedChannels = NewBool(false) } diff --git a/webapp/platform/types/src/config.ts b/webapp/platform/types/src/config.ts index 412aa631d2..3a1d446cd9 100644 --- a/webapp/platform/types/src/config.ts +++ b/webapp/platform/types/src/config.ts @@ -776,7 +776,6 @@ export type ExperimentalSettings = { ClientSideCertCheck: string; LinkMetadataTimeoutMilliseconds: number; RestrictSystemAdmin: boolean; - UseNewSAMLLibrary: boolean; EnableSharedChannels: boolean; EnableRemoteClusterService: boolean; DisableAppBar: boolean;