External-Mirrors/keycloak
2
0
Fork 0
mirror of https://github.com/keycloak/keycloak.git synced 2026-01-09 23:12:06 -03:30
Code Issues Packages Projects Releases Wiki Activity

Updating a client with rollback in a test doesn't reset all values (#38244)

Browse Source 
Closes #38243

Signed-off-by: stianst <stianst@gmail.com>
This commit is contained in:
Stian Thorgersen 2025-03-19 13:44:13 +01:00 committed by GitHub
parent be818502ad
commit 3cdb8d12ae
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test-framework/core/src/main/java/org/keycloak/testframework/realm/ManagedClient.java
View File

@ -34,7 +34,11 @@ public class ManagedClient extends ManagedTestResource {
public void updateWithCleanup(ManagedClient.ClientUpdate... updates) {
ClientRepresentation rep = admin().toRepresentation();
cleanup().resetToOriginalRepresentation(rep);
// TODO Admin v2 - Setting a field to `null` is ignored when updating the client (for example `adminUrl`), which
// makes it impossible to reset to the original. For now we are just re-creating the client by marking it as dirty
// cleanup().resetToOriginalRepresentation(rep);
dirty();
ClientConfigBuilder configBuilder = ClientConfigBuilder.update(rep);
for (ManagedClient.ClientUpdate update : updates) {
@ -44,8 +48,10 @@ public class ManagedClient extends ManagedTestResource {
ClientRepresentation updated = configBuilder.build();
admin().update(updated);
ClientRepresentation original = cleanup().getOriginalRepresentation();
updated.getAttributes().keySet().stream().filter(k -> !original.getAttributes().containsKey(k)).forEach(k -> original.getAttributes().put(k, ""));
// TODO It's possible to delete attributes by setting their value to an empty string, but due to the above this
// is not a complete solution to resetting to the original
// ClientRepresentation original = cleanup().getOriginalRepresentation();
// updated.getAttributes().keySet().stream().filter(k -> !original.getAttributes().containsKey(k)).forEach(k -> original.getAttributes().put(k, ""));
}
public ManagedClientCleanup cleanup() {

23
test-framework/examples/tests/src/test/java/org/keycloak/test/examples/ClientRollbackTest.java
View File

@ -11,6 +11,8 @@ import org.keycloak.testframework.realm.ClientConfig;
import org.keycloak.testframework.realm.ClientConfigBuilder;
import org.keycloak.testframework.realm.ManagedClient;
import java.util.List;
@KeycloakIntegrationTest
@TestMethodOrder(MethodOrderer.MethodName.class)
public class ClientRollbackTest {
@ -19,19 +21,22 @@ public class ClientRollbackTest {
ManagedClient client;
@Test
public void testAddAttributeWithRollback() {
public void test1UpdateWithRollback() {
client.updateWithCleanup(u -> u.attribute("one", "two").attribute("two", "two"));
ClientRepresentation rep = client.admin().toRepresentation();
Assertions.assertEquals("two", rep.getAttributes().get("one"));
Assertions.assertTrue(rep.getAttributes().containsKey("two"));
client.updateWithCleanup(u -> u.adminUrl("http://something"));
client.updateWithCleanup(u -> u.redirectUris("http://something"));
client.updateWithCleanup(u -> u.attribute("three", "three"));
}
@Test
public void testAttributeNotSet() {
ClientRepresentation rep = client.admin().toRepresentation();
Assertions.assertEquals("one", rep.getAttributes().get("one"));
Assertions.assertFalse(rep.getAttributes().containsKey("two"));
public void test2CheckRollback() {
ClientRepresentation current = client.admin().toRepresentation();
Assertions.assertEquals("one", current.getAttributes().get("one"));
Assertions.assertFalse(current.getAttributes().containsKey("two"));
Assertions.assertFalse(current.getAttributes().containsKey("three"));
Assertions.assertNull(current.getAdminUrl());
Assertions.assertTrue(current.getRedirectUris().isEmpty());
}
public static class ClientWithSingleAttribute implements ClientConfig {