fix (keycloak-library): set correct useAuthTrail (#291)

Reviewed-by: Norbert Truchsess <[email protected]>
eclipse-tractusx · Oct 9, 2023 · 502bbae · 502bbae
1 parent f93caaa
commit 502bbae
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 10 deletions.
diff --git 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
@@ -46,14 +46,14 @@ 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))
         {
             throw new ConfigurationException($"undefined keycloak instance '{instance}'");
         }
 
         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
@@ -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<KeycloakClient> 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>(T cloneObject)

diff --git 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
@@ -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<string>._, A<string>._, A<bool>._))
+        A.CallTo(() => keycloakFactory.CreateKeycloakClient("shared", A<string>._, A<string>._))
             .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
@@ -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<string>._, A<string>._, A<bool>._))
+        A.CallTo(() => keycloakFactory.CreateKeycloakClient("shared", A<string>._, A<string>._))
             .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
@@ -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<string>._, A<string>._, A<bool>._))
+        A.CallTo(() => keycloakFactory.CreateKeycloakClient("shared", A<string>._, A<string>._))
             .Returns(new KeycloakClient(SharedUrl, "test", "test", "test", false));
         var settings = new ProvisioningSettings
         {