From 502bbaeeff9c2ad79edff95097c59c9e2292f850 Mon Sep 17 00:00:00 2001 From: Phil Schneider Date: Mon, 9 Oct 2023 12:11:10 +0200 Subject: [PATCH] fix (keycloak-library): set correct useAuthTrail (#291) Reviewed-by: Norbert Truchsess --- src/keycloak/Keycloak.Factory/IKeycloakFactory.cs | 2 +- src/keycloak/Keycloak.Factory/KeycloakFactory.cs | 4 ++-- src/provisioning/Provisioning.Library/ProvisioningManager.cs | 4 ++-- src/provisioning/Provisioning.Library/ProvisioningSettings.cs | 2 -- .../Extensions/ClientManagerTests.cs | 2 +- .../Provisioning.Library.Tests/ProvisioningManagerTests.cs | 2 +- .../Provisioning.Library.Tests/UserManagerTests.cs | 2 +- 7 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/keycloak/Keycloak.Factory/IKeycloakFactory.cs b/src/keycloak/Keycloak.Factory/IKeycloakFactory.cs index 30a9df8e9f..8dab46a100 100644 --- a/src/keycloak/Keycloak.Factory/IKeycloakFactory.cs +++ b/src/keycloak/Keycloak.Factory/IKeycloakFactory.cs @@ -26,5 +26,5 @@ public interface IKeycloakFactory { KeycloakClient CreateKeycloakClient(string instance); - KeycloakClient CreateKeycloakClient(string instance, string clientId, string secret, bool useAuthTrail); + KeycloakClient CreateKeycloakClient(string instance, string clientId, string secret); } diff --git a/src/keycloak/Keycloak.Factory/KeycloakFactory.cs b/src/keycloak/Keycloak.Factory/KeycloakFactory.cs index 3b35a33bff..71a2b98062 100644 --- a/src/keycloak/Keycloak.Factory/KeycloakFactory.cs +++ b/src/keycloak/Keycloak.Factory/KeycloakFactory.cs @@ -46,7 +46,7 @@ public KeycloakClient CreateKeycloakClient(string instance) : KeycloakClient.CreateWithClientId(settings.ConnectionString, settings.ClientId, settings.ClientSecret, settings.UseAuthTrail, settings.AuthRealm); } - public KeycloakClient CreateKeycloakClient(string instance, string clientId, string secret, bool useAuthTrail) + public KeycloakClient CreateKeycloakClient(string instance, string clientId, string secret) { if (!_settings.Keys.Contains(instance, StringComparer.InvariantCultureIgnoreCase)) { @@ -54,6 +54,6 @@ public KeycloakClient CreateKeycloakClient(string instance, string clientId, str } var settings = _settings.Single(x => x.Key.Equals(instance, StringComparison.InvariantCultureIgnoreCase)).Value; - return KeycloakClient.CreateWithClientId(settings.ConnectionString, clientId, secret, useAuthTrail, settings.AuthRealm); + return KeycloakClient.CreateWithClientId(settings.ConnectionString, clientId, secret, settings.UseAuthTrail, settings.AuthRealm); } } diff --git a/src/provisioning/Provisioning.Library/ProvisioningManager.cs b/src/provisioning/Provisioning.Library/ProvisioningManager.cs index de9212fe4f..7731efc384 100644 --- a/src/provisioning/Provisioning.Library/ProvisioningManager.cs +++ b/src/provisioning/Provisioning.Library/ProvisioningManager.cs @@ -54,7 +54,7 @@ public async Task SetupSharedIdpAsync(string idpName, string organisationName, s await CreateCentralIdentityProviderAsync(idpName, organisationName, _Settings.CentralIdentityProvider).ConfigureAwait(false); var (clientId, secret) = await CreateSharedIdpServiceAccountAsync(idpName).ConfigureAwait(false); - var sharedKeycloak = _Factory.CreateKeycloakClient("shared", clientId, secret, _Settings.UseAuthTrail); + var sharedKeycloak = _Factory.CreateKeycloakClient("shared", clientId, secret); await CreateSharedRealmAsync(sharedKeycloak, idpName, organisationName, loginTheme).ConfigureAwait(false); @@ -285,7 +285,7 @@ public async ValueTask UpdateCentralIdentityProviderDataSAMLAsync(IdentityProvid private async Task GetSharedKeycloakClient(string realm) { var (clientId, secret) = await GetSharedIdpServiceAccountSecretAsync(realm).ConfigureAwait(false); - return _Factory.CreateKeycloakClient("shared", clientId, secret, _Settings.UseAuthTrail); + return _Factory.CreateKeycloakClient("shared", clientId, secret); } private static T Clone(T cloneObject) diff --git a/src/provisioning/Provisioning.Library/ProvisioningSettings.cs b/src/provisioning/Provisioning.Library/ProvisioningSettings.cs index 94c1dd0b43..48cb445269 100644 --- a/src/provisioning/Provisioning.Library/ProvisioningSettings.cs +++ b/src/provisioning/Provisioning.Library/ProvisioningSettings.cs @@ -33,8 +33,6 @@ public partial class ProvisioningSettings public string MappedBpnAttribute { get; set; } public string UserNameMapperTemplate { get; set; } - - public bool UseAuthTrail { get; set; } } public static class ProvisioningSettingsExtension diff --git a/tests/provisioning/Provisioning.Library.Tests/Extensions/ClientManagerTests.cs b/tests/provisioning/Provisioning.Library.Tests/Extensions/ClientManagerTests.cs index dd75189ef7..2bd033d0e7 100644 --- a/tests/provisioning/Provisioning.Library.Tests/Extensions/ClientManagerTests.cs +++ b/tests/provisioning/Provisioning.Library.Tests/Extensions/ClientManagerTests.cs @@ -54,7 +54,7 @@ public ClientManagerTests() .Returns(new KeycloakClient(CentralUrl, "test", "test", "test", false)); A.CallTo(() => keycloakFactory.CreateKeycloakClient("shared")) .Returns(new KeycloakClient(SharedUrl, "test", "test", "test", false)); - A.CallTo(() => keycloakFactory.CreateKeycloakClient("shared", A._, A._, A._)) + A.CallTo(() => keycloakFactory.CreateKeycloakClient("shared", A._, A._)) .Returns(new KeycloakClient(SharedUrl, "test", "test", "test", false)); var settings = new ProvisioningSettings { diff --git a/tests/provisioning/Provisioning.Library.Tests/ProvisioningManagerTests.cs b/tests/provisioning/Provisioning.Library.Tests/ProvisioningManagerTests.cs index 709da2d292..161757eb78 100644 --- a/tests/provisioning/Provisioning.Library.Tests/ProvisioningManagerTests.cs +++ b/tests/provisioning/Provisioning.Library.Tests/ProvisioningManagerTests.cs @@ -59,7 +59,7 @@ public ProvisioningManagerTests() .Returns(new KeycloakClient(CentralUrl, "test", "test", "test", false)); A.CallTo(() => keycloakFactory.CreateKeycloakClient("shared")) .Returns(new KeycloakClient(SharedUrl, "test", "test", "test", false)); - A.CallTo(() => keycloakFactory.CreateKeycloakClient("shared", A._, A._, A._)) + A.CallTo(() => keycloakFactory.CreateKeycloakClient("shared", A._, A._)) .Returns(new KeycloakClient(SharedUrl, "test", "test", "test", false)); var settings = new ProvisioningSettings { diff --git a/tests/provisioning/Provisioning.Library.Tests/UserManagerTests.cs b/tests/provisioning/Provisioning.Library.Tests/UserManagerTests.cs index ec1cadf73b..22112280ac 100644 --- a/tests/provisioning/Provisioning.Library.Tests/UserManagerTests.cs +++ b/tests/provisioning/Provisioning.Library.Tests/UserManagerTests.cs @@ -58,7 +58,7 @@ public UserManagerTests() .Returns(new KeycloakClient(CentralUrl, "test", "test", "test", false)); A.CallTo(() => keycloakFactory.CreateKeycloakClient("shared")) .Returns(new KeycloakClient(SharedUrl, "test", "test", "test", false)); - A.CallTo(() => keycloakFactory.CreateKeycloakClient("shared", A._, A._, A._)) + A.CallTo(() => keycloakFactory.CreateKeycloakClient("shared", A._, A._)) .Returns(new KeycloakClient(SharedUrl, "test", "test", "test", false)); var settings = new ProvisioningSettings {