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

Attribute added to managed test client with rollback is not removed (#38213)

Browse Source 
Closes #38208

Signed-off-by: stianst <stianst@gmail.com>
This commit is contained in:
Stian Thorgersen 2025-03-18 15:43:46 +01:00 committed by GitHub
parent b5d8c46202
commit 588cf0f6c2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 55 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,7 +41,11 @@ public class ManagedClient extends ManagedTestResource {
configBuilder = update.update(configBuilder);
}
admin().update(configBuilder.build());
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, ""));
}
public ManagedClientCleanup cleanup() {

5
test-framework/core/src/main/java/org/keycloak/testframework/realm/ManagedClientCleanup.java
View File

@ -22,6 +22,11 @@ public class ManagedClientCleanup {
}
}
ClientRepresentation getOriginalRepresentation() {
ResetClient clientCleanup = (ResetClient) cleanupTasks.stream().filter(c -> c instanceof ResetClient).findFirst().orElse(null);
return clientCleanup != null ? clientCleanup.rep() : null;
}
void runCleanupTasks(ClientResource client) {
cleanupTasks.forEach(t -> t.cleanup(client));
cleanupTasks.clear();

45
test-framework/examples/tests/src/test/java/org/keycloak/test/examples/ClientRollbackTest.java Normal file
View File

@ -0,0 +1,45 @@
package org.keycloak.test.examples;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
import org.keycloak.representations.idm.ClientRepresentation;
import org.keycloak.testframework.annotations.InjectClient;
import org.keycloak.testframework.annotations.KeycloakIntegrationTest;
import org.keycloak.testframework.realm.ClientConfig;
import org.keycloak.testframework.realm.ClientConfigBuilder;
import org.keycloak.testframework.realm.ManagedClient;
@KeycloakIntegrationTest
@TestMethodOrder(MethodOrderer.MethodName.class)
public class ClientRollbackTest {
@InjectClient(config = ClientWithSingleAttribute.class)
ManagedClient client;
@Test
public void testAddAttributeWithRollback() {
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"));
}
@Test
public void testAttributeNotSet() {
ClientRepresentation rep = client.admin().toRepresentation();
Assertions.assertEquals("one", rep.getAttributes().get("one"));
Assertions.assertFalse(rep.getAttributes().containsKey("two"));
}
public static class ClientWithSingleAttribute implements ClientConfig {
@Override
public ClientConfigBuilder configure(ClientConfigBuilder client) {
return client.attribute("one", "one");
}
}
}