From c284f9ae66830df5ff869dd6f48453a992c7f340 Mon Sep 17 00:00:00 2001 From: Stian Thorgersen Date: Mon, 17 Nov 2025 07:52:04 +0100 Subject: [PATCH] Rename ApiUtil to AdminApiUtil (#44224) Closes #44196 Signed-off-by: stianst --- .../testframework/realm/ClientSupplier.java | 2 +- .../testframework/realm/UserSupplier.java | 2 +- .../keycloak/testframework/util/ApiUtil.java | 18 +++--------- .../test/examples/AdminEventsTest.java | 4 +-- .../oauth/OAuthClientSupplier.java | 2 +- tests/MANUAL_MIGRATION.md | 14 ++++----- .../tests/admin/AbstractPermissionsTest.java | 2 +- .../admin/AdminEndpointAccessibilityTest.java | 2 +- .../org/keycloak/tests/admin/ClientTest.java | 29 ++++++++++--------- .../keycloak/tests/admin/ComponentsTest.java | 2 +- .../keycloak/tests/admin/ConsentsTest.java | 2 +- .../admin/CrossRealmPermissionsTest.java | 2 +- .../tests/admin/DeclarativeUserTest.java | 2 +- .../tests/admin/ImpersonationTest.java | 21 +++++++------- .../admin/ManagementPermissionsTest.java | 2 +- .../keycloak/tests/admin/PermissionsTest.java | 2 +- .../tests/admin/PermissionsTestV1.java | 2 +- .../AbstractAuthenticationTest.java | 2 +- .../admin/authentication/ExecutionTest.java | 2 +- .../tests/admin/authentication/FlowTest.java | 2 +- .../fgap/GroupResourceTypeEvaluationTest.java | 14 ++++----- .../fgap/GroupResourceTypePermissionTest.java | 4 +-- .../fgap/RoleResourceTypeEvaluationTest.java | 2 +- .../fgap/UserResourceTypeEvaluationTest.java | 6 ++-- .../fgap/UserResourceTypeFilteringTest.java | 4 +-- .../admin/client/AbstractClientScopeTest.java | 2 +- .../tests/admin/client/ClientRolesTest.java | 2 +- .../admin/client/ClientScopeEvaluateTest.java | 6 ++-- .../client/ClientScopeProtocolMapperTest.java | 5 ++-- .../tests/admin/client/ClientScopeTest.java | 2 +- .../tests/admin/client/InstallationTest.java | 2 +- .../client/ServiceAccountClientTest.java | 4 +-- .../tests/admin/client/SessionTest.java | 8 ++--- .../admin/concurrency/ConcurrencyTest.java | 2 +- .../concurrency/ConcurrentLoginTest.java | 7 +++-- .../event/AdminEventAuthDetailsTest.java | 4 +-- .../tests/admin/event/AdminEventTest.java | 2 +- .../FineGrainedAdminRestTest.java | 5 ++-- .../tests/admin/group/AbstractGroupTest.java | 2 +- .../admin/group/GroupAttributeSearchTest.java | 2 +- .../tests/admin/group/GroupMappersTest.java | 11 +++---- .../tests/admin/group/GroupSearchTest.java | 2 +- .../keycloak/tests/admin/group/GroupTest.java | 2 +- .../AbstractIdentityProviderTest.java | 2 +- .../IdentityProviderMapperTest.java | 2 +- .../model/workflow/AdhocWorkflowTest.java | 2 +- .../workflow/DeleteUserWorkflowStepTest.java | 2 +- .../tests/admin/realm/RealmCacheTest.java | 2 +- .../admin/realm/RealmOAuthActionsTest.java | 13 +++++---- .../tests/admin/user/AbstractUserTest.java | 2 +- .../tests/admin/user/UserCreateTest.java | 2 +- .../tests/admin/user/UserCredentialTest.java | 4 +-- .../tests/admin/user/UserDeleteTest.java | 2 +- .../tests/admin/user/UserEmailTest.java | 2 +- .../tests/admin/user/UserFedarationTest.java | 5 ++-- .../tests/admin/user/UserGroupTest.java | 2 +- .../tests/admin/user/UserRoleTest.java | 2 +- .../tests/admin/user/UserSearchTest.java | 2 +- .../tests/admin/user/UserUpdateTest.java | 2 +- .../AbstractUserStorageRestTest.java | 2 +- tests/utils/pom.xml | 5 ++++ .../org/keycloak/tests/utils/KeyUtils.java | 2 +- .../admin/{ApiUtil.java => AdminApiUtil.java} | 16 +++------- 63 files changed, 142 insertions(+), 147 deletions(-) rename tests/utils/src/main/java/org/keycloak/tests/utils/admin/{ApiUtil.java => AdminApiUtil.java} (96%) diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/realm/ClientSupplier.java b/test-framework/core/src/main/java/org/keycloak/testframework/realm/ClientSupplier.java index 4bc5c450b58..511f6c97428 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/realm/ClientSupplier.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/realm/ClientSupplier.java @@ -38,7 +38,7 @@ public class ClientSupplier implements Supplier { if (Status.CONFLICT.equals(Status.fromStatusCode(response.getStatus()))) { throw new IllegalStateException("Client already exist with client id: " + clientRepresentation.getClientId()); } - clientRepresentation.setId(ApiUtil.handleCreatedResponse(response)); + clientRepresentation.setId(ApiUtil.getCreatedId(response)); } else { List clients = realm.admin().clients().findByClientId(attachTo); if (clients.isEmpty()) { diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/realm/UserSupplier.java b/test-framework/core/src/main/java/org/keycloak/testframework/realm/UserSupplier.java index c3c002dfeb6..f72fd04b4b0 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/realm/UserSupplier.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/realm/UserSupplier.java @@ -33,7 +33,7 @@ public class UserSupplier implements Supplier { if (Status.CONFLICT.equals(Status.fromStatusCode(response.getStatus()))) { throw new IllegalStateException("User already exist with username: " + userRepresentation.getUsername()); } - String uuid = ApiUtil.handleCreatedResponse(response); + String uuid = ApiUtil.getCreatedId(response); instanceContext.addNote(USER_UUID_KEY, uuid); diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/util/ApiUtil.java b/test-framework/core/src/main/java/org/keycloak/testframework/util/ApiUtil.java index 7e65d2ca9aa..2d9f26a7e7e 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/util/ApiUtil.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/util/ApiUtil.java @@ -6,22 +6,12 @@ import org.junit.jupiter.api.Assertions; public class ApiUtil { - public static String handleCreatedResponse(Response response) { + public static String getCreatedId(Response response) { try (response) { - if (response.getStatus() != Response.Status.CONFLICT.getStatusCode()) { - String uuid = getCreatedId(response); - response.close(); - return uuid; - } else { - return null; - } + Assertions.assertEquals(201, response.getStatus()); + String path = response.getLocation().getPath(); + return path.substring(path.lastIndexOf('/') + 1); } } - public static String getCreatedId(Response response) { - Assertions.assertEquals(201, response.getStatus()); - String path = response.getLocation().getPath(); - return path.substring(path.lastIndexOf('/') + 1); - } - } diff --git a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/AdminEventsTest.java b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/AdminEventsTest.java index a2a464a414c..8e8504e3582 100644 --- a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/AdminEventsTest.java +++ b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/AdminEventsTest.java @@ -47,7 +47,7 @@ public class AdminEventsTest { userRep.setUsername(userName); userRep.setEnabled(true); - String userId = ApiUtil.handleCreatedResponse(adminClient.realm(realm.getName()).users().create(userRep)); + String userId = ApiUtil.getCreatedId(adminClient.realm(realm.getName()).users().create(userRep)); AdminEventAssertion.assertSuccess(adminEvents.poll()) .operationType(OperationType.CREATE) @@ -115,7 +115,7 @@ public class AdminEventsTest { private List createUsers(String prefix, int n) { List userIds = new LinkedList<>(); for (int i = 0; i < n; i++) { - String userId = ApiUtil.handleCreatedResponse(realm.admin().users().create(UserConfigBuilder.create().username(prefix + i).build())); + String userId = ApiUtil.getCreatedId(realm.admin().users().create(UserConfigBuilder.create().username(prefix + i).build())); userIds.add(userId); } return userIds; diff --git a/test-framework/oauth/src/main/java/org/keycloak/testframework/oauth/OAuthClientSupplier.java b/test-framework/oauth/src/main/java/org/keycloak/testframework/oauth/OAuthClientSupplier.java index afc04e09c60..d3e7069a54f 100644 --- a/test-framework/oauth/src/main/java/org/keycloak/testframework/oauth/OAuthClientSupplier.java +++ b/test-framework/oauth/src/main/java/org/keycloak/testframework/oauth/OAuthClientSupplier.java @@ -43,7 +43,7 @@ public class OAuthClientSupplier implements Supplier r.clients().get(id).remove()); - ClientRepresentation found = ApiUtil.findClientByClientId(managedRealm.admin(), "my-app").toRepresentation(); + ClientRepresentation found = AdminApiUtil.findClientByClientId(managedRealm.admin(), "my-app").toRepresentation(); assertEquals("my-app", found.getClientId()); AdminEventAssertion.assertEvent(adminEvents.poll(), OperationType.CREATE, AdminEventPaths.clientResourcePath(id), rep, ResourceType.CLIENT); @@ -171,7 +172,7 @@ public class ClientTest { Response response = managedRealm.admin().clients().create(rep); String id = ApiUtil.getCreatedId(response); managedRealm.cleanup().add(r -> r.clients().get(id).remove()); - ClientRepresentation found = ApiUtil.findClientByClientId(managedRealm.admin(), "my-app").toRepresentation(); + ClientRepresentation found = AdminApiUtil.findClientByClientId(managedRealm.admin(), "my-app").toRepresentation(); assertEquals("my-app", found.getClientId()); AdminEventAssertion.assertEvent(adminEvents.poll(), OperationType.CREATE, AdminEventPaths.clientResourcePath(id), rep, ResourceType.CLIENT); @@ -388,9 +389,9 @@ public class ClientTest { String id = ApiUtil.getCreatedId(response); adminEvents.skip(); - assertNotNull(ApiUtil.findClientByClientId(managedRealm.admin(), "my-app")); + assertNotNull(AdminApiUtil.findClientByClientId(managedRealm.admin(), "my-app")); managedRealm.admin().clients().get(id).remove(); - assertNull(ApiUtil.findClientResourceById(managedRealm.admin(), "my-app")); + assertNull(AdminApiUtil.findClientResourceById(managedRealm.admin(), "my-app")); AdminEventAssertion.assertEvent(adminEvents.poll(), OperationType.DELETE, AdminEventPaths.clientResourcePath(id), ResourceType.CLIENT); } @@ -419,14 +420,14 @@ public class ClientTest { @Test public void removeInternalClientExpectingBadRequestException() { - final String testRealmClientId = ApiUtil.findClientByClientId(managedMasterRealm.admin(), managedRealm.getName() + "-realm") + final String testRealmClientId = AdminApiUtil.findClientByClientId(managedMasterRealm.admin(), managedRealm.getName() + "-realm") .toRepresentation().getId(); assertThrows(BadRequestException.class, () -> managedMasterRealm.admin().clients().get(testRealmClientId).remove()); defaultClients.forEach(defaultClient -> { - final String defaultClientId = ApiUtil.findClientByClientId(managedRealm.admin(), defaultClient) + final String defaultClientId = AdminApiUtil.findClientByClientId(managedRealm.admin(), defaultClient) .toRepresentation().getId(); assertThrows(BadRequestException.class, @@ -466,7 +467,7 @@ public class ClientTest { AccessTokenResponse response2 = oauth.doAccessTokenRequest(codeResponse.getCode()); assertEquals(200, response2.getStatusCode()); - ClientResource app = ApiUtil.findClientByClientId(managedRealm.admin(), "test-app"); + ClientResource app = AdminApiUtil.findClientByClientId(managedRealm.admin(), "test-app"); assertEquals(2, (long) app.getApplicationSessionCount().get("count")); @@ -509,7 +510,7 @@ public class ClientTest { @Test public void getClientById() { createClient(); - ClientRepresentation rep = ApiUtil.findClientByClientId(managedRealm.admin(), "my-app").toRepresentation(); + ClientRepresentation rep = AdminApiUtil.findClientByClientId(managedRealm.admin(), "my-app").toRepresentation(); ClientRepresentation gotById = managedRealm.admin().clients().get(rep.getId()).toRepresentation(); assertClient(rep, gotById); } @@ -546,7 +547,7 @@ public class ClientTest { @Test public void testProtocolMappers() { String clientDbId = createClient().getId(); - ProtocolMappersResource mappersResource = ApiUtil.findClientByClientId(managedRealm.admin(), "my-app").getProtocolMappers(); + ProtocolMappersResource mappersResource = AdminApiUtil.findClientByClientId(managedRealm.admin(), "my-app").getProtocolMappers(); protocolMappersTest(clientDbId, mappersResource); } @@ -611,7 +612,7 @@ public class ClientTest { public void pushRevocation() throws InterruptedException { testApp.kcAdmin().clear(); - ClientResource client = ApiUtil.findClientByClientId(managedRealm.admin(), "test-app"); + ClientResource client = AdminApiUtil.findClientByClientId(managedRealm.admin(), "test-app"); String id = client.toRepresentation().getId(); client.pushRevocation(); @@ -625,7 +626,7 @@ public class ClientTest { @Test public void testAddNodeWithReservedCharacter() { testApp.kcAdmin().clear(); - String id = ApiUtil.findClientByClientId(managedRealm.admin(), "test-app").toRepresentation().getId(); + String id = AdminApiUtil.findClientByClientId(managedRealm.admin(), "test-app").toRepresentation().getId(); assertThrows(BadRequestException.class, () -> managedRealm.admin().clients().get(id).registerNode(Collections.singletonMap("node", "foo#")) ); @@ -635,7 +636,7 @@ public class ClientTest { public void nodes() throws MalformedURLException, InterruptedException { testApp.kcAdmin().clear(); - String id = ApiUtil.findClientByClientId(managedRealm.admin(), "test-app").toRepresentation().getId(); + String id = AdminApiUtil.findClientByClientId(managedRealm.admin(), "test-app").toRepresentation().getId(); String myhost = new URL(managedRealm.getBaseUrl()).getHost(); managedRealm.admin().clients().get(id).registerNode(Collections.singletonMap("node", myhost)); @@ -665,7 +666,7 @@ public class ClientTest { @Test public void offlineUserSessions() { - ClientRepresentation client = ApiUtil.findClientByClientId(managedRealm.admin(), "test-app").toRepresentation(); + ClientRepresentation client = AdminApiUtil.findClientByClientId(managedRealm.admin(), "test-app").toRepresentation(); String id = client.getId(); Response response = managedRealm.admin().users().create(UserConfigBuilder.create().username("testuser").password("password").email("testuser@localhost").name("test", "user").build()); diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/ComponentsTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/ComponentsTest.java index a68a4e5560d..f13812dd0ca 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/ComponentsTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/ComponentsTest.java @@ -52,7 +52,7 @@ import org.keycloak.testframework.remote.runonserver.InjectRunOnServer; import org.keycloak.testframework.remote.runonserver.RunOnServerClient; import org.keycloak.testframework.server.KeycloakServerConfig; import org.keycloak.testframework.server.KeycloakServerConfigBuilder; -import org.keycloak.tests.utils.admin.ApiUtil; +import org.keycloak.testframework.util.ApiUtil; import org.keycloak.testsuite.components.TestComponentProvider; import org.keycloak.testsuite.components.TestComponentProviderFactory; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/ConsentsTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/ConsentsTest.java index aeecadadfa8..c1d584b3a07 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/ConsentsTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/ConsentsTest.java @@ -70,7 +70,7 @@ import org.junit.jupiter.api.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; -import static org.keycloak.tests.utils.admin.ApiUtil.findClientByClientId; +import static org.keycloak.tests.utils.admin.AdminApiUtil.findClientByClientId; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/CrossRealmPermissionsTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/CrossRealmPermissionsTest.java index da3bc35d80d..e110b5425af 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/CrossRealmPermissionsTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/CrossRealmPermissionsTest.java @@ -33,7 +33,7 @@ import org.keycloak.testframework.realm.ManagedRealm; import org.keycloak.testframework.realm.RealmConfig; import org.keycloak.testframework.realm.RealmConfigBuilder; import org.keycloak.testframework.realm.UserConfigBuilder; -import org.keycloak.tests.utils.admin.ApiUtil; +import org.keycloak.testframework.util.ApiUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/DeclarativeUserTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/DeclarativeUserTest.java index 03e5e3c6692..c46444d31da 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/DeclarativeUserTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/DeclarativeUserTest.java @@ -22,7 +22,7 @@ import org.keycloak.testframework.realm.RealmConfig; import org.keycloak.testframework.realm.RealmConfigBuilder; import org.keycloak.testframework.remote.runonserver.InjectRunOnServer; import org.keycloak.testframework.remote.runonserver.RunOnServerClient; -import org.keycloak.tests.utils.admin.ApiUtil; +import org.keycloak.testframework.util.ApiUtil; import org.keycloak.userprofile.DeclarativeUserProfileProvider; import org.keycloak.userprofile.UserProfileProvider; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/ImpersonationTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/ImpersonationTest.java index 0d95bcfe3d6..f25fb6440c6 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/ImpersonationTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/ImpersonationTest.java @@ -77,7 +77,8 @@ import org.keycloak.testframework.server.KeycloakUrls; import org.keycloak.testframework.ui.annotations.InjectPage; import org.keycloak.testframework.ui.annotations.InjectWebDriver; import org.keycloak.testframework.ui.page.LoginPage; -import org.keycloak.tests.utils.admin.ApiUtil; +import org.keycloak.testframework.util.ApiUtil; +import org.keycloak.tests.utils.admin.AdminApiUtil; import org.keycloak.testsuite.util.CredentialBuilder; import org.apache.http.HttpResponse; @@ -155,11 +156,11 @@ public class ImpersonationTest { UserResource user = masterRealm.admin().users().get(userId); user.resetPassword(CredentialBuilder.create().password("password").build()); - ClientResource testRealmClient = ApiUtil.findClientByClientId(masterRealm.admin(), managedRealm.getName() + "-realm"); + ClientResource testRealmClient = AdminApiUtil.findClientByClientId(masterRealm.admin(), managedRealm.getName() + "-realm"); List roles = new LinkedList<>(); - roles.add(ApiUtil.findClientRoleByName(testRealmClient, AdminRoles.VIEW_USERS).toRepresentation()); - roles.add(ApiUtil.findClientRoleByName(testRealmClient, AdminRoles.IMPERSONATION).toRepresentation()); + roles.add(AdminApiUtil.findClientRoleByName(testRealmClient, AdminRoles.VIEW_USERS).toRepresentation()); + roles.add(AdminApiUtil.findClientRoleByName(testRealmClient, AdminRoles.IMPERSONATION).toRepresentation()); user.roles().clientLevel(testRealmClient.toRepresentation().getId()).add(roles); @@ -243,11 +244,11 @@ public class ImpersonationTest { clientApp.setServiceAccountsEnabled(true); managedRealm.admin().clients().create(clientApp); - UserRepresentation user = ApiUtil.findClientByClientId(managedRealm.admin(), "service-account-cl").getServiceAccountUser(); + UserRepresentation user = AdminApiUtil.findClientByClientId(managedRealm.admin(), "service-account-cl").getServiceAccountUser(); user.setServiceAccountClientId("service-account-cl"); // add impersonation roles - ApiUtil.assignClientRoles(managedRealm.admin(), user.getId(), Constants.REALM_MANAGEMENT_CLIENT_ID, AdminRoles.IMPERSONATION); + AdminApiUtil.assignClientRoles(managedRealm.admin(), user.getId(), Constants.REALM_MANAGEMENT_CLIENT_ID, AdminRoles.IMPERSONATION); // Impersonation testSuccessfulServiceAccountImpersonation(user, managedRealm.getName()); @@ -256,7 +257,7 @@ public class ImpersonationTest { testBadRequestImpersonation("impersonator", managedRealm.getName(), user.getId(), managedRealm.getName(), "Service accounts cannot be impersonated"); // Remove test client - ApiUtil.findClientByClientId(managedRealm.admin(), "service-account-cl").remove(); + AdminApiUtil.findClientByClientId(managedRealm.admin(), "service-account-cl").remove(); } @Test public void testImpersonationByMasterRealmServiceAccount() throws Exception { @@ -268,17 +269,17 @@ public class ImpersonationTest { .build(); masterRealm.admin().clients().create(clientApp); - UserRepresentation user = ApiUtil.findClientByClientId(masterRealm.admin(), "service-account-cl").getServiceAccountUser(); + UserRepresentation user = AdminApiUtil.findClientByClientId(masterRealm.admin(), "service-account-cl").getServiceAccountUser(); user.setServiceAccountClientId("service-account-cl"); // add impersonation roles - ApiUtil.assignRealmRoles(masterRealm.admin(), user.getId(), "admin"); + AdminApiUtil.assignRealmRoles(masterRealm.admin(), user.getId(), "admin"); // Impersonation testSuccessfulServiceAccountImpersonation(user, masterRealm.getName()); // Remove test client - ApiUtil.findClientByClientId(masterRealm.admin(), "service-account-cl").remove(); + AdminApiUtil.findClientByClientId(masterRealm.admin(), "service-account-cl").remove(); } // Return the SSO cookie from the impersonated session diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/ManagementPermissionsTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/ManagementPermissionsTest.java index 3cd6a427f9d..cafc6dba792 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/ManagementPermissionsTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/ManagementPermissionsTest.java @@ -33,7 +33,7 @@ import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.realm.ManagedRealm; import org.keycloak.testframework.server.KeycloakServerConfig; import org.keycloak.testframework.server.KeycloakServerConfigBuilder; -import org.keycloak.tests.utils.admin.ApiUtil; +import org.keycloak.testframework.util.ApiUtil; import org.junit.jupiter.api.Test; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/PermissionsTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/PermissionsTest.java index b6a9aaf9d59..53b3f12eeaf 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/PermissionsTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/PermissionsTest.java @@ -55,7 +55,7 @@ import org.keycloak.testframework.realm.ClientConfigBuilder; import org.keycloak.testframework.realm.ManagedRealm; import org.keycloak.testframework.realm.RoleConfigBuilder; import org.keycloak.testframework.realm.UserConfigBuilder; -import org.keycloak.tests.utils.admin.ApiUtil; +import org.keycloak.testframework.util.ApiUtil; import org.keycloak.testsuite.util.CredentialBuilder; import org.keycloak.testsuite.util.FederatedIdentityBuilder; import org.keycloak.testsuite.util.IdentityProviderBuilder; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/PermissionsTestV1.java b/tests/base/src/test/java/org/keycloak/tests/admin/PermissionsTestV1.java index cba48626a98..2563b0e9682 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/PermissionsTestV1.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/PermissionsTestV1.java @@ -30,8 +30,8 @@ import org.keycloak.testframework.annotations.InjectRealm; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.realm.ClientConfigBuilder; import org.keycloak.testframework.realm.ManagedRealm; +import org.keycloak.testframework.util.ApiUtil; import org.keycloak.tests.admin.authz.fgap.KeycloakAdminPermissionsV1ServerConfig; -import org.keycloak.tests.utils.admin.ApiUtil; import org.junit.jupiter.api.Test; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/authentication/AbstractAuthenticationTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/authentication/AbstractAuthenticationTest.java index 0c2f02e358d..4224ef489be 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/authentication/AbstractAuthenticationTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/authentication/AbstractAuthenticationTest.java @@ -36,8 +36,8 @@ import org.keycloak.testframework.annotations.InjectRealm; import org.keycloak.testframework.events.AdminEventAssertion; import org.keycloak.testframework.events.AdminEvents; import org.keycloak.testframework.realm.ManagedRealm; +import org.keycloak.testframework.util.ApiUtil; import org.keycloak.tests.utils.admin.AdminEventPaths; -import org.keycloak.tests.utils.admin.ApiUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/authentication/ExecutionTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/authentication/ExecutionTest.java index 0430ebcbb78..e3abadf6223 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/authentication/ExecutionTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/authentication/ExecutionTest.java @@ -37,8 +37,8 @@ import org.keycloak.representations.idm.AuthenticationFlowRepresentation; import org.keycloak.representations.idm.AuthenticatorConfigRepresentation; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.events.AdminEventAssertion; +import org.keycloak.testframework.util.ApiUtil; import org.keycloak.tests.utils.admin.AdminEventPaths; -import org.keycloak.tests.utils.admin.ApiUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/authentication/FlowTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/authentication/FlowTest.java index 6e568827947..ecdb2de1b58 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/authentication/FlowTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/authentication/FlowTest.java @@ -56,8 +56,8 @@ import org.keycloak.representations.idm.OAuth2ErrorRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.events.AdminEventAssertion; +import org.keycloak.testframework.util.ApiUtil; import org.keycloak.tests.utils.admin.AdminEventPaths; -import org.keycloak.tests.utils.admin.ApiUtil; import org.hamcrest.MatcherAssert; import org.junit.jupiter.api.Assertions; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/GroupResourceTypeEvaluationTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/GroupResourceTypeEvaluationTest.java index 438f8351a05..70be4c3bdbe 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/GroupResourceTypeEvaluationTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/GroupResourceTypeEvaluationTest.java @@ -82,7 +82,7 @@ public class GroupResourceTypeEvaluationTest extends AbstractPermissionTest { topGroup.setName(groupName); try (Response response = realm.admin().groups().add(topGroup)) { assertThat(response.getStatus(), equalTo(Response.Status.CREATED.getStatusCode())); - topGroup.setId(ApiUtil.handleCreatedResponse(response)); + topGroup.setId(ApiUtil.getCreatedId(response)); realm.cleanup().add(r -> r.groups().group(topGroup.getId()).remove()); } realm.admin().users().get(userAlice.getId()).joinGroup(topGroup.getId()); @@ -163,7 +163,7 @@ public class GroupResourceTypeEvaluationTest extends AbstractPermissionTest { // creating group requires manage scope GroupRepresentation group = new GroupRepresentation(); group.setName("testGroup"); - String testGroupId = ApiUtil.handleCreatedResponse(realmAdminClient.realm(realm.getName()).groups().add(group)); + String testGroupId = ApiUtil.getCreatedId(realmAdminClient.realm(realm.getName()).groups().add(group)); group.setId(testGroupId); // it should be possible to update the group due to fallback to all-groups permission @@ -195,7 +195,7 @@ public class GroupResourceTypeEvaluationTest extends AbstractPermissionTest { try (Response response = realm.admin().groups().add(myGroup)) { assertThat(response.getStatus(), equalTo(Response.Status.CREATED.getStatusCode())); - myGroup.setId(ApiUtil.handleCreatedResponse(response)); + myGroup.setId(ApiUtil.getCreatedId(response)); realm.cleanup().add(r -> r.groups().group(myGroup.getId()).remove()); } @@ -261,7 +261,7 @@ public class GroupResourceTypeEvaluationTest extends AbstractPermissionTest { try (Response response = realm.admin().groups().add(myGroup)) { assertThat(response.getStatus(), equalTo(Response.Status.CREATED.getStatusCode())); - myGroup.setId(ApiUtil.handleCreatedResponse(response)); + myGroup.setId(ApiUtil.getCreatedId(response)); realm.cleanup().add(r -> r.groups().group(myGroup.getId()).remove()); } @@ -300,7 +300,7 @@ public class GroupResourceTypeEvaluationTest extends AbstractPermissionTest { //create new user - String bobId = ApiUtil.handleCreatedResponse(realm.admin().users().create(UserConfigBuilder.create().username("bob").build())); + String bobId = ApiUtil.getCreatedId(realm.admin().users().create(UserConfigBuilder.create().username("bob").build())); realm.cleanup().add(r -> r.users().delete(bobId)); //check myadmin can manage membership @@ -322,7 +322,7 @@ public class GroupResourceTypeEvaluationTest extends AbstractPermissionTest { assertThat(response.getStatus(), equalTo(Response.Status.FORBIDDEN.getStatusCode())); } - String bobId = ApiUtil.handleCreatedResponse(realmAdminClient.realm(realm.getName()).users().create(UserConfigBuilder.create().username("bob").groups("/" + groupName).build())); + String bobId = ApiUtil.getCreatedId(realmAdminClient.realm(realm.getName()).users().create(UserConfigBuilder.create().username("bob").groups("/" + groupName).build())); realm.cleanup().add(r -> r.users().delete(bobId)); } @@ -410,7 +410,7 @@ public class GroupResourceTypeEvaluationTest extends AbstractPermissionTest { GroupRepresentation subGroup = new GroupRepresentation(); subGroup.setName("testSubGroup"); - String testGroupId = ApiUtil.handleCreatedResponse(realm.admin().groups().add(subGroup)); + String testGroupId = ApiUtil.getCreatedId(realm.admin().groups().add(subGroup)); subGroup.setId(testGroupId); realm.admin().groups().group(topGroup.getId()).subGroup(subGroup).close(); realm.admin().users().get(userJdoe.getId()).joinGroup(subGroup.getId()); diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/GroupResourceTypePermissionTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/GroupResourceTypePermissionTest.java index 0c104dd1185..5fac38c6ba5 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/GroupResourceTypePermissionTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/GroupResourceTypePermissionTest.java @@ -88,14 +88,14 @@ public class GroupResourceTypePermissionTest extends AbstractPermissionTest { topGroup.setName("topGroup"); try (Response response = realm.admin().groups().add(topGroup)) { assertThat(response.getStatus(), equalTo(Response.Status.CREATED.getStatusCode())); - topGroup.setId(ApiUtil.handleCreatedResponse(response)); + topGroup.setId(ApiUtil.getCreatedId(response)); realm.cleanup().add(r -> r.groups().group(topGroup.getId()).remove()); } GroupRepresentation topGroup1 = new GroupRepresentation(); topGroup1.setName("topGroup1"); try (Response response = realm.admin().groups().add(topGroup1)) { assertThat(response.getStatus(), equalTo(Response.Status.CREATED.getStatusCode())); - topGroup1.setId(ApiUtil.handleCreatedResponse(response)); + topGroup1.setId(ApiUtil.getCreatedId(response)); } //create group policies diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/RoleResourceTypeEvaluationTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/RoleResourceTypeEvaluationTest.java index 5cbb2f773b3..a8d0b459765 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/RoleResourceTypeEvaluationTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/RoleResourceTypeEvaluationTest.java @@ -72,7 +72,7 @@ public class RoleResourceTypeEvaluationTest extends AbstractPermissionTest { clientScope.setProtocol("openid-connect"); try (Response response = realm.admin().clientScopes().create(clientScope)) { assertThat(response.getStatus(), equalTo(Response.Status.CREATED.getStatusCode())); - clientScope.setId(ApiUtil.handleCreatedResponse(response)); + clientScope.setId(ApiUtil.getCreatedId(response)); realm.cleanup().add(r -> r.clientScopes().get(clientScope.getId()).remove()); } diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/UserResourceTypeEvaluationTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/UserResourceTypeEvaluationTest.java index cc1dfcb230f..f1dc35f2e48 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/UserResourceTypeEvaluationTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/UserResourceTypeEvaluationTest.java @@ -150,7 +150,7 @@ public class UserResourceTypeEvaluationTest extends AbstractPermissionTest { createAllPermission(client, usersType, policy, Set.of(VIEW, MANAGE)); // creating user requires manage scope - String newUserId = ApiUtil.handleCreatedResponse(realmAdminClient.realm(realm.getName()).users().create(UserConfigBuilder.create().username(newUserUsername).build())); + String newUserId = ApiUtil.getCreatedId(realmAdminClient.realm(realm.getName()).users().create(UserConfigBuilder.create().username(newUserUsername).build())); // it should be possible to update the user due to fallback to all-users permission realmAdminClient.realm(realm.getName()).users().get(newUserId).update(UserConfigBuilder.create().email("new@test.com").build()); @@ -164,7 +164,7 @@ public class UserResourceTypeEvaluationTest extends AbstractPermissionTest { ScopePermissionRepresentation allUsersPermission = createAllPermission(client, usersType, policy, Set.of(VIEW, MANAGE)); // creating user requires manage scope - String newUserId = ApiUtil.handleCreatedResponse(realmAdminClient.realm(realm.getName()).users().create(UserConfigBuilder.create().username(newUserUsername).build())); + String newUserId = ApiUtil.getCreatedId(realmAdminClient.realm(realm.getName()).users().create(UserConfigBuilder.create().username(newUserUsername).build())); // remove all-users permissions to test user-permission allUsersPermission = getScopePermissionsResource(client).findByName(allUsersPermission.getName()); @@ -490,7 +490,7 @@ public class UserResourceTypeEvaluationTest extends AbstractPermissionTest { // Create group 'test_admins' GroupRepresentation testAdminsGroup = new GroupRepresentation(); testAdminsGroup.setName("test_admins"); - testAdminsGroup.setId(ApiUtil.handleCreatedResponse(realm.admin().groups().add(testAdminsGroup))); + testAdminsGroup.setId(ApiUtil.getCreatedId(realm.admin().groups().add(testAdminsGroup))); // Add user 'myadmin' as a member of 'test_admins' UserRepresentation myadmin = realm.admin().users().search("myadmin").get(0); diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/UserResourceTypeFilteringTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/UserResourceTypeFilteringTest.java index f30fde304d1..d95f40b10b5 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/UserResourceTypeFilteringTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/UserResourceTypeFilteringTest.java @@ -434,7 +434,7 @@ public class UserResourceTypeFilteringTest extends AbstractPermissionTest { // create users for (int i = 0; i < 4; i++) { - String userId = ApiUtil.handleCreatedResponse(realm.admin().users().create(UserConfigBuilder.create() + String userId = ApiUtil.getCreatedId(realm.admin().users().create(UserConfigBuilder.create() .username("user" + i) .password("password") .firstName("user") @@ -503,7 +503,7 @@ public class UserResourceTypeFilteringTest extends AbstractPermissionTest { // assign role to users for (String username : List.of("user_x", "user_y", "user_z")) { - String userId = ApiUtil.handleCreatedResponse(realm.admin().users().create(UserConfigBuilder.create() + String userId = ApiUtil.getCreatedId(realm.admin().users().create(UserConfigBuilder.create() .username(username) .password("password") .firstName("user") diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/client/AbstractClientScopeTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/client/AbstractClientScopeTest.java index da9b85c9c34..dfd9e4e4f79 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/client/AbstractClientScopeTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/client/AbstractClientScopeTest.java @@ -16,8 +16,8 @@ import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.events.AdminEventAssertion; import org.keycloak.testframework.events.AdminEvents; import org.keycloak.testframework.realm.ManagedRealm; +import org.keycloak.testframework.util.ApiUtil; import org.keycloak.tests.utils.admin.AdminEventPaths; -import org.keycloak.tests.utils.admin.ApiUtil; import org.keycloak.util.JsonSerialization; import org.junit.jupiter.api.Assertions; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientRolesTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientRolesTest.java index d58c8a26d91..61a726ac969 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientRolesTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientRolesTest.java @@ -48,9 +48,9 @@ import org.keycloak.testframework.realm.ClientConfigBuilder; import org.keycloak.testframework.realm.ManagedClient; import org.keycloak.testframework.realm.ManagedRealm; import org.keycloak.testframework.realm.RoleConfigBuilder; +import org.keycloak.testframework.util.ApiUtil; import org.keycloak.tests.utils.Assert; import org.keycloak.tests.utils.admin.AdminEventPaths; -import org.keycloak.tests.utils.admin.ApiUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientScopeEvaluateTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientScopeEvaluateTest.java index 1e9fcfd4080..45b3db574ad 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientScopeEvaluateTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientScopeEvaluateTest.java @@ -32,7 +32,7 @@ import org.keycloak.testframework.realm.ManagedRealm; import org.keycloak.testframework.realm.ManagedUser; import org.keycloak.testframework.realm.UserConfig; import org.keycloak.testframework.realm.UserConfigBuilder; -import org.keycloak.tests.utils.admin.ApiUtil; +import org.keycloak.tests.utils.admin.AdminApiUtil; import org.junit.jupiter.api.Test; @@ -85,7 +85,7 @@ public class ClientScopeEvaluateTest { @Test public void testGenerateAccessTokenWithoutBasicScope() { - String basicScopeId = ApiUtil.findClientScopeByName(managedRealm.admin(),"basic").toRepresentation().getId(); + String basicScopeId = AdminApiUtil.findClientScopeByName(managedRealm.admin(),"basic").toRepresentation().getId(); managedClient.admin().removeDefaultClientScope(basicScopeId); AccessToken accessToken = managedClient.admin().clientScopesEvaluate().generateAccessToken("openid", managedUser.getId(), null); @@ -97,7 +97,7 @@ public class ClientScopeEvaluateTest { @Test public void testGenerateAccessTokenWithOptionalScope() { - String emailScopeId = ApiUtil.findClientScopeByName(managedRealm.admin(),"email").toRepresentation().getId(); + String emailScopeId = AdminApiUtil.findClientScopeByName(managedRealm.admin(),"email").toRepresentation().getId(); managedClient.admin().removeDefaultClientScope(emailScopeId); managedClient.admin().addOptionalClientScope(emailScopeId); diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientScopeProtocolMapperTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientScopeProtocolMapperTest.java index 264d8244fc0..98d795abf29 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientScopeProtocolMapperTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientScopeProtocolMapperTest.java @@ -38,8 +38,9 @@ import org.keycloak.testframework.annotations.InjectRealm; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.events.AdminEventAssertion; import org.keycloak.testframework.realm.ManagedRealm; +import org.keycloak.testframework.util.ApiUtil; +import org.keycloak.tests.utils.admin.AdminApiUtil; import org.keycloak.tests.utils.admin.AdminEventPaths; -import org.keycloak.tests.utils.admin.ApiUtil; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; @@ -180,7 +181,7 @@ public class ClientScopeProtocolMapperTest extends AbstractProtocolMapperTest { @Test public void test08EffectiveMappers() { - ClientScopeResource rolesScope = ApiUtil.findClientScopeByName(managedRealm.admin(), "roles"); + ClientScopeResource rolesScope = AdminApiUtil.findClientScopeByName(managedRealm.admin(), "roles"); Assertions.assertNotNull(rolesScope); List mappers = rolesScope.getProtocolMappers().getMappers(); ProtocolMapperRepresentation audienceMapper = mappers.stream() diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientScopeTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientScopeTest.java index 462226f971f..6efe7955350 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientScopeTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientScopeTest.java @@ -52,8 +52,8 @@ import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.events.AdminEventAssertion; import org.keycloak.testframework.realm.RoleConfigBuilder; +import org.keycloak.testframework.util.ApiUtil; import org.keycloak.tests.utils.admin.AdminEventPaths; -import org.keycloak.tests.utils.admin.ApiUtil; import org.keycloak.tests.utils.matchers.Matchers; import org.junit.jupiter.api.Assertions; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/client/InstallationTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/client/InstallationTest.java index b384604fe63..007d1e9d791 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/client/InstallationTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/client/InstallationTest.java @@ -174,7 +174,7 @@ public class InstallationTest { clientScopeRepresentation.setProtocolMappers(List.of(mapper)); Response response = realm.admin().clientScopes().create(clientScopeRepresentation); - String id = ApiUtil.handleCreatedResponse(response); + String id = ApiUtil.getCreatedId(response); response.close(); AdminEventAssertion.assertEvent(adminEvents.poll(), OperationType.CREATE, AdminEventPaths.clientScopeResourcePath(id), ResourceType.CLIENT_SCOPE); diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/client/ServiceAccountClientTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/client/ServiceAccountClientTest.java index 80566906be6..3d93bce3f14 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/client/ServiceAccountClientTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/client/ServiceAccountClientTest.java @@ -33,7 +33,7 @@ import org.keycloak.testframework.realm.ClientConfig; import org.keycloak.testframework.realm.ClientConfigBuilder; import org.keycloak.testframework.realm.ManagedClient; import org.keycloak.testframework.realm.ManagedRealm; -import org.keycloak.tests.utils.admin.ApiUtil; +import org.keycloak.tests.utils.admin.AdminApiUtil; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.hamcrest.MatcherAssert; @@ -60,7 +60,7 @@ public class ServiceAccountClientTest { @Test public void testServiceAccountEnableDisable() { - ClientScopeResource serviceAccountScopeRsc = ApiUtil.findClientScopeByName( + ClientScopeResource serviceAccountScopeRsc = AdminApiUtil.findClientScopeByName( managedRealm.admin(), ServiceAccountConstants.SERVICE_ACCOUNT_SCOPE); Assertions.assertNotNull(serviceAccountScopeRsc); ClientScopeRepresentation serviceAccountScope = serviceAccountScopeRsc.toRepresentation(); diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/client/SessionTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/client/SessionTest.java index a0ea2c33f9a..eea1d2841d8 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/client/SessionTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/client/SessionTest.java @@ -33,7 +33,7 @@ import org.keycloak.testframework.realm.UserConfig; import org.keycloak.testframework.realm.UserConfigBuilder; import org.keycloak.testframework.ui.annotations.InjectPage; import org.keycloak.testframework.ui.page.LoginPage; -import org.keycloak.tests.utils.admin.ApiUtil; +import org.keycloak.tests.utils.admin.AdminApiUtil; import org.keycloak.testsuite.util.AccountHelper; import org.junit.jupiter.api.Test; @@ -64,7 +64,7 @@ public class SessionTest { @Test public void testGetAppSessionCount() { - ClientResource accountClient = ApiUtil.findClientByClientId(managedRealm.admin(), "test-app"); + ClientResource accountClient = AdminApiUtil.findClientByClientId(managedRealm.admin(), "test-app"); int sessionCount = accountClient.getApplicationSessionCount().get("count"); assertEquals(0, sessionCount); @@ -83,7 +83,7 @@ public class SessionTest { @Test public void testGetUserSessions() { - ClientResource account = ApiUtil.findClientByClientId(managedRealm.admin(), "test-app"); + ClientResource account = AdminApiUtil.findClientByClientId(managedRealm.admin(), "test-app"); oauth.openLoginForm(); loginPage.fillLogin(user.getUsername(), user.getPassword()); @@ -117,7 +117,7 @@ public class SessionTest { loginPage.fillLogin(user.getUsername(), user.getPassword()); loginPage.submit(); - ClientResource account = ApiUtil.findClientByClientId(managedRealm.admin(), "test-app"); + ClientResource account = AdminApiUtil.findClientByClientId(managedRealm.admin(), "test-app"); List sessions = account.getUserSessions(0, 5); assertEquals(1, sessions.size()); diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/concurrency/ConcurrencyTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/concurrency/ConcurrencyTest.java index 94cbf4bb78d..d655948f620 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/concurrency/ConcurrencyTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/concurrency/ConcurrencyTest.java @@ -39,7 +39,7 @@ import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.realm.UserConfigBuilder; -import org.keycloak.tests.utils.admin.ApiUtil; +import org.keycloak.testframework.util.ApiUtil; import org.keycloak.testsuite.util.userprofile.UserProfileUtil; import org.junit.jupiter.api.Disabled; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/concurrency/ConcurrentLoginTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/concurrency/ConcurrentLoginTest.java index 1a695da43e5..0f33df6d3ec 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/concurrency/ConcurrentLoginTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/concurrency/ConcurrentLoginTest.java @@ -63,7 +63,8 @@ import org.keycloak.testframework.remote.runonserver.InjectRunOnServer; import org.keycloak.testframework.remote.runonserver.RunOnServerClient; import org.keycloak.testframework.server.KeycloakUrls; import org.keycloak.testframework.ui.annotations.InjectWebDriver; -import org.keycloak.tests.utils.admin.ApiUtil; +import org.keycloak.testframework.util.ApiUtil; +import org.keycloak.tests.utils.admin.AdminApiUtil; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; import org.keycloak.util.JsonSerialization; @@ -188,7 +189,7 @@ public class ConcurrentLoginTest extends AbstractConcurrencyTest { rep.setTemporary(Boolean.FALSE); rep.setValue("password"); rep.setType(CredentialRepresentation.PASSWORD); - ApiUtil.findUserByUsernameId(managedRealm.admin(), user1.getUsername()).resetPassword(rep); + AdminApiUtil.findUserByUsernameId(managedRealm.admin(), user1.getUsername()).resetPassword(rep); } finally { realmRep.setPasswordPolicy(""); managedRealm.admin().update(realmRep); @@ -297,7 +298,7 @@ public class ConcurrentLoginTest extends AbstractConcurrencyTest { run(DEFAULT_THREADS, DEFAULT_THREADS, codeToTokenTask); // Logout user - ApiUtil.findUserByUsernameId(managedRealm.admin(), user1.getUsername()).logout(); + AdminApiUtil.findUserByUsernameId(managedRealm.admin(), user1.getUsername()).logout(); // Code should be successfully exchanged for the token at max once. In some cases (EG. Cross-DC) it may not be even successfully exchanged assertThat(codeToTokenSuccessCount.get(), Matchers.equalTo(1)); diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/event/AdminEventAuthDetailsTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/event/AdminEventAuthDetailsTest.java index d8ce5efba8c..dca8836b041 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/event/AdminEventAuthDetailsTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/event/AdminEventAuthDetailsTest.java @@ -32,8 +32,8 @@ import org.keycloak.testframework.events.AdminEvents; import org.keycloak.testframework.realm.ManagedRealm; import org.keycloak.testframework.realm.RealmConfig; import org.keycloak.testframework.realm.RealmConfigBuilder; +import org.keycloak.tests.utils.admin.AdminApiUtil; import org.keycloak.tests.utils.admin.AdminEventPaths; -import org.keycloak.tests.utils.admin.ApiUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; @@ -67,7 +67,7 @@ public class AdminEventAuthDetailsTest { clientUuid = adminClient.realm(managedRealm.getName()).clients().findByClientId("client").get(0).getId(); adminId = adminClient.realm(managedRealm.getName()).users().search("admin", true).get(0).getId(); appUserId = adminClient.realm(managedRealm.getName()).users().search("app-user", true).get(0).getId(); - adminCliUuid = ApiUtil.findClientByClientId(managedRealm.admin(), Constants.ADMIN_CLI_CLIENT_ID).toRepresentation().getId(); + adminCliUuid = AdminApiUtil.findClientByClientId(managedRealm.admin(), Constants.ADMIN_CLI_CLIENT_ID).toRepresentation().getId(); } @Test diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/event/AdminEventTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/event/AdminEventTest.java index dadaff1b5d1..cde150dce0c 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/event/AdminEventTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/event/AdminEventTest.java @@ -51,7 +51,7 @@ import org.keycloak.testframework.realm.RealmConfigBuilder; import org.keycloak.testframework.realm.UserConfigBuilder; import org.keycloak.testframework.remote.runonserver.InjectRunOnServer; import org.keycloak.testframework.remote.runonserver.RunOnServerClient; -import org.keycloak.tests.utils.admin.ApiUtil; +import org.keycloak.testframework.util.ApiUtil; import org.keycloak.util.JsonSerialization; import org.apache.commons.lang3.RandomStringUtils; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/finegrainedadminv1/FineGrainedAdminRestTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/finegrainedadminv1/FineGrainedAdminRestTest.java index 929dbe180e6..5050f94e0c1 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/finegrainedadminv1/FineGrainedAdminRestTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/finegrainedadminv1/FineGrainedAdminRestTest.java @@ -32,7 +32,8 @@ import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.realm.GroupConfigBuilder; import org.keycloak.testframework.realm.UserConfigBuilder; -import org.keycloak.tests.utils.admin.ApiUtil; +import org.keycloak.testframework.util.ApiUtil; +import org.keycloak.tests.utils.admin.AdminApiUtil; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; @@ -300,7 +301,7 @@ public class FineGrainedAdminRestTest extends AbstractFineGrainedAdminTest { UserRepresentation newGroupMember = UserConfigBuilder.create() .username("new-group-member").email("new-group-member@keycloak.org").name("New", "Member").groups("top").build(); - ApiUtil.createUserWithAdminClient(realmClient.realm(REALM_NAME), newGroupMember); + AdminApiUtil.createUserWithAdminClient(realmClient.realm(REALM_NAME), newGroupMember); // Should only return the list of users that belong to "top" group + the new one queryUsers = realmClient.realm(REALM_NAME).users().list(); diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/group/AbstractGroupTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/group/AbstractGroupTest.java index 8d0eae52c5b..ab8c09001ef 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/group/AbstractGroupTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/group/AbstractGroupTest.java @@ -31,8 +31,8 @@ import org.keycloak.testframework.events.AdminEvents; import org.keycloak.testframework.oauth.OAuthClient; import org.keycloak.testframework.oauth.annotations.InjectOAuthClient; import org.keycloak.testframework.realm.ManagedRealm; +import org.keycloak.testframework.util.ApiUtil; import org.keycloak.tests.utils.admin.AdminEventPaths; -import org.keycloak.tests.utils.admin.ApiUtil; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; /** diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/group/GroupAttributeSearchTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/group/GroupAttributeSearchTest.java index 99e3fd9d108..b123d147e11 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/group/GroupAttributeSearchTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/group/GroupAttributeSearchTest.java @@ -14,7 +14,7 @@ import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.realm.ManagedRealm; import org.keycloak.testframework.server.KeycloakServerConfig; import org.keycloak.testframework.server.KeycloakServerConfigBuilder; -import org.keycloak.tests.utils.admin.ApiUtil; +import org.keycloak.testframework.util.ApiUtil; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/group/GroupMappersTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/group/GroupMappersTest.java index edf107c95ca..942808c28a1 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/group/GroupMappersTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/group/GroupMappersTest.java @@ -46,7 +46,8 @@ import org.keycloak.testframework.realm.GroupConfigBuilder; import org.keycloak.testframework.realm.ManagedRealm; import org.keycloak.testframework.realm.RealmConfig; import org.keycloak.testframework.realm.RealmConfigBuilder; -import org.keycloak.tests.utils.admin.ApiUtil; +import org.keycloak.testframework.util.ApiUtil; +import org.keycloak.tests.utils.admin.AdminApiUtil; import org.keycloak.testsuite.util.ProtocolMapperUtil; import org.hamcrest.MatcherAssert; @@ -77,7 +78,7 @@ public class GroupMappersTest extends AbstractGroupTest { @SuppressWarnings("unchecked") public void testGroupMappers() { { - UserRepresentation user = ApiUtil.findUserByUsername(managedRealm.admin(), TOP_GROUP_USER); + UserRepresentation user = AdminApiUtil.findUserByUsername(managedRealm.admin(), TOP_GROUP_USER); AccessToken token = login(user.getUsername(), CLIENT_ID, CLIENT_SECRET); Assertions.assertTrue(token.getRealmAccess().getRoles().contains("user")); @@ -87,7 +88,7 @@ public class GroupMappersTest extends AbstractGroupTest { Assertions.assertEquals("true", token.getOtherClaims().get(TOP_ATTRIBUTE)); } { - UserRepresentation user = ApiUtil.findUserByUsername(managedRealm.admin(), LEVEL_2_GROUP_USER); + UserRepresentation user = AdminApiUtil.findUserByUsername(managedRealm.admin(), LEVEL_2_GROUP_USER); AccessToken token = login(user.getUsername(), CLIENT_ID, CLIENT_SECRET); Assertions.assertTrue(token.getRealmAccess().getRoles().contains("user")); @@ -112,10 +113,10 @@ public class GroupMappersTest extends AbstractGroupTest { Response response = realm.groups().group(topGroup.getId()).subGroup(childSlash); childSlash.setId(ApiUtil.getCreatedId(response)); - UserRepresentation user = ApiUtil.findUserByUsername(managedRealm.admin(), LEVEL_2_GROUP_USER); + UserRepresentation user = AdminApiUtil.findUserByUsername(managedRealm.admin(), LEVEL_2_GROUP_USER); realm.users().get(user.getId()).joinGroup(childSlash.getId()); - ClientResource client = ApiUtil.findClientByClientId(realm, CLIENT_ID); + ClientResource client = AdminApiUtil.findClientByClientId(realm, CLIENT_ID); ProtocolMappersResource protocolMappers = client.getProtocolMappers(); ProtocolMapperRepresentation groupsMapper = ProtocolMapperUtil.getMapperByNameAndProtocol( protocolMappers, OIDCLoginProtocol.LOGIN_PROTOCOL, "groups"); diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/group/GroupSearchTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/group/GroupSearchTest.java index 479d651c375..d0e141b4b45 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/group/GroupSearchTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/group/GroupSearchTest.java @@ -25,8 +25,8 @@ import org.keycloak.testframework.realm.GroupConfigBuilder; import org.keycloak.testframework.realm.ManagedRealm; import org.keycloak.testframework.realm.RealmConfig; import org.keycloak.testframework.realm.RealmConfigBuilder; +import org.keycloak.testframework.util.ApiUtil; import org.keycloak.tests.utils.admin.AdminEventPaths; -import org.keycloak.tests.utils.admin.ApiUtil; import com.google.common.collect.Comparators; import org.hamcrest.Matchers; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/group/GroupTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/group/GroupTest.java index 67c316414aa..4270bb5ad35 100755 --- a/tests/base/src/test/java/org/keycloak/tests/admin/group/GroupTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/group/GroupTest.java @@ -71,9 +71,9 @@ import org.keycloak.testframework.realm.RoleConfigBuilder; import org.keycloak.testframework.realm.UserConfigBuilder; import org.keycloak.testframework.remote.runonserver.InjectRunOnServer; import org.keycloak.testframework.remote.runonserver.RunOnServerClient; +import org.keycloak.testframework.util.ApiUtil; import org.keycloak.tests.utils.Assert; import org.keycloak.tests.utils.admin.AdminEventPaths; -import org.keycloak.tests.utils.admin.ApiUtil; import org.keycloak.testsuite.util.userprofile.UserProfileUtil; import org.keycloak.util.JsonSerialization; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/identityprovider/AbstractIdentityProviderTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/identityprovider/AbstractIdentityProviderTest.java index c47be21b12a..a993369c564 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/identityprovider/AbstractIdentityProviderTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/identityprovider/AbstractIdentityProviderTest.java @@ -14,8 +14,8 @@ import org.keycloak.testframework.events.AdminEvents; import org.keycloak.testframework.realm.ManagedRealm; import org.keycloak.testframework.remote.runonserver.InjectRunOnServer; import org.keycloak.testframework.remote.runonserver.RunOnServerClient; +import org.keycloak.testframework.util.ApiUtil; import org.keycloak.tests.utils.admin.AdminEventPaths; -import org.keycloak.tests.utils.admin.ApiUtil; import org.junit.jupiter.api.Assertions; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/identityprovider/IdentityProviderMapperTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/identityprovider/IdentityProviderMapperTest.java index 1a10f00bb37..3afa94559bd 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/identityprovider/IdentityProviderMapperTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/identityprovider/IdentityProviderMapperTest.java @@ -24,8 +24,8 @@ import org.keycloak.testframework.injection.LifeCycle; import org.keycloak.testframework.realm.ManagedRealm; import org.keycloak.testframework.server.KeycloakServerConfig; import org.keycloak.testframework.server.KeycloakServerConfigBuilder; +import org.keycloak.testframework.util.ApiUtil; import org.keycloak.tests.utils.admin.AdminEventPaths; -import org.keycloak.tests.utils.admin.ApiUtil; import org.keycloak.testsuite.broker.oidc.OverwrittenMappersTestIdentityProviderFactory; import org.junit.jupiter.api.Assertions; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/AdhocWorkflowTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/AdhocWorkflowTest.java index ff0b7fad2cd..50b11c30788 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/AdhocWorkflowTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/AdhocWorkflowTest.java @@ -233,7 +233,7 @@ public class AdhocWorkflowTest extends AbstractWorkflowTest { String workflowOneId = workflows.stream().filter(w -> w.getName().equals("One")).findFirst().orElseThrow(IllegalStateException::new).getId(); // create a new user - should bind the user to the workflow and set up the first step in both workflows - String id = ApiUtil.handleCreatedResponse(managedRealm.admin().users().create(getUserRepresentation("alice", "Alice", "Wonderland", "alice@wornderland.org"))); + String id = ApiUtil.getCreatedId(managedRealm.admin().users().create(getUserRepresentation("alice", "Alice", "Wonderland", "alice@wornderland.org"))); runScheduledSteps(Duration.ofDays(6)); diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/DeleteUserWorkflowStepTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/DeleteUserWorkflowStepTest.java index 48f2b7a62aa..50693197e70 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/DeleteUserWorkflowStepTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/DeleteUserWorkflowStepTest.java @@ -49,8 +49,8 @@ import org.keycloak.testframework.ui.annotations.InjectPage; import org.keycloak.testframework.ui.annotations.InjectWebDriver; import org.keycloak.testframework.ui.page.ConsentPage; import org.keycloak.testframework.ui.page.LoginPage; +import org.keycloak.testframework.util.ApiUtil; import org.keycloak.tests.admin.model.workflow.DeleteUserWorkflowStepTest.DeleteUserWorkflowServerConf; -import org.keycloak.tests.utils.admin.ApiUtil; import org.keycloak.testsuite.federation.DummyUserFederationProvider; import org.keycloak.testsuite.federation.DummyUserFederationProviderFactory; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmCacheTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmCacheTest.java index feb6cbe282b..e2f80e92838 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmCacheTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmCacheTest.java @@ -12,8 +12,8 @@ import org.keycloak.testframework.events.AdminEventAssertion; import org.keycloak.testframework.realm.ManagedRealm; import org.keycloak.testframework.remote.runonserver.InjectRunOnServer; import org.keycloak.testframework.remote.runonserver.RunOnServerClient; +import org.keycloak.testframework.util.ApiUtil; import org.keycloak.tests.utils.admin.AdminEventPaths; -import org.keycloak.tests.utils.admin.ApiUtil; import org.infinispan.Cache; import org.junit.jupiter.api.Test; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmOAuthActionsTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmOAuthActionsTest.java index 1b74ccd42f8..028620df252 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmOAuthActionsTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmOAuthActionsTest.java @@ -30,8 +30,9 @@ import org.keycloak.testframework.oauth.annotations.InjectTestApp; import org.keycloak.testframework.realm.ClientConfigBuilder; import org.keycloak.testframework.realm.UserConfigBuilder; import org.keycloak.testframework.server.KeycloakUrls; +import org.keycloak.testframework.util.ApiUtil; +import org.keycloak.tests.utils.admin.AdminApiUtil; import org.keycloak.tests.utils.admin.AdminEventPaths; -import org.keycloak.tests.utils.admin.ApiUtil; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.junit.jupiter.api.Assertions; @@ -81,7 +82,7 @@ public class RealmOAuthActionsTest extends AbstractRealmTest { assertEquals(time, adminPushNotBefore.getNotBefore()); managedRealm.admin().clients().get("test-app-new").remove(); - managedRealm.admin().users().get(ApiUtil.findUserByUsername(managedRealm.admin(), "testuser").getId()).remove(); + managedRealm.admin().users().get(AdminApiUtil.findUserByUsername(managedRealm.admin(), "testuser").getId()).remove(); } @Test @@ -107,7 +108,7 @@ public class RealmOAuthActionsTest extends AbstractRealmTest { managedRealm.admin().clients().get("test-saml-app").remove(); managedRealm.admin().clients().get("test-app-new").remove(); - managedRealm.admin().users().get(ApiUtil.findUserByUsername(managedRealm.admin(), "testuser").getId()).remove(); + managedRealm.admin().users().get(AdminApiUtil.findUserByUsername(managedRealm.admin(), "testuser").getId()).remove(); } @Test @@ -138,7 +139,7 @@ public class RealmOAuthActionsTest extends AbstractRealmTest { assertNotNull(testApp.kcAdmin().getAdminLogoutAction()); managedRealm.admin().clients().get("test-app-new").remove(); - managedRealm.admin().users().get(ApiUtil.findUserByUsername(managedRealm.admin(), "testuser").getId()).remove(); + managedRealm.admin().users().get(AdminApiUtil.findUserByUsername(managedRealm.admin(), "testuser").getId()).remove(); } @Test @@ -167,7 +168,7 @@ public class RealmOAuthActionsTest extends AbstractRealmTest { assertEquals("Session not active", tokenResponse.getErrorDescription()); managedRealm.admin().clients().get("test-app-new").remove(); - managedRealm.admin().users().get(ApiUtil.findUserByUsername(managedRealm.admin(), "testuser").getId()).remove(); + managedRealm.admin().users().get(AdminApiUtil.findUserByUsername(managedRealm.admin(), "testuser").getId()).remove(); } @Test @@ -194,7 +195,7 @@ public class RealmOAuthActionsTest extends AbstractRealmTest { assertEquals(0, sessionStats.size()); - managedRealm.admin().users().get(ApiUtil.findUserByUsername(managedRealm.admin(), "testuser").getId()).remove(); + managedRealm.admin().users().get(AdminApiUtil.findUserByUsername(managedRealm.admin(), "testuser").getId()).remove(); } private void setupTestAppAndUser() { diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/user/AbstractUserTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/user/AbstractUserTest.java index 2c227ede1fc..6341ed6c246 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/user/AbstractUserTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/user/AbstractUserTest.java @@ -41,8 +41,8 @@ import org.keycloak.testframework.remote.runonserver.RunOnServerClient; import org.keycloak.testframework.ui.annotations.InjectPage; import org.keycloak.testframework.ui.annotations.InjectWebDriver; import org.keycloak.testframework.ui.page.LoginPage; +import org.keycloak.testframework.util.ApiUtil; import org.keycloak.tests.utils.admin.AdminEventPaths; -import org.keycloak.tests.utils.admin.ApiUtil; import org.keycloak.tests.utils.runonserver.RunHelpers; import org.keycloak.testsuite.util.userprofile.UserProfileUtil; import org.keycloak.util.JsonSerialization; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/user/UserCreateTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/user/UserCreateTest.java index 9ef2866bdde..717b4f02b82 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/user/UserCreateTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/user/UserCreateTest.java @@ -41,9 +41,9 @@ import org.keycloak.testframework.realm.RoleConfigBuilder; import org.keycloak.testframework.realm.UserConfigBuilder; import org.keycloak.testframework.server.KeycloakServerConfig; import org.keycloak.testframework.server.KeycloakServerConfigBuilder; +import org.keycloak.testframework.util.ApiUtil; import org.keycloak.tests.utils.Assert; import org.keycloak.tests.utils.admin.AdminEventPaths; -import org.keycloak.tests.utils.admin.ApiUtil; import org.keycloak.testsuite.federation.DummyUserFederationProviderFactory; import org.keycloak.util.JsonSerialization; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/user/UserCredentialTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/user/UserCredentialTest.java index ede3b614539..059f39212f4 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/user/UserCredentialTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/user/UserCredentialTest.java @@ -26,8 +26,8 @@ import org.keycloak.testframework.oauth.annotations.InjectOAuthClient; import org.keycloak.testframework.realm.ManagedUser; import org.keycloak.testframework.realm.UserConfig; import org.keycloak.testframework.realm.UserConfigBuilder; +import org.keycloak.tests.utils.admin.AdminApiUtil; import org.keycloak.tests.utils.admin.AdminEventPaths; -import org.keycloak.tests.utils.admin.ApiUtil; import org.keycloak.testsuite.util.AccountHelper; import org.keycloak.util.JsonSerialization; @@ -218,7 +218,7 @@ public class UserCredentialTest extends AbstractUserTest { .get(); // Test that when admin operates on user "user2", he can't update, move or remove credentials of different user "user1" - UserResource user2 = ApiUtil.findUserByUsernameId(managedRealm.admin(), testUser.getUsername()); + UserResource user2 = AdminApiUtil.findUserByUsernameId(managedRealm.admin(), testUser.getUsername()); try { user2.setCredentialUserLabel(otpCredential.getId(), "new-label"); Assertions.fail("Not expected to successfully update user label"); diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/user/UserDeleteTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/user/UserDeleteTest.java index d517201ef58..1bb5a7831cc 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/user/UserDeleteTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/user/UserDeleteTest.java @@ -5,7 +5,7 @@ import jakarta.ws.rs.core.Response; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.events.AdminEventAssertion; import org.keycloak.testframework.realm.UserConfigBuilder; -import org.keycloak.tests.utils.admin.ApiUtil; +import org.keycloak.testframework.util.ApiUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/user/UserEmailTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/user/UserEmailTest.java index d0deecb46e4..9769253594b 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/user/UserEmailTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/user/UserEmailTest.java @@ -50,9 +50,9 @@ import org.keycloak.testframework.ui.page.ErrorPage; import org.keycloak.testframework.ui.page.InfoPage; import org.keycloak.testframework.ui.page.LoginPasswordUpdatePage; import org.keycloak.testframework.ui.page.ProceedPage; +import org.keycloak.testframework.util.ApiUtil; import org.keycloak.tests.utils.MailUtils; import org.keycloak.tests.utils.admin.AdminEventPaths; -import org.keycloak.tests.utils.admin.ApiUtil; import org.hamcrest.Matchers; import org.junit.jupiter.api.Assertions; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/user/UserFedarationTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/user/UserFedarationTest.java index cd386c2ea3c..1288b55b6d3 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/user/UserFedarationTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/user/UserFedarationTest.java @@ -22,9 +22,10 @@ import org.keycloak.testframework.events.AdminEventAssertion; import org.keycloak.testframework.realm.UserConfigBuilder; import org.keycloak.testframework.server.KeycloakServerConfig; import org.keycloak.testframework.server.KeycloakServerConfigBuilder; +import org.keycloak.testframework.util.ApiUtil; import org.keycloak.tests.utils.Assert; +import org.keycloak.tests.utils.admin.AdminApiUtil; import org.keycloak.tests.utils.admin.AdminEventPaths; -import org.keycloak.tests.utils.admin.ApiUtil; import org.keycloak.testsuite.federation.UserMapStorageFactory; import org.junit.jupiter.api.Assertions; @@ -104,7 +105,7 @@ public class UserFedarationTest extends AbstractUserTest { String userId = ApiUtil.getCreatedId(managedRealm.admin().users().create(userRepresentation)); Assert.assertFalse(StorageId.isLocalStorage(userId)); - UserResource user = ApiUtil.findUserByUsernameId(managedRealm.admin(), username); + UserResource user = AdminApiUtil.findUserByUsernameId(managedRealm.admin(), username); List credentials = user.credentials(); Assertions.assertNotNull(credentials); Assertions.assertEquals(1, credentials.size()); diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/user/UserGroupTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/user/UserGroupTest.java index ecad1b111a6..eda68b570fd 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/user/UserGroupTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/user/UserGroupTest.java @@ -18,8 +18,8 @@ import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.events.AdminEventAssertion; import org.keycloak.testframework.realm.GroupConfigBuilder; import org.keycloak.testframework.realm.UserConfigBuilder; +import org.keycloak.testframework.util.ApiUtil; import org.keycloak.tests.utils.admin.AdminEventPaths; -import org.keycloak.tests.utils.admin.ApiUtil; import org.junit.jupiter.api.Test; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/user/UserRoleTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/user/UserRoleTest.java index c5c31164bfc..f891d888e3f 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/user/UserRoleTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/user/UserRoleTest.java @@ -23,8 +23,8 @@ import org.keycloak.testframework.realm.GroupConfigBuilder; import org.keycloak.testframework.realm.ManagedRealm; import org.keycloak.testframework.realm.RoleConfigBuilder; import org.keycloak.testframework.realm.UserConfigBuilder; +import org.keycloak.testframework.util.ApiUtil; import org.keycloak.tests.utils.admin.AdminEventPaths; -import org.keycloak.tests.utils.admin.ApiUtil; import org.junit.jupiter.api.Test; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/user/UserSearchTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/user/UserSearchTest.java index 9a09f6f0695..203b4583edd 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/user/UserSearchTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/user/UserSearchTest.java @@ -19,7 +19,7 @@ import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.representations.userprofile.config.UPConfig; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.realm.UserConfigBuilder; -import org.keycloak.tests.utils.admin.ApiUtil; +import org.keycloak.testframework.util.ApiUtil; import org.keycloak.userprofile.DefaultAttributes; import org.keycloak.userprofile.validator.UsernameProhibitedCharactersValidator; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/user/UserUpdateTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/user/UserUpdateTest.java index 704ccd9b0d2..679cfb51e83 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/user/UserUpdateTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/user/UserUpdateTest.java @@ -26,8 +26,8 @@ import org.keycloak.testframework.oauth.OAuthClient; import org.keycloak.testframework.oauth.annotations.InjectOAuthClient; import org.keycloak.testframework.realm.ManagedRealm; import org.keycloak.testframework.realm.UserConfigBuilder; +import org.keycloak.testframework.util.ApiUtil; import org.keycloak.tests.utils.admin.AdminEventPaths; -import org.keycloak.tests.utils.admin.ApiUtil; import org.keycloak.testsuite.util.AccountHelper; import org.junit.jupiter.api.Assertions; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/userstorage/AbstractUserStorageRestTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/userstorage/AbstractUserStorageRestTest.java index 191c32994ed..91c15a07db2 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/userstorage/AbstractUserStorageRestTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/userstorage/AbstractUserStorageRestTest.java @@ -10,7 +10,7 @@ import org.keycloak.testframework.annotations.InjectAdminEvents; import org.keycloak.testframework.annotations.InjectRealm; import org.keycloak.testframework.events.AdminEvents; import org.keycloak.testframework.realm.ManagedRealm; -import org.keycloak.tests.utils.admin.ApiUtil; +import org.keycloak.testframework.util.ApiUtil; import org.junit.jupiter.api.Assertions; diff --git a/tests/utils/pom.xml b/tests/utils/pom.xml index 184991040ad..79776da9537 100755 --- a/tests/utils/pom.xml +++ b/tests/utils/pom.xml @@ -44,6 +44,11 @@ + + org.keycloak.testframework + keycloak-test-framework-core + compile + org.keycloak.testframework keycloak-test-framework-remote-providers diff --git a/tests/utils/src/main/java/org/keycloak/tests/utils/KeyUtils.java b/tests/utils/src/main/java/org/keycloak/tests/utils/KeyUtils.java index 106f6945ffa..c732b5b20c3 100644 --- a/tests/utils/src/main/java/org/keycloak/tests/utils/KeyUtils.java +++ b/tests/utils/src/main/java/org/keycloak/tests/utils/KeyUtils.java @@ -34,7 +34,7 @@ import org.keycloak.keys.GeneratedEcdsaKeyProviderFactory; import org.keycloak.keys.KeyProvider; import org.keycloak.representations.idm.ComponentRepresentation; import org.keycloak.representations.idm.KeysMetadataRepresentation; -import org.keycloak.tests.utils.admin.ApiUtil; +import org.keycloak.testframework.util.ApiUtil; import org.junit.jupiter.api.Assertions; diff --git a/tests/utils/src/main/java/org/keycloak/tests/utils/admin/ApiUtil.java b/tests/utils/src/main/java/org/keycloak/tests/utils/admin/AdminApiUtil.java similarity index 96% rename from tests/utils/src/main/java/org/keycloak/tests/utils/admin/ApiUtil.java rename to tests/utils/src/main/java/org/keycloak/tests/utils/admin/AdminApiUtil.java index 73d7d15a14c..7706fb3de3e 100644 --- a/tests/utils/src/main/java/org/keycloak/tests/utils/admin/ApiUtil.java +++ b/tests/utils/src/main/java/org/keycloak/tests/utils/admin/AdminApiUtil.java @@ -39,26 +39,18 @@ import org.keycloak.representations.idm.ProtocolMapperRepresentation; import org.keycloak.representations.idm.RequiredActionProviderRepresentation; import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.representations.idm.UserRepresentation; +import org.keycloak.testframework.util.ApiUtil; import org.jboss.logging.Logger; -import org.junit.jupiter.api.Assertions; import static org.keycloak.representations.idm.CredentialRepresentation.PASSWORD; /** * @author Stan Silvert ssilvert@redhat.com (C) 2016 Red Hat Inc. */ -public class ApiUtil { +public class AdminApiUtil { - private static final Logger log = Logger.getLogger(ApiUtil.class); - - public static String getCreatedId(Response response) { - Assertions.assertEquals(201, response.getStatus()); - String path = response.getLocation().getPath(); - String createdId = path.substring(path.lastIndexOf('/') + 1); - response.close(); - return createdId; - } + private static final Logger log = Logger.getLogger(AdminApiUtil.class); public static ClientResource findClientResourceById(RealmResource realm, String id) { for (ClientRepresentation c : realm.clients().findAll()) { @@ -152,7 +144,7 @@ public class ApiUtil { */ public static String createUserWithAdminClient(RealmResource realm, UserRepresentation user) { Response response = realm.users().create(user); - String createdId = getCreatedId(response); + String createdId = ApiUtil.getCreatedId(response); response.close(); return createdId; }