From d8ebd3a2db9ed0d0a899ea50c080008ed15a6e70 Mon Sep 17 00:00:00 2001 From: stianst Date: Fri, 10 Apr 2026 12:33:08 +0200 Subject: [PATCH] Split ApiUtil into ApiUtil and AdminApiUtil in old testsuite Closes #47941 Signed-off-by: stianst --- .../testsuite/admin/AdminApiUtil.java | 311 ++++++++++++++++++ .../org/keycloak/testsuite/admin/ApiUtil.java | 304 ----------------- .../keycloak/testsuite/AbstractAuthTest.java | 8 +- ...stractChangeImportedUserPasswordsTest.java | 4 +- .../testsuite/AbstractClientTest.java | 5 +- .../testsuite/AbstractKeycloakTest.java | 8 +- ...ountRestServiceReadOnlyAttributesTest.java | 10 +- .../account/AccountRestServiceTest.java | 28 +- ...AccountRestServiceWithUserProfileTest.java | 6 +- ...ractAppInitiatedActionUpdateEmailTest.java | 12 +- ...AbstractRequiredActionUpdateEmailTest.java | 14 +- ...ppInitiatedActionDeleteCredentialTest.java | 3 +- .../AppInitiatedActionResetPasswordTest.java | 10 +- .../AppInitiatedActionTotpSetupTest.java | 6 +- ...ActionUpdateEmailWithVerificationTest.java | 4 +- .../AppInitiatedActionUpdateProfileTest.java | 12 +- .../AppInitiatedActionVerifyEmailTest.java | 6 +- .../actions/AppInitiatedRegistrationTest.java | 4 +- .../actions/DeleteAccountActionTest.java | 4 +- .../RequiredActionEmailVerificationTest.java | 6 +- .../actions/RequiredActionPriorityTest.java | 16 +- .../RequiredActionResetPasswordTest.java | 4 +- .../actions/RequiredActionTotpSetupTest.java | 10 +- ...onUpdateEmailTestWithVerificationTest.java | 14 +- .../RequiredActionUpdateProfileTest.java | 12 +- ...ctionUpdateProfileWithUserProfileTest.java | 10 +- .../AbstractSAMLAdapterClusteredTest.java | 4 +- .../SAMLLoginResponseHandlingTest.java | 4 +- .../servlet/SAMLServletAdapterTest.java | 14 +- .../authz/AuthzClientCredentialsTest.java | 4 +- .../testsuite/authz/RolePolicyTest.java | 6 +- .../broker/AbstractAdvancedBrokerTest.java | 2 +- .../broker/AbstractBaseBrokerTest.java | 4 +- .../broker/AbstractFirstBrokerLoginTest.java | 8 +- .../AbstractIdentityProviderMapperTest.java | 2 +- .../AbstractInitializedBaseBrokerTest.java | 6 +- .../AbstractKcOidcBrokerLogoutTest.java | 4 +- .../testsuite/broker/AccountLinkTest.java | 4 +- .../broker/BrokerWithLegacyIdTest.java | 2 +- .../broker/KcOIDCBrokerWithSignatureTest.java | 4 +- .../broker/KcOidcBrokerIdpLinkActionTest.java | 6 +- .../KcOidcBrokerPromptNoneRedirectTest.java | 6 +- .../testsuite/broker/KcOidcBrokerTest.java | 6 +- .../broker/KcOidcBrokerTokenExchangeTest.java | 6 +- .../KcOidcFirstBrokerLoginNewAuthTest.java | 4 +- .../broker/KcOidcFirstBrokerLoginTest.java | 2 +- .../broker/KcOidcPostBrokerLoginTest.java | 2 +- .../testsuite/client/AbstractFAPITest.java | 4 +- .../keycloak/testsuite/client/CIBATest.java | 92 +++--- .../ClientRegistrationPoliciesTest.java | 29 +- .../testsuite/client/MutualTLSClientTest.java | 4 +- .../client/OIDCClientRegistrationTest.java | 4 +- .../OIDCPairwiseClientRegistrationTest.java | 8 +- .../policies/AbstractClientPoliciesTest.java | 7 +- .../policies/ClientPoliciesExecutorTest.java | 12 +- .../ClientPoliciesExtendedEventTest.java | 2 +- .../client/policies/ClientPoliciesTest.java | 2 +- .../cluster/AbstractFailoverClusterTest.java | 4 +- .../cluster/GroupInvalidationClusterTest.java | 3 +- .../AbstractCompositeKeycloakTest.java | 4 +- .../composites/CompositeRoleTest.java | 22 +- .../testsuite/docker/DockerClientTest.java | 6 +- .../exportimport/ExportImportUtil.java | 22 +- .../AbstractKerberosSingleRealmTest.java | 2 +- .../kerberos/AbstractKerberosTest.java | 3 +- .../kerberos/KerberosStandaloneTest.java | 6 +- .../federation/ldap/LDAPAdminRestApiTest.java | 3 +- .../federation/ldap/LDAPMSADMapperTest.java | 20 +- .../ldap/LDAPPasswordModifyExtensionTest.java | 4 +- .../ldap/LDAPProvidersIntegrationTest.java | 17 +- .../federation/ldap/LDAPReadOnlyTest.java | 12 +- .../federation/ldap/LDAPUserProfileTest.java | 36 +- .../LDAPProvidersIntegrationNoImportTest.java | 6 +- .../federation/storage/ClientStorageTest.java | 2 +- .../storage/UserStorageOTPTest.java | 14 +- .../federation/storage/UserStorageTest.java | 39 +-- .../AltSubflowForCredentialResetTest.java | 4 +- .../testsuite/forms/BrowserButtonsTest.java | 4 +- .../testsuite/forms/BrowserFlowTest.java | 6 +- .../testsuite/forms/FlowOverrideTest.java | 4 +- .../forms/LevelOfAssuranceFlowTest.java | 30 +- .../keycloak/testsuite/forms/LoginTest.java | 5 +- .../forms/MultipleTabsLoginTest.java | 4 +- .../testsuite/forms/PasswordHashingTest.java | 6 +- .../testsuite/forms/ReAuthenticationTest.java | 6 +- .../RecoveryAuthnCodesAuthenticatorTest.java | 10 +- .../ResetCredentialsAlternativeFlowsTest.java | 4 +- .../testsuite/forms/ResetPasswordTest.java | 7 +- .../testsuite/forms/VerifyProfileTest.java | 6 +- .../migration/AbstractMigrationTest.java | 12 +- ...sTokenDuplicateEmailsNotCleanedUpTest.java | 2 +- .../oauth/AccessTokenDuplicateEmailsTest.java | 2 +- .../oauth/AccessTokenNoEmailLoginTest.java | 2 +- .../testsuite/oauth/AccessTokenTest.java | 25 +- .../oauth/BackchannelLogoutTest.java | 4 +- .../oauth/ClientAuthPostMethodTest.java | 6 +- .../oauth/ClientAuthSecretSignedJWTTest.java | 13 +- .../oauth/ClientAuthSignedJWTTest.java | 14 +- .../keycloak/testsuite/oauth/DPoPTest.java | 5 +- .../keycloak/testsuite/oauth/LogoutTest.java | 12 +- .../OAuth2DeviceAuthorizationGrantTest.java | 12 +- .../testsuite/oauth/OAuthGrantTest.java | 9 +- .../OAuthProofKeyForCodeExchangeTest.java | 6 +- .../oauth/OAuthScopeInTokenResponseTest.java | 5 +- .../oauth/OIDCProtocolMappersTest.java | 49 +-- .../oauth/RPInitiatedLogoutTest.java | 3 +- ...urceOwnerPasswordCredentialsGrantTest.java | 7 +- .../testsuite/oauth/ServiceAccountTest.java | 6 +- .../oauth/TokenIntrospectionTest.java | 6 +- .../keycloak/testsuite/oauth/hok/HoKTest.java | 6 +- .../keycloak/testsuite/oauth/par/ParTest.java | 16 +- .../testsuite/oauth/par/ParWithDPoPTest.java | 4 +- .../oauth/rar/DynamicScopesRARParseTest.java | 7 +- .../StandardTokenExchangeV1Test.java | 6 +- .../StandardTokenExchangeV2Test.java | 55 ++-- .../signing/OID4VCIssuerEndpointTest.java | 3 +- .../keycloak/testsuite/oidc/AudienceTest.java | 9 +- .../AuthorizationTokenEncryptionTest.java | 10 +- .../testsuite/oidc/IdTokenEncryptionTest.java | 10 +- .../oidc/LightWeightAccessTokenTest.java | 14 +- .../NonceBackwardsCompatibleMapperTest.java | 7 +- .../oidc/OIDCAdvancedRequestParamsTest.java | 50 +-- .../oidc/OIDCBackwardsCompatibilityTest.java | 8 +- .../testsuite/oidc/OIDCDynamicScopeTest.java | 9 +- .../testsuite/oidc/OIDCPublicClientTest.java | 4 +- .../testsuite/oidc/OIDCScopeTest.java | 21 +- .../keycloak/testsuite/oidc/UserInfoTest.java | 13 +- .../flows/AbstractOIDCResponseTypeTest.java | 6 +- .../account/OrganizationAccountTest.java | 4 +- .../OrganizationAuthenticationTest.java | 3 +- .../AbstractBrokerSelfRegistrationTest.java | 3 +- .../policy/PasswordAgePolicyTest.java | 4 +- .../script/DeployedScriptMapperTest.java | 2 +- ...ndeployedScriptMapperNotAvailableTest.java | 2 +- .../sessionlimits/UserSessionLimitsTest.java | 8 +- .../testsuite/ssl/TrustStoreEmailTest.java | 8 +- .../user/profile/UserProfileTest.java | 13 +- .../testsuite/util/ClientManager.java | 6 +- .../keycloak/testsuite/util/UserManager.java | 4 +- .../webauthn/AbstractWebAuthnVirtualTest.java | 4 +- ...itiatedActionWebAuthnSkipIfExistsTest.java | 6 +- .../AppInitiatedActionWebAuthnTest.java | 4 +- .../webauthn/WebAuthnIdlessTest.java | 4 +- .../PasskeysKcOidcFirstBrokerLoginTest.java | 8 +- .../PasskeysUsernameFormTest.java | 4 +- .../PasskeysUsernamePasswordFormTest.java | 4 +- .../registration/ResidentKeyRegisterTest.java | 4 +- 147 files changed, 1003 insertions(+), 966 deletions(-) create mode 100644 testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/admin/AdminApiUtil.java diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/admin/AdminApiUtil.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/admin/AdminApiUtil.java new file mode 100644 index 000000000000..8025569de45a --- /dev/null +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/admin/AdminApiUtil.java @@ -0,0 +1,311 @@ +package org.keycloak.testsuite.admin; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + +import jakarta.ws.rs.core.Response; + +import org.keycloak.admin.client.resource.AuthenticationManagementResource; +import org.keycloak.admin.client.resource.AuthorizationResource; +import org.keycloak.admin.client.resource.ClientResource; +import org.keycloak.admin.client.resource.ClientScopeResource; +import org.keycloak.admin.client.resource.GroupResource; +import org.keycloak.admin.client.resource.RealmResource; +import org.keycloak.admin.client.resource.RoleResource; +import org.keycloak.admin.client.resource.UserResource; +import org.keycloak.models.UserModel; +import org.keycloak.representations.idm.ClientRepresentation; +import org.keycloak.representations.idm.ClientScopeRepresentation; +import org.keycloak.representations.idm.CredentialRepresentation; +import org.keycloak.representations.idm.GroupRepresentation; +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.jboss.logging.Logger; + +import static org.keycloak.representations.idm.CredentialRepresentation.PASSWORD; + +public class AdminApiUtil { + + private static final Logger log = Logger.getLogger(ApiUtil.class); + + public static ClientResource findClientResourceById(RealmResource realm, String id) { + for (ClientRepresentation c : realm.clients().findAll()) { + if (c.getId().equals(id)) { + return realm.clients().get(c.getId()); + } + } + return null; + } + + public static ClientResource findClientResourceByClientId(RealmResource realm, String clientId) { + for (ClientRepresentation c : realm.clients().findAll()) { + if (c.getClientId().equals(clientId)) { + return realm.clients().get(c.getId()); + } + } + return null; + } + + public static ClientResource findClientResourceByName(RealmResource realm, String name) { + for (ClientRepresentation c : realm.clients().findAll()) { + if (name.equals(c.getName())) { + return realm.clients().get(c.getId()); + } + } + return null; + } + + public static ClientResource findClientByClientId(RealmResource realm, String clientId) { + for (ClientRepresentation c : realm.clients().findAll()) { + if (clientId.equals(c.getClientId())) { + return realm.clients().get(c.getId()); + } + } + return null; + } + + public static RoleResource findClientRoleByName(ClientResource client, String role) { + return client.roles().get(role); + } + + public static ProtocolMapperRepresentation findProtocolMapperByName(ClientResource client, String name) { + for (ProtocolMapperRepresentation p : client.getProtocolMappers().getMappers()) { + if (p.getName().equals(name)) { + return p; + } + } + return null; + } + + public static ProtocolMapperRepresentation findProtocolMapperByName(ClientScopeResource scope, String name) { + for (ProtocolMapperRepresentation p : scope.getProtocolMappers().getMappers()) { + if (p.getName().equals(name)) { + return p; + } + } + return null; + } + + public static ClientScopeResource findClientScopeByName(RealmResource realm, String clientScopeName) { + for (ClientScopeRepresentation clientScope : realm.clientScopes().findAll()) { + if (clientScopeName.equals(clientScope.getName())) { + return realm.clientScopes().get(clientScope.getId()); + } + } + return null; + } + + public static RoleResource findRealmRoleByName(RealmResource realm, String role) { + return realm.roles().get(role); + } + + public static UserRepresentation findUserByUsername(RealmResource realm, String username) { + UserRepresentation user = null; + List ur = realm.users().search(username, true); + if (ur.size() == 1) { + user = ur.get(0); + } + + if (ur.size() > 1) { // try to be more specific + for (UserRepresentation rep : ur) { + if (rep.getUsername().equalsIgnoreCase(username)) { + return rep; + } + } + } + + return user; + } + + public static UserResource findUserByUsernameId(RealmResource realm, String username) { + return realm.users().get(findUserByUsername(realm, username).getId()); + } + + /** + * Creates a user + * @param realm + * @param user + * @return ID of the new user + */ + public static String createUserWithAdminClient(RealmResource realm, UserRepresentation user) { + Response response = realm.users().create(user); + String createdId = ApiUtil.getCreatedId(response); + response.close(); + return createdId; + } + + /** + * Creates a user and sets the password + * @param realm + * @param user + * @param password + * @return ID of the new user + */ + public static String createUserAndResetPasswordWithAdminClient(RealmResource realm, UserRepresentation user, String password) { + return createUserAndResetPasswordWithAdminClient(realm, user, password, false); + } + + /** + * Creates a user and sets the password + * @param realm + * @param user + * @param password + * @param temporary + * @return ID of the new user + */ + public static String createUserAndResetPasswordWithAdminClient(RealmResource realm, UserRepresentation user, String password, boolean temporary) { + String id = createUserWithAdminClient(realm, user); + resetUserPassword(realm.users().get(id), password, temporary); + return id; + } + + public static void resetUserPassword(UserResource userResource, String newPassword, boolean temporary) { + CredentialRepresentation newCredential = new CredentialRepresentation(); + newCredential.setType(PASSWORD); + newCredential.setValue(newPassword); + newCredential.setTemporary(temporary); + userResource.resetPassword(newCredential); + } + + public static void assignRealmRoles(RealmResource realm, String userId, String... roles) { + String realmName = realm.toRepresentation().getRealm(); + + List roleRepresentations = new ArrayList<>(); + for (String roleName : roles) { + RoleRepresentation role = realm.roles().get(roleName).toRepresentation(); + roleRepresentations.add(role); + } + + UserResource userResource = realm.users().get(userId); + log.info("assigning roles " + Arrays.toString(roles) + " to user: \"" + + userResource.toRepresentation().getUsername() + "\" in realm: \"" + realmName + "\""); + userResource.roles().realmLevel().add(roleRepresentations); + } + + public static void removeUserByUsername(RealmResource realmResource, String username) { + UserRepresentation user = findUserByUsername(realmResource, username); + if (user != null) { + realmResource.users().delete(user.getId()); + } + } + + public static void assignClientRoles(RealmResource realm, String userId, String clientName, String... roles) { + String realmName = realm.toRepresentation().getRealm(); + String clientId = ""; + for (ClientRepresentation clientRepresentation : realm.clients().findAll()) { + if (clientRepresentation.getClientId().equals(clientName)) { + clientId = clientRepresentation.getId(); + } + } + + if (!clientId.isEmpty()) { + ClientResource clientResource = realm.clients().get(clientId); + + List roleRepresentations = new ArrayList<>(); + for (String roleName : roles) { + RoleRepresentation role = clientResource.roles().get(roleName).toRepresentation(); + roleRepresentations.add(role); + } + + UserResource userResource = realm.users().get(userId); + log.info("assigning role: " + Arrays.toString(roles) + " to user: \"" + + userResource.toRepresentation().getUsername() + "\" of client: \"" + + clientName + "\" in realm: \"" + realmName + "\""); + userResource.roles().clientLevel(clientId).add(roleRepresentations); + } else { + log.warn("client with name " + clientName + " doesn't exist in realm " + realmName); + } + } + + public static boolean groupContainsSubgroup(GroupResource groupsResource, GroupRepresentation subgroup) { + boolean contains = false; + for (GroupRepresentation sg : groupsResource.getSubGroups(null,null, true)) { + if (subgroup.getId().equals(sg.getId())) { + contains = true; + break; + } + } + return contains; + } + + public static AuthorizationResource findAuthorizationSettings(RealmResource realm, String clientId) { + for (ClientRepresentation c : realm.clients().findAll()) { + if (c.getClientId().equals(clientId)) { + return realm.clients().get(c.getId()).authorization(); + } + } + return null; + } + + /** + * Updates the order of required actions + * + * @param realmResource the realm + * @param requiredActionsInTargetOrder the required actions for which the order should be changed (order will be the + * order of this list) - can be a subset of the available required actions + * @see #updateRequiredActionsOrderByAlias(RealmResource, List) + */ + public static void updateRequiredActionsOrder(final RealmResource realmResource, + final List requiredActionsInTargetOrder) { + updateRequiredActionsOrderByAlias(realmResource, + requiredActionsInTargetOrder.stream().map(Enum::name).collect(Collectors.toList())); + } + + /** + * @see #updateRequiredActionsOrder(RealmResource, List) + */ + public static void updateRequiredActionsOrderByAlias(final RealmResource realmResource, + final List requiredActionsInTargetOrder) { + final var realmName = realmResource.toRepresentation().getRealm(); + final var initialRequiredActionsOrdered = realmResource.flows().getRequiredActions().stream() + .map(RequiredActionProviderRepresentation::getAlias).collect(Collectors.toList()); + log.infof("initial required actions order for realm '%s': %s", realmName, initialRequiredActionsOrdered); + log.infof("target order for realm '%s' (maybe partial): %s", realmName, requiredActionsInTargetOrder); + + final var requiredActionsToConfigureWithLowerPrio = new ArrayList<>(requiredActionsInTargetOrder); + for (final var requiredActionAlias : requiredActionsInTargetOrder) { + var allRequiredActionsOrdered = realmResource.flows().getRequiredActions().stream() + .map(RequiredActionProviderRepresentation::getAlias).collect(Collectors.toList()); + + requiredActionsToConfigureWithLowerPrio.remove(requiredActionAlias); + + final var currentIndex = allRequiredActionsOrdered.indexOf(requiredActionAlias); + if (currentIndex == -1) { + throw new IllegalStateException("Required action not found: " + requiredActionAlias); + } + + final var aliasOfCurrentlyFirstActionWithLowerTargetPrioOpt = allRequiredActionsOrdered.stream() + .filter(requiredActionsToConfigureWithLowerPrio::contains).findFirst(); + aliasOfCurrentlyFirstActionWithLowerTargetPrioOpt + .ifPresent(aliasOfCurrentlyFirstActionWithLowerTargetPrio -> { + final var indexOfCurrentlyFirstActionWithLowerTargetPrio = + allRequiredActionsOrdered.indexOf(aliasOfCurrentlyFirstActionWithLowerTargetPrio); + final var positionsToMoveCurrentActionUp = + Math.max(currentIndex - indexOfCurrentlyFirstActionWithLowerTargetPrio, 0); + if (positionsToMoveCurrentActionUp > 0) { + for (var i = 0; i < positionsToMoveCurrentActionUp; i++) { + realmResource.flows().raiseRequiredActionPriority(requiredActionAlias); + } + } + }); + } + + final var updatedRequiredActionsOrdered = realmResource.flows().getRequiredActions().stream() + .map(RequiredActionProviderRepresentation::getAlias).collect(Collectors.toList()); + log.infof("updated required actions order for realm '%s': %s", realmName, updatedRequiredActionsOrdered); + } + + public static void enableRequiredAction(RealmResource realm, UserModel.RequiredAction action, boolean enable) { + AuthenticationManagementResource authMgt = realm.flows(); + RequiredActionProviderRepresentation requiredAction = authMgt.getRequiredActions().stream() + .filter(a -> action.name().equals(a.getAlias())) + .findAny().orElseThrow(() -> new IllegalStateException("Required action not found: " + action.name())); + requiredAction.setEnabled(enable); + authMgt.updateRequiredAction(requiredAction.getAlias(), requiredAction); + } +} diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/admin/ApiUtil.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/admin/ApiUtil.java index ca5fdf002ad7..4cba643c42aa 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/admin/ApiUtil.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/admin/ApiUtil.java @@ -17,46 +17,17 @@ package org.keycloak.testsuite.admin; import java.net.URI; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; import jakarta.ws.rs.WebApplicationException; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.Status; import jakarta.ws.rs.core.Response.StatusType; -import org.keycloak.admin.client.resource.AuthenticationManagementResource; -import org.keycloak.admin.client.resource.AuthorizationResource; -import org.keycloak.admin.client.resource.ClientResource; -import org.keycloak.admin.client.resource.ClientScopeResource; -import org.keycloak.admin.client.resource.GroupResource; -import org.keycloak.admin.client.resource.RealmResource; -import org.keycloak.admin.client.resource.RoleResource; -import org.keycloak.admin.client.resource.UserResource; -import org.keycloak.models.UserModel; -import org.keycloak.models.UserModel.RequiredAction; -import org.keycloak.representations.idm.ClientRepresentation; -import org.keycloak.representations.idm.ClientScopeRepresentation; -import org.keycloak.representations.idm.CredentialRepresentation; -import org.keycloak.representations.idm.GroupRepresentation; -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.jboss.logging.Logger; - -import static org.keycloak.representations.idm.CredentialRepresentation.PASSWORD; - /** * @author Stan Silvert ssilvert@redhat.com (C) 2016 Red Hat Inc. */ public class ApiUtil { - private static final Logger log = Logger.getLogger(ApiUtil.class); - public static String getCreatedId(Response response) { URI location = response.getLocation(); if (!response.getStatusInfo().equals(Status.CREATED)) { @@ -73,279 +44,4 @@ public static String getCreatedId(Response response) { return path.substring(path.lastIndexOf('/') + 1); } - public static ClientResource findClientResourceById(RealmResource realm, String id) { - for (ClientRepresentation c : realm.clients().findAll()) { - if (c.getId().equals(id)) { - return realm.clients().get(c.getId()); - } - } - return null; - } - - public static ClientResource findClientResourceByClientId(RealmResource realm, String clientId) { - for (ClientRepresentation c : realm.clients().findAll()) { - if (c.getClientId().equals(clientId)) { - return realm.clients().get(c.getId()); - } - } - return null; - } - - public static ClientResource findClientResourceByName(RealmResource realm, String name) { - for (ClientRepresentation c : realm.clients().findAll()) { - if (name.equals(c.getName())) { - return realm.clients().get(c.getId()); - } - } - return null; - } - - public static ClientResource findClientByClientId(RealmResource realm, String clientId) { - for (ClientRepresentation c : realm.clients().findAll()) { - if (clientId.equals(c.getClientId())) { - return realm.clients().get(c.getId()); - } - } - return null; - } - - public static RoleResource findClientRoleByName(ClientResource client, String role) { - return client.roles().get(role); - } - - public static ProtocolMapperRepresentation findProtocolMapperByName(ClientResource client, String name) { - for (ProtocolMapperRepresentation p : client.getProtocolMappers().getMappers()) { - if (p.getName().equals(name)) { - return p; - } - } - return null; - } - - public static ProtocolMapperRepresentation findProtocolMapperByName(ClientScopeResource scope, String name) { - for (ProtocolMapperRepresentation p : scope.getProtocolMappers().getMappers()) { - if (p.getName().equals(name)) { - return p; - } - } - return null; - } - - public static ClientScopeResource findClientScopeByName(RealmResource realm, String clientScopeName) { - for (ClientScopeRepresentation clientScope : realm.clientScopes().findAll()) { - if (clientScopeName.equals(clientScope.getName())) { - return realm.clientScopes().get(clientScope.getId()); - } - } - return null; - } - - public static RoleResource findRealmRoleByName(RealmResource realm, String role) { - return realm.roles().get(role); - } - - public static UserRepresentation findUserByUsername(RealmResource realm, String username) { - UserRepresentation user = null; - List ur = realm.users().search(username, true); - if (ur.size() == 1) { - user = ur.get(0); - } - - if (ur.size() > 1) { // try to be more specific - for (UserRepresentation rep : ur) { - if (rep.getUsername().equalsIgnoreCase(username)) { - return rep; - } - } - } - - return user; - } - - public static UserResource findUserByUsernameId(RealmResource realm, String username) { - return realm.users().get(findUserByUsername(realm, username).getId()); - } - - /** - * Creates a user - * @param realm - * @param user - * @return ID of the new user - */ - public static String createUserWithAdminClient(RealmResource realm, UserRepresentation user) { - Response response = realm.users().create(user); - String createdId = getCreatedId(response); - response.close(); - return createdId; - } - - /** - * Creates a user and sets the password - * @param realm - * @param user - * @param password - * @return ID of the new user - */ - public static String createUserAndResetPasswordWithAdminClient(RealmResource realm, UserRepresentation user, String password) { - return createUserAndResetPasswordWithAdminClient(realm, user, password, false); - } - - /** - * Creates a user and sets the password - * @param realm - * @param user - * @param password - * @param temporary - * @return ID of the new user - */ - public static String createUserAndResetPasswordWithAdminClient(RealmResource realm, UserRepresentation user, String password, boolean temporary) { - String id = createUserWithAdminClient(realm, user); - resetUserPassword(realm.users().get(id), password, temporary); - return id; - } - - public static void resetUserPassword(UserResource userResource, String newPassword, boolean temporary) { - CredentialRepresentation newCredential = new CredentialRepresentation(); - newCredential.setType(PASSWORD); - newCredential.setValue(newPassword); - newCredential.setTemporary(temporary); - userResource.resetPassword(newCredential); - } - - public static void assignRealmRoles(RealmResource realm, String userId, String... roles) { - String realmName = realm.toRepresentation().getRealm(); - - List roleRepresentations = new ArrayList<>(); - for (String roleName : roles) { - RoleRepresentation role = realm.roles().get(roleName).toRepresentation(); - roleRepresentations.add(role); - } - - UserResource userResource = realm.users().get(userId); - log.info("assigning roles " + Arrays.toString(roles) + " to user: \"" - + userResource.toRepresentation().getUsername() + "\" in realm: \"" + realmName + "\""); - userResource.roles().realmLevel().add(roleRepresentations); - } - - public static void removeUserByUsername(RealmResource realmResource, String username) { - UserRepresentation user = findUserByUsername(realmResource, username); - if (user != null) { - realmResource.users().delete(user.getId()); - } - } - - public static void assignClientRoles(RealmResource realm, String userId, String clientName, String... roles) { - String realmName = realm.toRepresentation().getRealm(); - String clientId = ""; - for (ClientRepresentation clientRepresentation : realm.clients().findAll()) { - if (clientRepresentation.getClientId().equals(clientName)) { - clientId = clientRepresentation.getId(); - } - } - - if (!clientId.isEmpty()) { - ClientResource clientResource = realm.clients().get(clientId); - - List roleRepresentations = new ArrayList<>(); - for (String roleName : roles) { - RoleRepresentation role = clientResource.roles().get(roleName).toRepresentation(); - roleRepresentations.add(role); - } - - UserResource userResource = realm.users().get(userId); - log.info("assigning role: " + Arrays.toString(roles) + " to user: \"" - + userResource.toRepresentation().getUsername() + "\" of client: \"" - + clientName + "\" in realm: \"" + realmName + "\""); - userResource.roles().clientLevel(clientId).add(roleRepresentations); - } else { - log.warn("client with name " + clientName + " doesn't exist in realm " + realmName); - } - } - - public static boolean groupContainsSubgroup(GroupResource groupsResource, GroupRepresentation subgroup) { - boolean contains = false; - for (GroupRepresentation sg : groupsResource.getSubGroups(null,null, true)) { - if (subgroup.getId().equals(sg.getId())) { - contains = true; - break; - } - } - return contains; - } - - public static AuthorizationResource findAuthorizationSettings(RealmResource realm, String clientId) { - for (ClientRepresentation c : realm.clients().findAll()) { - if (c.getClientId().equals(clientId)) { - return realm.clients().get(c.getId()).authorization(); - } - } - return null; - } - - /** - * Updates the order of required actions - * - * @param realmResource the realm - * @param requiredActionsInTargetOrder the required actions for which the order should be changed (order will be the - * order of this list) - can be a subset of the available required actions - * @see #updateRequiredActionsOrderByAlias(RealmResource, List) - */ - public static void updateRequiredActionsOrder(final RealmResource realmResource, - final List requiredActionsInTargetOrder) { - updateRequiredActionsOrderByAlias(realmResource, - requiredActionsInTargetOrder.stream().map(Enum::name).collect(Collectors.toList())); - } - - /** - * @see #updateRequiredActionsOrder(RealmResource, List) - */ - public static void updateRequiredActionsOrderByAlias(final RealmResource realmResource, - final List requiredActionsInTargetOrder) { - final var realmName = realmResource.toRepresentation().getRealm(); - final var initialRequiredActionsOrdered = realmResource.flows().getRequiredActions().stream() - .map(RequiredActionProviderRepresentation::getAlias).collect(Collectors.toList()); - log.infof("initial required actions order for realm '%s': %s", realmName, initialRequiredActionsOrdered); - log.infof("target order for realm '%s' (maybe partial): %s", realmName, requiredActionsInTargetOrder); - - final var requiredActionsToConfigureWithLowerPrio = new ArrayList<>(requiredActionsInTargetOrder); - for (final var requiredActionAlias : requiredActionsInTargetOrder) { - var allRequiredActionsOrdered = realmResource.flows().getRequiredActions().stream() - .map(RequiredActionProviderRepresentation::getAlias).collect(Collectors.toList()); - - requiredActionsToConfigureWithLowerPrio.remove(requiredActionAlias); - - final var currentIndex = allRequiredActionsOrdered.indexOf(requiredActionAlias); - if (currentIndex == -1) { - throw new IllegalStateException("Required action not found: " + requiredActionAlias); - } - - final var aliasOfCurrentlyFirstActionWithLowerTargetPrioOpt = allRequiredActionsOrdered.stream() - .filter(requiredActionsToConfigureWithLowerPrio::contains).findFirst(); - aliasOfCurrentlyFirstActionWithLowerTargetPrioOpt - .ifPresent(aliasOfCurrentlyFirstActionWithLowerTargetPrio -> { - final var indexOfCurrentlyFirstActionWithLowerTargetPrio = - allRequiredActionsOrdered.indexOf(aliasOfCurrentlyFirstActionWithLowerTargetPrio); - final var positionsToMoveCurrentActionUp = - Math.max(currentIndex - indexOfCurrentlyFirstActionWithLowerTargetPrio, 0); - if (positionsToMoveCurrentActionUp > 0) { - for (var i = 0; i < positionsToMoveCurrentActionUp; i++) { - realmResource.flows().raiseRequiredActionPriority(requiredActionAlias); - } - } - }); - } - - final var updatedRequiredActionsOrdered = realmResource.flows().getRequiredActions().stream() - .map(RequiredActionProviderRepresentation::getAlias).collect(Collectors.toList()); - log.infof("updated required actions order for realm '%s': %s", realmName, updatedRequiredActionsOrdered); - } - - public static void enableRequiredAction(RealmResource realm, RequiredAction action, boolean enable) { - AuthenticationManagementResource authMgt = realm.flows(); - RequiredActionProviderRepresentation requiredAction = authMgt.getRequiredActions().stream() - .filter(a -> action.name().equals(a.getAlias())) - .findAny().orElseThrow(() -> new IllegalStateException("Required action not found: " + action.name())); - requiredAction.setEnabled(enable); - authMgt.updateRequiredAction(requiredAction.getAlias(), requiredAction); - } } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractAuthTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractAuthTest.java index ab2bfda107f7..a3a94cc231e4 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractAuthTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractAuthTest.java @@ -23,7 +23,7 @@ import org.keycloak.admin.client.resource.UserResource; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.auth.page.AuthRealm; import org.keycloak.testsuite.auth.page.login.OIDCLogin; import org.keycloak.testsuite.auth.page.login.SAMLPostLogin; @@ -34,8 +34,8 @@ import org.openqa.selenium.Cookie; import static org.keycloak.representations.idm.CredentialRepresentation.PASSWORD; -import static org.keycloak.testsuite.admin.ApiUtil.assignClientRoles; -import static org.keycloak.testsuite.admin.ApiUtil.createUserAndResetPasswordWithAdminClient; +import static org.keycloak.testsuite.admin.AdminApiUtil.assignClientRoles; +import static org.keycloak.testsuite.admin.AdminApiUtil.createUserAndResetPasswordWithAdminClient; import static org.keycloak.testsuite.admin.Users.setPasswordFor; import static org.keycloak.testsuite.auth.page.AuthRealm.TEST; @@ -99,7 +99,7 @@ public void createTestUserWithAdminClient(boolean setRealmRoles) { } public void createTestUserWithAdminClient(boolean setRealmRoles, String password) { - ApiUtil.removeUserByUsername(testRealmResource(), "test"); + AdminApiUtil.removeUserByUsername(testRealmResource(), "test"); log.debug("creating test user"); String id = createUserAndResetPasswordWithAdminClient(testRealmResource(), testUser, password); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractChangeImportedUserPasswordsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractChangeImportedUserPasswordsTest.java index b7db79ed4c94..c0758720e7cb 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractChangeImportedUserPasswordsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractChangeImportedUserPasswordsTest.java @@ -24,7 +24,7 @@ import org.keycloak.representations.idm.CredentialRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.junit.Before; @@ -71,7 +71,7 @@ public void configureTestRealm(RealmRepresentation testRealm) { } protected String changePassword(String username) { - UserResource userRes = ApiUtil.findUserByUsernameId(testRealm(), username); + UserResource userRes = AdminApiUtil.findUserByUsernameId(testRealm(), username); CredentialRepresentation credential = new CredentialRepresentation(); credential.setType(PasswordCredentialModel.TYPE); credential.setTemporary(Boolean.FALSE); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractClientTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractClientTest.java index 5cba799b9157..5c36e65f0c7d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractClientTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractClientTest.java @@ -27,6 +27,7 @@ import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.events.TestEventsListenerProviderFactory; import org.keycloak.testsuite.util.AdminEventPaths; @@ -116,11 +117,11 @@ protected ClientRepresentation findClientRepresentation(String name) { } protected ClientResource findClientResource(String name) { - return ApiUtil.findClientResourceByName(testRealmResource(), name); + return AdminApiUtil.findClientResourceByName(testRealmResource(), name); } protected ClientResource findClientResourceById(String id) { - return ApiUtil.findClientResourceByClientId(testRealmResource(), id); + return AdminApiUtil.findClientResourceByClientId(testRealmResource(), id); } } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractKeycloakTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractKeycloakTest.java index 26c80744eba9..5d8bb99f90b6 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractKeycloakTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractKeycloakTest.java @@ -58,7 +58,7 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.RequiredActionProviderRepresentation; import org.keycloak.representations.idm.UserRepresentation; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.arquillian.KcArquillian; import org.keycloak.testsuite.arquillian.SuiteContext; import org.keycloak.testsuite.arquillian.TestContext; @@ -556,18 +556,18 @@ public String createUser(String realm, String username, String password, String. UserRepresentation homer = createUserRepresentation(username, password); homer.setRequiredActions(Arrays.asList(requiredActions)); - return ApiUtil.createUserWithAdminClient(adminClient.realm(realm), homer); + return AdminApiUtil.createUserWithAdminClient(adminClient.realm(realm), homer); } public String createUser(String realm, String username, String password, String firstName, String lastName, String email, Consumer customizer) { UserRepresentation user = createUserRepresentation(username, email, firstName, lastName, true, password); customizer.accept(user); - return ApiUtil.createUserWithAdminClient(adminClient.realm(realm), user); + return AdminApiUtil.createUserWithAdminClient(adminClient.realm(realm), user); } public String createUser(String realm, String username, String password, String firstName, String lastName, String email) { UserRepresentation homer = createUserRepresentation(username, email, firstName, lastName, true, password); - return ApiUtil.createUserWithAdminClient(adminClient.realm(realm), homer); + return AdminApiUtil.createUserWithAdminClient(adminClient.realm(realm), homer); } public static UserRepresentation createUserRepresentation(String id, String username, String email, String firstName, String lastName, List groups, boolean enabled) { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceReadOnlyAttributesTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceReadOnlyAttributesTest.java index f0431315fcd7..b0574aebfb12 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceReadOnlyAttributesTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceReadOnlyAttributesTest.java @@ -36,7 +36,7 @@ import org.keycloak.representations.userprofile.config.UPConfig; import org.keycloak.representations.userprofile.config.UPConfig.UnmanagedAttributePolicy; import org.keycloak.services.messages.Messages; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.broker.util.SimpleHttpDefault; import org.keycloak.userprofile.UserProfileConstants; @@ -158,16 +158,16 @@ public void testUpdateProfileCannotUpdateReadOnlyAttributesUnmanagedEnabled() th }); testRealm().users().userProfile().update(configuration); UserRepresentation user = SimpleHttpDefault.doGet(getAccountUrl(null), httpClient).auth(tokenUtil.getToken()).asJson(UserRepresentation.class); - UserResource adminUserResource = ApiUtil.findUserByUsernameId(testRealm(), user.getUsername()); + UserResource adminUserResource = AdminApiUtil.findUserByUsernameId(testRealm(), user.getUsername()); org.keycloak.representations.idm.UserRepresentation adminUserRep = adminUserResource.toRepresentation(); adminUserRep.singleAttribute("deniedFoo", "foo"); adminUserResource.update(adminUserRep); - adminUserResource = ApiUtil.findUserByUsernameId(testRealm(), user.getUsername()); + adminUserResource = AdminApiUtil.findUserByUsernameId(testRealm(), user.getUsername()); adminUserRep = adminUserResource.toRepresentation(); assertEquals("foo", adminUserRep.getAttributes().get("deniedFoo").get(0)); assertNull(user.getAttributes()); updateAndGet(user); - adminUserResource = ApiUtil.findUserByUsernameId(testRealm(), user.getUsername()); + adminUserResource = AdminApiUtil.findUserByUsernameId(testRealm(), user.getUsername()); adminUserRep = adminUserResource.toRepresentation(); assertEquals("foo", adminUserRep.getAttributes().get("deniedFoo").get(0)); } @@ -189,7 +189,7 @@ private void testAccountUpdateAttributeExpectFailure(String attrName, boolean de UserResource adminUserResource = null; org.keycloak.representations.idm.UserRepresentation adminUserRep = null; try { - adminUserResource = ApiUtil.findUserByUsernameId(testRealm(), user.getUsername()); + adminUserResource = AdminApiUtil.findUserByUsernameId(testRealm(), user.getUsername()); adminUserRep = adminUserResource.toRepresentation(); adminUserRep.singleAttribute(attrName, "foo"); adminUserResource.update(adminUserRep); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceTest.java index 62bad5159b98..98d2ad836cf4 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceTest.java @@ -84,7 +84,7 @@ import org.keycloak.services.util.ResolveRelative; import org.keycloak.testsuite.AbstractAuthenticationTest; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.broker.util.SimpleHttpDefault; import org.keycloak.testsuite.util.TokenUtil; import org.keycloak.testsuite.util.UserBuilder; @@ -798,7 +798,7 @@ public void testCredentialsGet() throws IOException { @Test public void testCRUDCredentialOfDifferentUser() throws IOException { // Get credential ID of the OTP credential of the different user thant currently logged user - UserResource user = ApiUtil.findUserByUsernameId(testRealm(), "user-with-one-configured-otp"); + UserResource user = AdminApiUtil.findUserByUsernameId(testRealm(), "user-with-one-configured-otp"); CredentialRepresentation otpCredential = user.credentials().stream() .filter(credentialRep -> OTPCredentialModel.TYPE.equals(credentialRep.getType())) .findFirst() @@ -835,7 +835,7 @@ public void testRemoveCredentialWithNonOtpCredentialTriggeringNoEvent() throws I List credentials = getCredentials(); - UserResource user = ApiUtil.findUserByUsernameId(testRealm(), "test-user@localhost"); + UserResource user = AdminApiUtil.findUserByUsernameId(testRealm(), "test-user@localhost"); assertEquals(1, user.credentials().size()); // Add non-OTP credential to the user through admin REST API @@ -867,7 +867,7 @@ public void testRemoveCredentialWithOtpCredentialTriggeringEvent() throws IOExce List credentials = getCredentials(); - UserResource user = ApiUtil.findUserByUsernameId(testRealm(), "test-user@localhost"); + UserResource user = AdminApiUtil.findUserByUsernameId(testRealm(), "test-user@localhost"); assertEquals(1, user.credentials().size()); // Add OTP credential to the user through admin REST API @@ -976,7 +976,7 @@ public void testCredentialsGetWithDisabledOtpRequiredAction() throws IOException assertExpectedCredentialTypes(credentials, PasswordCredentialModel.TYPE); // Add OTP credential to the user through admin REST API - UserResource adminUserResource = ApiUtil.findUserByUsernameId(testRealm(), "test-user@localhost"); + UserResource adminUserResource = AdminApiUtil.findUserByUsernameId(testRealm(), "test-user@localhost"); org.keycloak.representations.idm.UserRepresentation userRep = UserBuilder.edit(adminUserResource.toRepresentation()) .totpSecret("abcdefabcdef") .build(); @@ -1064,7 +1064,7 @@ public void testCredentialsForUserWithoutPassword() throws IOException { } // Remove password from the user now - UserResource user = ApiUtil.findUserByUsernameId(testRealm(), "test-user@localhost"); + UserResource user = AdminApiUtil.findUserByUsernameId(testRealm(), "test-user@localhost"); for (CredentialRepresentation credential : user.credentials()) { if (PasswordCredentialModel.TYPE.equals(credential.getType())) { user.removeCredential(credential.getId()); @@ -1079,7 +1079,7 @@ public void testCredentialsForUserWithoutPassword() throws IOException { UserModel.RequiredAction.UPDATE_PASSWORD.toString(), null, false, 0); // Re-add the password to the user - ApiUtil.resetUserPassword(user, "password", false); + AdminApiUtil.resetUserPassword(user, "password", false); } @@ -1157,7 +1157,7 @@ public void testDeletionOfAllUserSessionsWillFireLogoutEvents() throws IOExcepti String password = "password"; String firstToken = new TokenUtil(username, password).getToken(); String secondToken = new TokenUtil(username, password).getToken(); - UserResource user = ApiUtil.findUserByUsernameId(testRealm(), username); + UserResource user = AdminApiUtil.findUserByUsernameId(testRealm(), username); List userSessions = user.getUserSessions(); assertEquals(2, userSessions.size()); @@ -1186,7 +1186,7 @@ public void testDeletionOfAllUserSessionsExceptTheCurrentWillFireLogoutEvents() String firstToken = new TokenUtil(username, password).getToken(); String secondToken = new TokenUtil(username, password).getToken(); String thirdToken = new TokenUtil(username, password).getToken(); - UserResource user = ApiUtil.findUserByUsernameId(testRealm(), username); + UserResource user = AdminApiUtil.findUserByUsernameId(testRealm(), username); List userSessions = user.getUserSessions(); assertEquals(3, userSessions.size()); @@ -1221,7 +1221,7 @@ public void testDeletionOfSpecificSessionWillFireLogoutEvent() throws IOExceptio String password = "password"; String firstToken = new TokenUtil(username, password).getToken(); String secondToken = new TokenUtil(username, password).getToken(); - UserResource user = ApiUtil.findUserByUsernameId(testRealm(), username); + UserResource user = AdminApiUtil.findUserByUsernameId(testRealm(), username); List userSessions = user.getUserSessions(); assertEquals(2, userSessions.size()); @@ -1249,7 +1249,7 @@ public void testDeletionOfSpecificSessionWillFireLogoutEvent() throws IOExceptio public void testListingAllSignedInDevicesEvenOfflineSessionsThenTerminatingAllSessions() throws IOException, JWSInputException { String username = "manage-account-access"; String password = "password"; - UserResource user = ApiUtil.findUserByUsernameId(testRealm(), username); + UserResource user = AdminApiUtil.findUserByUsernameId(testRealm(), username); // first direct access grant login String firstToken = new TokenUtil(username, password).getToken(); events.expect(EventType.LOGIN) @@ -1315,7 +1315,7 @@ public void testDeletionOfOfflineSessionWillFireLogoutEvent() throws IOException AccessTokenResponse offlineTokenResponse = oauth.doPasswordGrantRequest(username, password); assertNull(offlineTokenResponse.getErrorDescription()); - UserResource user = ApiUtil.findUserByUsernameId(testRealm(), username); + UserResource user = AdminApiUtil.findUserByUsernameId(testRealm(), username); Collection devices = SimpleHttpDefault .doGet(getAccountUrl("sessions/devices"), httpClient) .header("Accept", "application/json") @@ -2061,7 +2061,7 @@ public void testEmailWhenUpdateEmailEnabled() throws Exception { RealmRepresentation realm = testRealm().toRepresentation(); Boolean registrationEmailAsUsername = realm.isRegistrationEmailAsUsername(); Boolean editUsernameAllowed = realm.isEditUsernameAllowed(); - ApiUtil.enableRequiredAction(testRealm(), RequiredAction.UPDATE_EMAIL, true); + AdminApiUtil.enableRequiredAction(testRealm(), RequiredAction.UPDATE_EMAIL, true); try { realm.setRegistrationEmailAsUsername(true); @@ -2078,7 +2078,7 @@ public void testEmailWhenUpdateEmailEnabled() throws Exception { assertNotNull(user.getEmail()); assertUserProfileAttributeMetadata(user, "email", "${email}", true, true); } finally { - ApiUtil.enableRequiredAction(testRealm(), RequiredAction.UPDATE_EMAIL, false); + AdminApiUtil.enableRequiredAction(testRealm(), RequiredAction.UPDATE_EMAIL, false); realm.setRegistrationEmailAsUsername(registrationEmailAsUsername); realm.setEditUsernameAllowed(editUsernameAllowed); testRealm().update(realm); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceWithUserProfileTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceWithUserProfileTest.java index bc1c09d24eee..5870eb7e92df 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceWithUserProfileTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceWithUserProfileTest.java @@ -38,7 +38,7 @@ import org.keycloak.representations.userprofile.config.UPAttribute; import org.keycloak.representations.userprofile.config.UPAttributePermissions; import org.keycloak.representations.userprofile.config.UPConfig; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.broker.util.SimpleHttpDefault; import org.keycloak.testsuite.util.userprofile.UserProfileUtil; import org.keycloak.userprofile.UserProfileContext; @@ -177,7 +177,7 @@ public void testGetUserProfileMetadata_NoAccessToNameFields() throws IOException public void testUpdateEmailLink() throws Exception { RealmResource realm = adminClient.realm("test"); RealmRepresentation realmRep = realm.toRepresentation(); - ApiUtil.enableRequiredAction(realm, RequiredAction.UPDATE_EMAIL, true); + AdminApiUtil.enableRequiredAction(realm, RequiredAction.UPDATE_EMAIL, true); try { realmRep.setEditUsernameAllowed(false); @@ -195,7 +195,7 @@ public void testUpdateEmailLink() throws Exception { assertNotNull(user.getUserProfileMetadata()); assertThat(user.getUserProfileMetadata().getAttributeMetadata(UserModel.EMAIL).getAnnotations().get("kc.required.action.supported"), is(nullValue())); } finally { - ApiUtil.enableRequiredAction(realm, RequiredAction.UPDATE_EMAIL, false); + AdminApiUtil.enableRequiredAction(realm, RequiredAction.UPDATE_EMAIL, false); realmRep.setEditUsernameAllowed(true); realm.update(realmRep); } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AbstractAppInitiatedActionUpdateEmailTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AbstractAppInitiatedActionUpdateEmailTest.java index 754fefe2d924..6ed5196e5f15 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AbstractAppInitiatedActionUpdateEmailTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AbstractAppInitiatedActionUpdateEmailTest.java @@ -21,7 +21,7 @@ import org.keycloak.models.UserModel.RequiredAction; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.pages.EmailUpdatePage; import org.keycloak.testsuite.util.UserBuilder; @@ -46,18 +46,18 @@ public void configureTestRealm(RealmRepresentation testRealm) { @Before public void beforeTest() { - ApiUtil.removeUserByUsername(testRealm(), "test-user@localhost"); + AdminApiUtil.removeUserByUsername(testRealm(), "test-user@localhost"); UserRepresentation user = UserBuilder.create().enabled(true).username("test-user@localhost") .email("test-user@localhost").firstName("Tom").lastName("Brady").build(); prepareUser(user); - ApiUtil.createUserAndResetPasswordWithAdminClient(testRealm(), user, "password"); + AdminApiUtil.createUserAndResetPasswordWithAdminClient(testRealm(), user, "password"); - ApiUtil.removeUserByUsername(testRealm(), "john-doh@localhost"); + AdminApiUtil.removeUserByUsername(testRealm(), "john-doh@localhost"); user = UserBuilder.create().enabled(true).username("john-doh@localhost").email("john-doh@localhost").firstName("John") .lastName("Doh").build(); prepareUser(user); - ApiUtil.createUserAndResetPasswordWithAdminClient(testRealm(), user, "password"); - ApiUtil.enableRequiredAction(testRealm(), RequiredAction.UPDATE_EMAIL, true); + AdminApiUtil.createUserAndResetPasswordWithAdminClient(testRealm(), user, "password"); + AdminApiUtil.enableRequiredAction(testRealm(), RequiredAction.UPDATE_EMAIL, true); } private void setRegistrationEmailAsUsername(RealmResource realmResource, boolean enabled) { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AbstractRequiredActionUpdateEmailTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AbstractRequiredActionUpdateEmailTest.java index 6f71b3a6ee65..dcd09cbf2d17 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AbstractRequiredActionUpdateEmailTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AbstractRequiredActionUpdateEmailTest.java @@ -27,7 +27,7 @@ import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.auth.page.login.UpdateEmailPage; import org.keycloak.testsuite.pages.AppPage; @@ -75,8 +75,8 @@ public abstract class AbstractRequiredActionUpdateEmailTest extends AbstractTest @Before public void beforeTest() { - ApiUtil.enableRequiredAction(testRealm(), RequiredAction.UPDATE_EMAIL, true); - ApiUtil.removeUserByUsername(testRealm(), "test-user@localhost"); + AdminApiUtil.enableRequiredAction(testRealm(), RequiredAction.UPDATE_EMAIL, true); + AdminApiUtil.removeUserByUsername(testRealm(), "test-user@localhost"); UserRepresentation user = UserBuilder.create().enabled(true) .username("test-user@localhost") .email("test-user@localhost") @@ -84,9 +84,9 @@ public void beforeTest() { .lastName("Brady") .requiredAction(UserModel.RequiredAction.UPDATE_EMAIL.name()).build(); prepareUser(user); - ApiUtil.createUserAndResetPasswordWithAdminClient(testRealm(), user, "password"); + AdminApiUtil.createUserAndResetPasswordWithAdminClient(testRealm(), user, "password"); - ApiUtil.removeUserByUsername(testRealm(), "john-doh@localhost"); + AdminApiUtil.removeUserByUsername(testRealm(), "john-doh@localhost"); user = UserBuilder.create().enabled(true) .username("john-doh@localhost") .email("john-doh@localhost") @@ -94,7 +94,7 @@ public void beforeTest() { .lastName("Doh") .requiredAction(UserModel.RequiredAction.UPDATE_EMAIL.name()).build(); prepareUser(user); - ApiUtil.createUserAndResetPasswordWithAdminClient(testRealm(), user, "password"); + AdminApiUtil.createUserAndResetPasswordWithAdminClient(testRealm(), user, "password"); } private void setRegistrationEmailAsUsername(RealmResource realmResource, boolean enabled) { @@ -104,7 +104,7 @@ private void setRegistrationEmailAsUsername(RealmResource realmResource, boolean } protected void configureRequiredActionsToUser(String username, String... actions) { - UserResource userResource = ApiUtil.findUserByUsernameId(testRealm(), username); + UserResource userResource = AdminApiUtil.findUserByUsernameId(testRealm(), username); UserRepresentation userRepresentation = userResource.toRepresentation(); userRepresentation.setRequiredActions(Arrays.asList(actions)); userResource.update(userRepresentation); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionDeleteCredentialTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionDeleteCredentialTest.java index 9f459c44e8e0..1d3714224be3 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionDeleteCredentialTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionDeleteCredentialTest.java @@ -35,6 +35,7 @@ import org.keycloak.representations.idm.CredentialRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.pages.DeleteCredentialPage; import org.keycloak.testsuite.pages.ErrorPage; @@ -89,7 +90,7 @@ public void configureTestRealm(RealmRepresentation testRealm) { @Before public void beforeTest() { - ApiUtil.removeUserByUsername(testRealm(), "test-user@localhost"); + AdminApiUtil.removeUserByUsername(testRealm(), "test-user@localhost"); UserRepresentation user = UserBuilder.create() .username("john") .email("test-user@localhost") diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionResetPasswordTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionResetPasswordTest.java index 38c6d15c1968..ad32d01815a8 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionResetPasswordTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionResetPasswordTest.java @@ -40,7 +40,7 @@ import org.keycloak.representations.idm.UserSessionRepresentation; import org.keycloak.services.managers.AuthenticationSessionManager; import org.keycloak.services.resources.LoginActionsService; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.pages.LoginConfigTotpPage; import org.keycloak.testsuite.pages.LoginPasswordUpdatePage; import org.keycloak.testsuite.updaters.RealmAttributeUpdater; @@ -101,7 +101,7 @@ public void configureTestRealm(RealmRepresentation testRealm) { @After public void after() { - ApiUtil.resetUserPassword(testRealm().users().get(findUser("test-user@localhost").getId()), "password", false); + AdminApiUtil.resetUserPassword(testRealm().users().get(findUser("test-user@localhost").getId()), "password", false); // reset password required action max auth age back to default Optional passwordRequiredAction = testRealm().flows().getRequiredActions() @@ -114,7 +114,7 @@ public void after() { } // remove all required action from the user - UserResource user = ApiUtil.findUserByUsernameId(testRealm(), "test-user@localhost"); + UserResource user = AdminApiUtil.findUserByUsernameId(testRealm(), "test-user@localhost"); UserRepresentation userRepresentation = user.toRepresentation(); userRepresentation.setRequiredActions(Collections.emptyList()); user.update(userRepresentation); @@ -125,7 +125,7 @@ public void resetPassword() throws Exception { try (RealmAttributeUpdater realmUpdater = new RealmAttributeUpdater(testRealm()) .addEventsListener(EmailEventListenerProviderFactory.ID) .update(); - UserAttributeUpdater userUpdater = new UserAttributeUpdater(ApiUtil.findUserByUsernameId(testRealm(), "test-user@localhost")) + UserAttributeUpdater userUpdater = new UserAttributeUpdater(AdminApiUtil.findUserByUsernameId(testRealm(), "test-user@localhost")) .setEmailVerified(true) .update()) { @@ -357,7 +357,7 @@ public void cancelChangePassword() { @Test public void cancelWhenOTPRequiredAction() { // Add OTP required action to the user - UserResource user = ApiUtil.findUserByUsernameId(testRealm(), "test-user@localhost"); + UserResource user = AdminApiUtil.findUserByUsernameId(testRealm(), "test-user@localhost"); UserRepresentation userRep = user.toRepresentation(); UserBuilder.edit(userRep).requiredAction(UserModel.RequiredAction.CONFIGURE_TOTP.name()); user.update(userRep); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionTotpSetupTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionTotpSetupTest.java index be37d23c2b55..ecc82dbdee22 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionTotpSetupTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionTotpSetupTest.java @@ -36,7 +36,7 @@ import org.keycloak.representations.idm.RequiredActionProviderRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.pages.LoginConfigTotpPage; import org.keycloak.testsuite.pages.LoginTotpPage; import org.keycloak.testsuite.pages.RegisterPage; @@ -73,14 +73,14 @@ public void configureTestRealm(RealmRepresentation testRealm) { @Before public void setOTPAuthRequired() { - ApiUtil.removeUserByUsername(testRealm(), "test-user@localhost"); + AdminApiUtil.removeUserByUsername(testRealm(), "test-user@localhost"); UserRepresentation user = UserBuilder.create().enabled(true) .username("test-user@localhost") .email("test-user@localhost") .firstName("Tom") .lastName("Brady") .build(); - ApiUtil.createUserAndResetPasswordWithAdminClient(testRealm(), user, "password"); + AdminApiUtil.createUserAndResetPasswordWithAdminClient(testRealm(), user, "password"); } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionUpdateEmailWithVerificationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionUpdateEmailWithVerificationTest.java index 656f68884195..b07487447ddb 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionUpdateEmailWithVerificationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionUpdateEmailWithVerificationTest.java @@ -33,7 +33,7 @@ import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.arquillian.annotation.IgnoreBrowserDriver; import org.keycloak.testsuite.pages.ErrorPage; import org.keycloak.testsuite.pages.InfoPage; @@ -197,7 +197,7 @@ public void updateEmailWithRedirect() throws Exception { @Test @IgnoreBrowserDriver(value={ChromeDriver.class, FirefoxDriver.class}, negate=true) public void updateEmailWithVerificationBackToApplicationInCleanBrowserShouldTriggerAuth() throws Exception { - ClientRepresentation client = ApiUtil.findClientByClientId(adminClient.realm("test"), "test-app").toRepresentation(); + ClientRepresentation client = AdminApiUtil.findClientByClientId(adminClient.realm("test"), "test-app").toRepresentation(); String originalBaseUrl = client.getBaseUrl(); List originalRedirectUris = new ArrayList<>(client.getRedirectUris()); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionUpdateProfileTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionUpdateProfileTest.java index c08d3ac01a74..35f708da4a6f 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionUpdateProfileTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionUpdateProfileTest.java @@ -22,7 +22,7 @@ import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.pages.ErrorPage; import org.keycloak.testsuite.pages.LoginUpdateProfileEditUsernameAllowedPage; import org.keycloak.testsuite.util.UserBuilder; @@ -61,23 +61,23 @@ public void configureTestRealm(RealmRepresentation testRealm) { @Before public void beforeTest() { - ApiUtil.removeUserByUsername(testRealm(), "test-user@localhost"); + AdminApiUtil.removeUserByUsername(testRealm(), "test-user@localhost"); UserRepresentation user = UserBuilder.create().enabled(true) .username("test-user@localhost") .email("test-user@localhost") .firstName("Tom") .lastName("Brady") .build(); - ApiUtil.createUserAndResetPasswordWithAdminClient(testRealm(), user, "password"); + AdminApiUtil.createUserAndResetPasswordWithAdminClient(testRealm(), user, "password"); - ApiUtil.removeUserByUsername(testRealm(), "john-doh@localhost"); + AdminApiUtil.removeUserByUsername(testRealm(), "john-doh@localhost"); user = UserBuilder.create().enabled(true) .username("john-doh@localhost") .email("john-doh@localhost") .firstName("John") .lastName("Doh") .build(); - ApiUtil.createUserAndResetPasswordWithAdminClient(testRealm(), user, "password"); + AdminApiUtil.createUserAndResetPasswordWithAdminClient(testRealm(), user, "password"); } @Test @@ -368,7 +368,7 @@ public void updateProfileExpiredCookies() { String backToAppLink = errorPage.getBackToApplicationLink(); - ClientRepresentation client = ApiUtil.findClientByClientId(adminClient.realm("test"), "test-app").toRepresentation(); + ClientRepresentation client = AdminApiUtil.findClientByClientId(adminClient.realm("test"), "test-app").toRepresentation(); Assert.assertEquals(backToAppLink, client.getBaseUrl()); } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionVerifyEmailTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionVerifyEmailTest.java index db2ff2c3baae..042f9f80ffed 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionVerifyEmailTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionVerifyEmailTest.java @@ -19,7 +19,7 @@ import org.keycloak.models.UserModel; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.pages.ErrorPage; import org.keycloak.testsuite.pages.VerifyEmailPage; import org.keycloak.testsuite.util.UserBuilder; @@ -52,14 +52,14 @@ public void configureTestRealm(RealmRepresentation testRealm) { @Before public void beforeTest() { - ApiUtil.removeUserByUsername(testRealm(), "test-user@localhost"); + AdminApiUtil.removeUserByUsername(testRealm(), "test-user@localhost"); UserRepresentation user = UserBuilder.create().enabled(true) .username("test-user@localhost") .email("test-user@localhost") .firstName("Tom") .lastName("Brady") .build(); - ApiUtil.createUserAndResetPasswordWithAdminClient(testRealm(), user, "password"); + AdminApiUtil.createUserAndResetPasswordWithAdminClient(testRealm(), user, "password"); } @Test diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedRegistrationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedRegistrationTest.java index 44611fd13f91..9740f3732c57 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedRegistrationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedRegistrationTest.java @@ -5,7 +5,7 @@ import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.Assert; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.RegisterPage; @@ -27,7 +27,7 @@ public void configureTestRealm(RealmRepresentation testRealm) { @Before public void before() { - ApiUtil.removeUserByUsername(testRealm(), "test-user@localhost"); + AdminApiUtil.removeUserByUsername(testRealm(), "test-user@localhost"); } @Test diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/DeleteAccountActionTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/DeleteAccountActionTest.java index 7d5986a1e702..b489387d26b7 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/DeleteAccountActionTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/DeleteAccountActionTest.java @@ -16,7 +16,7 @@ import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.auth.page.login.DeleteAccountActionConfirmPage; import org.keycloak.testsuite.pages.ErrorPage; import org.keycloak.testsuite.pages.LoginPage; @@ -133,7 +133,7 @@ private void addDeleteAccountRoleToUserClientRoles() { private void addDeleteAccountRoleToUserClientRoles(String username) { UserRepresentation user = ActionUtil.findUserWithAdminClient(adminClient, username); - ApiUtil.assignClientRoles(adminClient.realm("test"), user.getId(), "account", AccountRoles.DELETE_ACCOUNT); + AdminApiUtil.assignClientRoles(adminClient.realm("test"), user.getId(), "account", AccountRoles.DELETE_ACCOUNT); } private void removeDeleteAccountRoleFromUserClientRoles() { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionEmailVerificationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionEmailVerificationTest.java index d5540fd5871b..6e8072b35c14 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionEmailVerificationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionEmailVerificationTest.java @@ -44,7 +44,7 @@ import org.keycloak.sessions.RootAuthenticationSessionModel; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.arquillian.AuthServerTestEnricher; import org.keycloak.testsuite.cluster.AuthenticationSessionFailoverClusterTest; import org.keycloak.testsuite.pages.AppPage; @@ -140,14 +140,14 @@ public void configureTestRealm(RealmRepresentation testRealm) { @Before public void before() { - ApiUtil.removeUserByUsername(testRealm(), "test-user@localhost"); + AdminApiUtil.removeUserByUsername(testRealm(), "test-user@localhost"); UserRepresentation user = UserBuilder.create().enabled(true) .username("test-user@localhost") .firstName("test-user") .lastName("test-user") .emailVerified(false) .email("test-user@localhost").build(); - testUserId = ApiUtil.createUserAndResetPasswordWithAdminClient(testRealm(), user, "password"); + testUserId = AdminApiUtil.createUserAndResetPasswordWithAdminClient(testRealm(), user, "password"); clearCooldownForUser(); } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionPriorityTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionPriorityTest.java index 006cf97a20af..37c7a002d977 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionPriorityTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionPriorityTest.java @@ -29,7 +29,7 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.AppPage.RequestType; import org.keycloak.testsuite.pages.LoginConfigTotpPage; @@ -103,7 +103,7 @@ public class RequiredActionPriorityTest extends AbstractTestRealmKeycloakTest { public void beforeEach() { setRequiredActionEnabled(TEST_REALM_NAME, TermsAndConditions.PROVIDER_ID, true, false); - testUserId = ApiUtil.findUserByUsernameId(testRealm(), USERNAME).toRepresentation().getId(); + testUserId = AdminApiUtil.findUserByUsernameId(testRealm(), USERNAME).toRepresentation().getId(); } @Override @@ -173,7 +173,7 @@ public void executeRequiredActionsWithCustomPriority() { RequiredAction.UPDATE_PROFILE, RequiredAction.TERMS_AND_CONDITIONS ); - ApiUtil.updateRequiredActionsOrder(testRealm(), requiredActionsCustomOrdered); + AdminApiUtil.updateRequiredActionsOrder(testRealm(), requiredActionsCustomOrdered); enableRequiredActionForUser(RequiredAction.UPDATE_PASSWORD); enableRequiredActionForUser(RequiredAction.UPDATE_PROFILE); @@ -223,7 +223,7 @@ public void executeRequiredActionsWithCustomPriorityAppliesSamePriorityToUserAct RequiredAction.UPDATE_PROFILE, RequiredAction.TERMS_AND_CONDITIONS ); - ApiUtil.updateRequiredActionsOrder(testRealm(), requiredActionsCustomOrdered); + AdminApiUtil.updateRequiredActionsOrder(testRealm(), requiredActionsCustomOrdered); enableRequiredActionForUser(RequiredAction.UPDATE_PASSWORD); // we don't enable UPDATE_PROFILE for the user, we set this as kc_action param instead @@ -276,7 +276,7 @@ public void executeLoginActionWithCustomPriorityAppliesSamePriorityToSessionAndU RequiredAction.UPDATE_PROFILE, RequiredAction.TERMS_AND_CONDITIONS ); - ApiUtil.updateRequiredActionsOrder(testRealm(), requiredActionsCustomOrdered); + AdminApiUtil.updateRequiredActionsOrder(testRealm(), requiredActionsCustomOrdered); // NOTE: we don't configure UPDATE_PASSWORD on the user - it's set on the session by the reset-password flow enableRequiredActionForUser(RequiredAction.UPDATE_PROFILE); @@ -338,7 +338,7 @@ public void executeRequiredActionWithCustomPriorityAppliesSamePriorityToSessionA RequiredAction.VERIFY_PROFILE, RequiredAction.TERMS_AND_CONDITIONS ); - ApiUtil.updateRequiredActionsOrder(testRealm(), requiredActionsCustomOrdered); + AdminApiUtil.updateRequiredActionsOrder(testRealm(), requiredActionsCustomOrdered); // make user profile invalid by setting lastName to empty final var userResource = testRealm().users().get(testUserId); @@ -390,7 +390,7 @@ public void setupTotpAfterUpdatePassword() { RequiredAction.UPDATE_PASSWORD, RequiredAction.CONFIGURE_TOTP ); - ApiUtil.updateRequiredActionsOrder(testRealm(), requiredActionsCustomOrdered); + AdminApiUtil.updateRequiredActionsOrder(testRealm(), requiredActionsCustomOrdered); // Login oauth.openLoginForm(); @@ -440,7 +440,7 @@ public void skipToNextRequiredActionWithCustomPriority() { RequiredAction.VERIFY_EMAIL, RequiredAction.UPDATE_PASSWORD ); - ApiUtil.updateRequiredActionsOrder(testRealm(), requiredActionsCustomOrdered); + AdminApiUtil.updateRequiredActionsOrder(testRealm(), requiredActionsCustomOrdered); // Login oauth.openLoginForm(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionResetPasswordTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionResetPasswordTest.java index c37948a68bc9..d0dd2419c104 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionResetPasswordTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionResetPasswordTest.java @@ -35,7 +35,7 @@ import org.keycloak.representations.idm.UserSessionRepresentation; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.AppPage.RequestType; import org.keycloak.testsuite.pages.LoginPage; @@ -97,7 +97,7 @@ public void configureTestRealm(RealmRepresentation testRealm) { @After public void after() { - ApiUtil.resetUserPassword(testRealm().users().get(findUser("test-user@localhost").getId()), "password", false); + AdminApiUtil.resetUserPassword(testRealm().users().get(findUser("test-user@localhost").getId()), "password", false); } @Test diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionTotpSetupTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionTotpSetupTest.java index 4964b7d30484..51db43b56581 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionTotpSetupTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionTotpSetupTest.java @@ -45,7 +45,7 @@ import org.keycloak.representations.idm.UserSessionRepresentation; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.AppPage.RequestType; import org.keycloak.testsuite.pages.LanguageComboboxAwarePage; @@ -121,7 +121,7 @@ private void setOTPAuthRequirement(AuthenticationExecutionModel.Requirement cond } private void configureRequiredActionsToUser(String username, String... actions) { - UserResource userResource = ApiUtil.findUserByUsernameId(testRealm(), username); + UserResource userResource = AdminApiUtil.findUserByUsernameId(testRealm(), username); UserRepresentation userRepresentation = userResource.toRepresentation(); userRepresentation.setRequiredActions(Arrays.asList(actions)); userResource.update(userRepresentation); @@ -129,14 +129,14 @@ private void configureRequiredActionsToUser(String username, String... actions) @Before public void setOTPAuthRequired() { - ApiUtil.removeUserByUsername(testRealm(), "test-user@localhost"); + AdminApiUtil.removeUserByUsername(testRealm(), "test-user@localhost"); UserRepresentation user = UserBuilder.create().enabled(true) .username("test-user@localhost") .email("test-user@localhost") .firstName("Tom") .lastName("Brady") .build(); - ApiUtil.createUserAndResetPasswordWithAdminClient(testRealm(), user, "password"); + AdminApiUtil.createUserAndResetPasswordWithAdminClient(testRealm(), user, "password"); } @@ -455,7 +455,7 @@ public void setupTotpEnforcedBySessionNotForUserInGeneral() { String configureTotp = UserModel.RequiredAction.CONFIGURE_TOTP.name(); // Remove required action from the user - UserResource user = ApiUtil.findUserByUsernameId(testRealm(), username); + UserResource user = AdminApiUtil.findUserByUsernameId(testRealm(), username); UserRepresentation userRepresentation = user.toRepresentation(); userRepresentation.getRequiredActions().remove(configureTotp); user.update(userRepresentation); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateEmailTestWithVerificationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateEmailTestWithVerificationTest.java index a7e3b083b78c..7c360909cea4 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateEmailTestWithVerificationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateEmailTestWithVerificationTest.java @@ -41,7 +41,7 @@ import org.keycloak.representations.idm.RequiredActionProviderRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.representations.idm.UserSessionRepresentation; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.broker.util.SimpleHttpDefault; import org.keycloak.testsuite.pages.ErrorPage; import org.keycloak.testsuite.pages.InfoPage; @@ -448,7 +448,7 @@ public void testForceEmailVerificationWithUpdateProfileAndExistingEmail() { .lastName("Brady") .requiredAction(UserModel.RequiredAction.UPDATE_PROFILE.name()) .build(); - ApiUtil.createUserAndResetPasswordWithAdminClient(testRealm(), user, "password"); + AdminApiUtil.createUserAndResetPasswordWithAdminClient(testRealm(), user, "password"); // Login and update profile (first and last name only, no email) oauth.openLoginForm(); @@ -463,7 +463,7 @@ public void testForceEmailVerificationWithUpdateProfileAndExistingEmail() { // Always restore original configuration testRealm().flows().updateRequiredActionConfig(UserModel.RequiredAction.UPDATE_EMAIL.name(), originalConfig); events.clear(); - ApiUtil.removeUserByUsername(testRealm(), "profile-test-user@localhost"); + AdminApiUtil.removeUserByUsername(testRealm(), "profile-test-user@localhost"); } } @@ -502,7 +502,7 @@ public void testEmailVerificationPendingMessageOnReAuthentication() throws Messa .lastName("Doe") .requiredAction(UserModel.RequiredAction.UPDATE_PROFILE.name()) .build(); - ApiUtil.createUserAndResetPasswordWithAdminClient(testRealm(), user, "password"); + AdminApiUtil.createUserAndResetPasswordWithAdminClient(testRealm(), user, "password"); oauth.openLoginForm(); loginPage.login("pendinguser", "password"); @@ -546,7 +546,7 @@ public void testEmailVerificationPendingMessageOnReAuthentication() throws Messa // Always restore original configuration and clean up testRealm().flows().updateRequiredActionConfig(UserModel.RequiredAction.UPDATE_EMAIL.name(), originalConfig); events.clear(); - ApiUtil.removeUserByUsername(testRealm(), "pendinguser"); + AdminApiUtil.removeUserByUsername(testRealm(), "pendinguser"); } } @@ -563,7 +563,7 @@ public void testPendingVerificationMessageWithRealmVerificationEnabled() throws .emailVerified(true) .requiredAction(UserModel.RequiredAction.UPDATE_EMAIL.name()) .build(); - ApiUtil.createUserAndResetPasswordWithAdminClient(testRealm(), user, "password"); + AdminApiUtil.createUserAndResetPasswordWithAdminClient(testRealm(), user, "password"); // Step 1: Login and change email (triggers verification due to realm verification setting) oauth.openLoginForm(); @@ -600,7 +600,7 @@ public void testPendingVerificationMessageWithRealmVerificationEnabled() throws } finally { // Clean up events.clear(); - ApiUtil.removeUserByUsername(testRealm(), "realmverifyuser"); + AdminApiUtil.removeUserByUsername(testRealm(), "realmverifyuser"); } } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateProfileTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateProfileTest.java index f9ee1c3e9d62..3520d9bf4354 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateProfileTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateProfileTest.java @@ -37,7 +37,7 @@ import org.keycloak.representations.userprofile.config.UPConfig; import org.keycloak.testsuite.AbstractChangeImportedUserPasswordsTest; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.arquillian.annotation.IgnoreBrowserDriver; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.AppPage.RequestType; @@ -94,7 +94,7 @@ public void configureTestRealm(RealmRepresentation testRealm) { @Before public void beforeTest() { - ApiUtil.removeUserByUsername(testRealm(), "test-user@localhost"); + AdminApiUtil.removeUserByUsername(testRealm(), "test-user@localhost"); UserRepresentation user = UserBuilder.create().enabled(true) .username("test-user@localhost") .email("test-user@localhost") @@ -102,9 +102,9 @@ public void beforeTest() { .lastName("Brady") .emailVerified(true) .requiredAction(UserModel.RequiredAction.UPDATE_PROFILE.name()).build(); - ApiUtil.createUserAndResetPasswordWithAdminClient(testRealm(), user, generatePassword("test-user@localhost")); + AdminApiUtil.createUserAndResetPasswordWithAdminClient(testRealm(), user, generatePassword("test-user@localhost")); - ApiUtil.removeUserByUsername(testRealm(), "john-doh@localhost"); + AdminApiUtil.removeUserByUsername(testRealm(), "john-doh@localhost"); user = UserBuilder.create().enabled(true) .username("john-doh@localhost") .email("john-doh@localhost") @@ -112,7 +112,7 @@ public void beforeTest() { .lastName("Doh") .emailVerified(true) .requiredAction(UserModel.RequiredAction.UPDATE_PROFILE.name()).build(); - ApiUtil.createUserAndResetPasswordWithAdminClient(testRealm(), user, generatePassword("john-doh@localhost")); + AdminApiUtil.createUserAndResetPasswordWithAdminClient(testRealm(), user, generatePassword("john-doh@localhost")); } @Test @@ -404,7 +404,7 @@ public void updateProfileExpiredCookies() { String backToAppLink = errorPage.getBackToApplicationLink(); - ClientRepresentation client = ApiUtil.findClientByClientId(adminClient.realm("test"), "test-app").toRepresentation(); + ClientRepresentation client = AdminApiUtil.findClientByClientId(adminClient.realm("test"), "test-app").toRepresentation(); Assert.assertEquals(backToAppLink, client.getBaseUrl()); } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateProfileWithUserProfileTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateProfileWithUserProfileTest.java index 5962f46fca40..a5fb73f1ab69 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateProfileWithUserProfileTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateProfileWithUserProfileTest.java @@ -28,7 +28,7 @@ import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.forms.RegisterWithUserProfileTest; import org.keycloak.testsuite.forms.VerifyProfileTest; import org.keycloak.testsuite.pages.AppPage; @@ -112,7 +112,7 @@ public void configureTestRealm(RealmRepresentation testRealm) { public void beforeTest() { UserProfileUtil.setUserProfileConfiguration(testRealm(), null); - ApiUtil.removeUserByUsername(testRealm(), "test-user@localhost"); + AdminApiUtil.removeUserByUsername(testRealm(), "test-user@localhost"); UserRepresentation user = UserBuilder.create().enabled(true) .username("test-user@localhost") .email("test-user@localhost") @@ -120,9 +120,9 @@ public void beforeTest() { .lastName("Brady") .emailVerified(true) .requiredAction(UserModel.RequiredAction.UPDATE_PROFILE.name()).build(); - ApiUtil.createUserAndResetPasswordWithAdminClient(testRealm(), user, "password"); + AdminApiUtil.createUserAndResetPasswordWithAdminClient(testRealm(), user, "password"); - ApiUtil.removeUserByUsername(testRealm(), "john-doh@localhost"); + AdminApiUtil.removeUserByUsername(testRealm(), "john-doh@localhost"); user = UserBuilder.create().enabled(true) .username("john-doh@localhost") .email("john-doh@localhost") @@ -130,7 +130,7 @@ public void beforeTest() { .lastName("Doh") .emailVerified(true) .requiredAction(UserModel.RequiredAction.UPDATE_PROFILE.name()).build(); - ApiUtil.createUserAndResetPasswordWithAdminClient(testRealm(), user, "password"); + AdminApiUtil.createUserAndResetPasswordWithAdminClient(testRealm(), user, "password"); } @Test diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/AbstractSAMLAdapterClusteredTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/AbstractSAMLAdapterClusteredTest.java index 60f60a92852d..db947b3ba1bd 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/AbstractSAMLAdapterClusteredTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/AbstractSAMLAdapterClusteredTest.java @@ -29,7 +29,7 @@ import org.keycloak.representations.idm.CredentialRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.adapter.page.EmployeeServletDistributable; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.arquillian.ContainerInfo; import org.keycloak.testsuite.util.Matchers; import org.keycloak.testsuite.util.SamlClient; @@ -156,7 +156,7 @@ private void delayedCheckLoggedOut(SamlClient samlClient, String url) { private void logoutViaAdminConsole() { RealmResource demoRealm = adminClient.realm(DEMO); - String bburkeId = ApiUtil.findUserByUsername(demoRealm, "bburke").getId(); + String bburkeId = AdminApiUtil.findUserByUsername(demoRealm, "bburke").getId(); demoRealm.users().get(bburkeId).logout(); log.infov("Logged out via admin console"); } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLLoginResponseHandlingTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLLoginResponseHandlingTest.java index f458c44fc450..ddfebb692d8e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLLoginResponseHandlingTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLLoginResponseHandlingTest.java @@ -23,7 +23,7 @@ import org.keycloak.testsuite.adapter.filter.AdapterActionsFilter; import org.keycloak.testsuite.adapter.page.Employee2Servlet; import org.keycloak.testsuite.adapter.page.EmployeeSigServlet; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.arquillian.annotation.AppServerContainer; import org.keycloak.testsuite.saml.AbstractSamlTest; import org.keycloak.testsuite.util.Matchers; @@ -138,7 +138,7 @@ public void testErrorHandlingSigned() throws Exception { @Test public void testAttributes() throws Exception { - ClientResource clientResource = ApiUtil.findClientResourceByClientId(testRealmResource(), AbstractSamlTest.SAML_CLIENT_ID_EMPLOYEE_2); + ClientResource clientResource = AdminApiUtil.findClientResourceByClientId(testRealmResource(), AbstractSamlTest.SAML_CLIENT_ID_EMPLOYEE_2); ProtocolMappersResource protocolMappersResource = clientResource.getProtocolMappers(); Map config = new LinkedHashMap<>(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLServletAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLServletAdapterTest.java index 62365d23ec53..a9d6519ffaa7 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLServletAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLServletAdapterTest.java @@ -157,7 +157,7 @@ import org.keycloak.testsuite.adapter.page.SalesPostSigPersistentServlet; import org.keycloak.testsuite.adapter.page.SalesPostSigServlet; import org.keycloak.testsuite.adapter.page.SalesPostSigTransientServlet; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.arquillian.annotation.AppServerContainer; import org.keycloak.testsuite.auth.page.login.Login; import org.keycloak.testsuite.auth.page.login.OneTimeCode; @@ -595,7 +595,7 @@ private void testSuccessfulAndUnauthorizedLogin(SAMLServlet page, Login loginPag @Test public void disabledClientTest() { - ClientResource clientResource = ApiUtil.findClientResourceByClientId(testRealmResource(), AbstractSamlTest.SAML_CLIENT_ID_SALES_POST_SIG); + ClientResource clientResource = AdminApiUtil.findClientResourceByClientId(testRealmResource(), AbstractSamlTest.SAML_CLIENT_ID_SALES_POST_SIG); ClientRepresentation client = clientResource.toRepresentation(); client.setEnabled(false); clientResource.update(client); @@ -1286,7 +1286,7 @@ public void testUserAttributeStatementMapperUserGroupsAggregate() throws Excepti group1.setAttributes(new HashMap<>()); group1.getAttributes().put("group-value", Arrays.asList("value1", "value2")); - ClientResource clientResource = ApiUtil.findClientResourceByClientId(testRealmResource(), AbstractSamlTest.SAML_CLIENT_ID_EMPLOYEE_2); + ClientResource clientResource = AdminApiUtil.findClientResourceByClientId(testRealmResource(), AbstractSamlTest.SAML_CLIENT_ID_EMPLOYEE_2); ProtocolMappersResource protocolMappersResource = clientResource.getProtocolMappers(); Map config = new LinkedHashMap<>(); @@ -1325,7 +1325,7 @@ public void testUserAttributeStatementMapperUserGroupsNoAggregate() throws Excep group1.setAttributes(new HashMap<>()); group1.getAttributes().put("group-value", Arrays.asList("value1", "value2")); - ClientResource clientResource = ApiUtil.findClientResourceByClientId(testRealmResource(), AbstractSamlTest.SAML_CLIENT_ID_EMPLOYEE_2); + ClientResource clientResource = AdminApiUtil.findClientResourceByClientId(testRealmResource(), AbstractSamlTest.SAML_CLIENT_ID_EMPLOYEE_2); ProtocolMappersResource protocolMappersResource = clientResource.getProtocolMappers(); Map config = new LinkedHashMap<>(); @@ -1368,7 +1368,7 @@ public void testUserAttributeStatementMapperGroupsAggregate() throws Exception { group2.setAttributes(new HashMap<>()); group2.getAttributes().put("group-value", Arrays.asList("value2", "value3")); - ClientResource clientResource = ApiUtil.findClientResourceByClientId(testRealmResource(), AbstractSamlTest.SAML_CLIENT_ID_EMPLOYEE_2); + ClientResource clientResource = AdminApiUtil.findClientResourceByClientId(testRealmResource(), AbstractSamlTest.SAML_CLIENT_ID_EMPLOYEE_2); ProtocolMappersResource protocolMappersResource = clientResource.getProtocolMappers(); Map config = new LinkedHashMap<>(); @@ -1412,7 +1412,7 @@ public void testUserAttributeStatementMapperGroupsNoAggregate() throws Exception group2.setAttributes(new HashMap<>()); group2.getAttributes().put("group-value", Arrays.asList("value2", "value3")); - ClientResource clientResource = ApiUtil.findClientResourceByClientId(testRealmResource(), AbstractSamlTest.SAML_CLIENT_ID_EMPLOYEE_2); + ClientResource clientResource = AdminApiUtil.findClientResourceByClientId(testRealmResource(), AbstractSamlTest.SAML_CLIENT_ID_EMPLOYEE_2); ProtocolMappersResource protocolMappersResource = clientResource.getProtocolMappers(); Map config = new LinkedHashMap<>(); @@ -1512,7 +1512,7 @@ public void testDOMAssertion() throws Exception { @Test public void spMetadataValidation() throws Exception { - ClientResource clientResource = ApiUtil.findClientResourceByClientId(testRealmResource(), AbstractSamlTest.SAML_CLIENT_ID_SALES_POST_SIG); + ClientResource clientResource = AdminApiUtil.findClientResourceByClientId(testRealmResource(), AbstractSamlTest.SAML_CLIENT_ID_SALES_POST_SIG); ClientRepresentation representation = clientResource.toRepresentation(); Client client = AdminClientUtil.createResteasyClient(); WebTarget target = client.target(authServerPage.toString() + "/admin/realms/" + SAMLSERVLETDEMO + "/clients/" + representation.getId() + "/installation/providers/saml-sp-descriptor"); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AuthzClientCredentialsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AuthzClientCredentialsTest.java index 2b1dbc7051a9..08feaaf7128d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AuthzClientCredentialsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AuthzClientCredentialsTest.java @@ -53,7 +53,7 @@ import org.keycloak.representations.idm.authorization.ResourcePermissionRepresentation; import org.keycloak.representations.idm.authorization.ResourceRepresentation; import org.keycloak.representations.idm.authorization.ResourceServerRepresentation; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.util.ClientBuilder; import org.keycloak.testsuite.util.RealmBuilder; import org.keycloak.testsuite.util.RolesBuilder; @@ -245,7 +245,7 @@ public void testReusingAccessAndRefreshTokens_refreshDisabled() throws Exception @Test public void testReusingAccessAndRefreshTokens_refreshEnabled() throws Exception { // Use userSessions and refresh tokens - ClientResource client = ApiUtil.findClientByClientId(getAdminClient().realm("authz-test-session"), "resource-server-test"); + ClientResource client = AdminApiUtil.findClientByClientId(getAdminClient().realm("authz-test-session"), "resource-server-test"); ClientRepresentation clientRepresentation = ClientBuilder.edit(client.toRepresentation()) .attribute(OIDCConfigAttributes.USE_REFRESH_TOKEN_FOR_CLIENT_CREDENTIALS_GRANT, "true") .build(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/RolePolicyTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/RolePolicyTest.java index 6d7b344b7280..487d3acb7af9 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/RolePolicyTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/RolePolicyTest.java @@ -38,7 +38,7 @@ import org.keycloak.representations.idm.authorization.ResourcePermissionRepresentation; import org.keycloak.representations.idm.authorization.ResourceRepresentation; import org.keycloak.representations.idm.authorization.RolePolicyRepresentation; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.util.ClientBuilder; import org.keycloak.testsuite.util.GroupBuilder; import org.keycloak.testsuite.util.RealmBuilder; @@ -175,7 +175,7 @@ public void testFetchRoles() { RealmResource realm = getRealm(); ClientsResource clients = realm.clients(); ClientRepresentation client = clients.findByClientId(authzClient.getConfiguration().getResource()).get(0); - ClientScopeRepresentation rolesScope = ApiUtil.findClientScopeByName(realm, OIDCLoginProtocolFactory.ROLES_SCOPE).toRepresentation(); + ClientScopeRepresentation rolesScope = AdminApiUtil.findClientScopeByName(realm, OIDCLoginProtocolFactory.ROLES_SCOPE).toRepresentation(); ClientResource clientResource = clients.get(client.getId()); clientResource.removeDefaultClientScope(rolesScope.getId()); getCleanup().addCleanup(() -> clientResource.addDefaultClientScope(rolesScope.getId())); @@ -199,7 +199,7 @@ public void testFetchRolesUsingServiceAccount() { RealmResource realm = getRealm(); ClientsResource clients = realm.clients(); ClientRepresentation client = clients.findByClientId(authzClient.getConfiguration().getResource()).get(0); - ClientScopeRepresentation rolesScope = ApiUtil.findClientScopeByName(realm, OIDCLoginProtocolFactory.ROLES_SCOPE).toRepresentation(); + ClientScopeRepresentation rolesScope = AdminApiUtil.findClientScopeByName(realm, OIDCLoginProtocolFactory.ROLES_SCOPE).toRepresentation(); ClientResource clientResource = clients.get(client.getId()); clientResource.removeDefaultClientScope(rolesScope.getId()); UserRepresentation serviceAccountUser = clientResource.getServiceAccountUser(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractAdvancedBrokerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractAdvancedBrokerTest.java index 487f2b9398f2..ec47d5d45c89 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractAdvancedBrokerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractAdvancedBrokerTest.java @@ -35,7 +35,7 @@ import org.junit.Test; import org.openqa.selenium.TimeoutException; -import static org.keycloak.testsuite.admin.ApiUtil.removeUserByUsername; +import static org.keycloak.testsuite.admin.AdminApiUtil.removeUserByUsername; import static org.keycloak.testsuite.broker.BrokerRunOnServerUtil.configurePostBrokerLoginWithOTP; import static org.keycloak.testsuite.broker.BrokerRunOnServerUtil.disablePostBrokerLoginFlow; import static org.keycloak.testsuite.broker.BrokerTestTools.getProviderRoot; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractBaseBrokerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractBaseBrokerTest.java index b1eaa9545cf7..dda4ebeab8d3 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractBaseBrokerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractBaseBrokerTest.java @@ -67,8 +67,8 @@ import org.openqa.selenium.By; import org.openqa.selenium.TimeoutException; -import static org.keycloak.testsuite.admin.ApiUtil.createUserWithAdminClient; -import static org.keycloak.testsuite.admin.ApiUtil.resetUserPassword; +import static org.keycloak.testsuite.admin.AdminApiUtil.createUserWithAdminClient; +import static org.keycloak.testsuite.admin.AdminApiUtil.resetUserPassword; import static org.keycloak.testsuite.broker.BrokerTestConstants.USER_EMAIL; import static org.keycloak.testsuite.broker.BrokerTestTools.encodeUrl; import static org.keycloak.testsuite.broker.BrokerTestTools.getConsumerRoot; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractFirstBrokerLoginTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractFirstBrokerLoginTest.java index 17608a5be622..c1124476e1e9 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractFirstBrokerLoginTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractFirstBrokerLoginTest.java @@ -28,7 +28,7 @@ import org.keycloak.storage.UserStorageProvider; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.federation.UserMapStorageFactory; import org.keycloak.testsuite.pages.LoginPasswordUpdatePage; import org.keycloak.testsuite.util.AccountHelper; @@ -51,7 +51,7 @@ import org.openqa.selenium.support.PageFactory; import static org.keycloak.storage.UserStorageProviderModel.IMPORT_ENABLED; -import static org.keycloak.testsuite.admin.ApiUtil.removeUserByUsername; +import static org.keycloak.testsuite.admin.AdminApiUtil.removeUserByUsername; import static org.keycloak.testsuite.broker.BrokerRunOnServerUtil.assertHardCodedSessionNote; import static org.keycloak.testsuite.broker.BrokerRunOnServerUtil.configureAutoLinkFlow; import static org.keycloak.testsuite.broker.BrokerRunOnServerUtil.configureConfirmOverrideLinkFlow; @@ -885,7 +885,7 @@ public void testLinkAccountModifyingEmailLinkingByEmailNotAllowed() { configureSMTPServer(); // change provider user email to changed@localhost.com - UserRepresentation userProvider = ApiUtil.findUserByUsername(providerRealm, bc.getUserLogin()); + UserRepresentation userProvider = AdminApiUtil.findUserByUsername(providerRealm, bc.getUserLogin()); userProvider.setEmail("changed@localhost.com"); providerRealm.users().get(userProvider.getId()).update(userProvider); @@ -1666,7 +1666,7 @@ public void testConfirmOverrideLink() { idpConfirmOverrideLinkPage.clickConfirmOverride(); // assert federated identity override - UserRepresentation user = ApiUtil.findUserByUsername(providerRealm, bc.getUserLogin()); + UserRepresentation user = AdminApiUtil.findUserByUsername(providerRealm, bc.getUserLogin()); String providerUserId = user.getId(); List federatedIdentities = consumerRealm.users().get(createdUser).getFederatedIdentity(); assertEquals(1, federatedIdentities.size()); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractIdentityProviderMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractIdentityProviderMapperTest.java index 8afc3bef3c67..6159d5b0d003 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractIdentityProviderMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractIdentityProviderMapperTest.java @@ -15,7 +15,7 @@ import org.junit.Before; -import static org.keycloak.testsuite.admin.ApiUtil.createUserAndResetPasswordWithAdminClient; +import static org.keycloak.testsuite.admin.AdminApiUtil.createUserAndResetPasswordWithAdminClient; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractInitializedBaseBrokerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractInitializedBaseBrokerTest.java index 69e0e44018b6..bbd40b00a841 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractInitializedBaseBrokerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractInitializedBaseBrokerTest.java @@ -27,8 +27,8 @@ import org.junit.Before; -import static org.keycloak.testsuite.admin.ApiUtil.createUserWithAdminClient; -import static org.keycloak.testsuite.admin.ApiUtil.resetUserPassword; +import static org.keycloak.testsuite.admin.AdminApiUtil.createUserWithAdminClient; +import static org.keycloak.testsuite.admin.AdminApiUtil.resetUserPassword; /** * @author Stan Silvert ssilvert@redhat.com (C) 2019 Red Hat Inc. @@ -75,4 +75,4 @@ protected void updateExecutions(BiConsumer config, Ident } } -} \ No newline at end of file +} diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerTest.java index ae535791d467..acc77588950d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerTest.java @@ -47,7 +47,7 @@ import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.services.managers.AuthenticationManager; import org.keycloak.testsuite.Assert; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.broker.util.SimpleHttpDefault; import org.keycloak.testsuite.util.AccountHelper; import org.keycloak.testsuite.util.WaitUtils; @@ -819,8 +819,8 @@ public void checkUpdatedEmailAttributeIdPSameValueDifferentCase() throws Excepti hardcodedEmail.getConfig().put(OIDCAttributeMapperHelper.INCLUDE_IN_ID_TOKEN, "true"); hardcodedEmail.getConfig().put(OIDCAttributeMapperHelper.INCLUDE_IN_USERINFO, "true"); hardcodedEmail.getConfig().put(HardcodedClaim.CLAIM_VALUE, EMAIL.toUpperCase()); - ClientScopeResource emailClientScope = ApiUtil.findClientScopeByName(providerRealmResource, "email"); - ProtocolMapperRepresentation emailMapper = ApiUtil.findProtocolMapperByName(emailClientScope, "email"); + ClientScopeResource emailClientScope = AdminApiUtil.findClientScopeByName(providerRealmResource, "email"); + ProtocolMapperRepresentation emailMapper = AdminApiUtil.findProtocolMapperByName(emailClientScope, "email"); emailClientScope.getProtocolMappers().delete(emailMapper.getId()); emailClientScope.getProtocolMappers().createMapper(hardcodedEmail).close(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerTokenExchangeTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerTokenExchangeTest.java index 3f21b8243264..2b99f2e06a16 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerTokenExchangeTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerTokenExchangeTest.java @@ -59,7 +59,7 @@ import org.keycloak.services.resources.admin.fgap.AdminPermissionManagement; import org.keycloak.services.resources.admin.fgap.AdminPermissions; import org.keycloak.testsuite.Assert; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.arquillian.annotation.EnableFeatures; import org.keycloak.testsuite.updaters.IdentityProviderAttributeUpdater; @@ -230,7 +230,7 @@ public void testWithLinkedFederationProviderTokenExchangeInternalToExternal(bool final RealmResource consumerRealm = realmsResouce().realm(bc.consumerRealmName()); final int expires = realmsResouce().realm(bc.providerRealmName()).toRepresentation().getAccessTokenLifespan(); - final ClientRepresentation brokerApp = ApiUtil.findClientByClientId(consumerRealm, "broker-app").toRepresentation(); + final ClientRepresentation brokerApp = AdminApiUtil.findClientByClientId(consumerRealm, "broker-app").toRepresentation(); logInAsUserInIDPForFirstTimeAndAssertSuccess(); final String code = oauth.parseLoginResponse().getCode(); @@ -416,7 +416,7 @@ private static void setupRealm(KeycloakSession session) { private void testInternalExternalTokenExchange() throws Exception { final RealmResource consumerRealm = realmsResouce().realm(bc.consumerRealmName()); final int expires = realmsResouce().realm(bc.providerRealmName()).toRepresentation().getAccessTokenLifespan(); - final ClientRepresentation brokerApp = ApiUtil.findClientByClientId(consumerRealm, "broker-app").toRepresentation(); + final ClientRepresentation brokerApp = AdminApiUtil.findClientByClientId(consumerRealm, "broker-app").toRepresentation(); logInAsUserInIDPForFirstTimeAndAssertSuccess(); final String code = oauth.parseLoginResponse().getCode(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcFirstBrokerLoginNewAuthTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcFirstBrokerLoginNewAuthTest.java index 38bb9406b5ed..0a2d91286b09 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcFirstBrokerLoginNewAuthTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcFirstBrokerLoginNewAuthTest.java @@ -6,7 +6,7 @@ import org.keycloak.models.utils.TimeBasedOTP; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.Assert; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.pages.PasswordPage; import org.keycloak.testsuite.pages.SelectAuthenticatorPage; import org.keycloak.testsuite.util.UserBuilder; @@ -194,7 +194,7 @@ public void testReAuthenticateWithPasswordOrOTP_otpConfigured_otpUsed() { private String addTOTPToUser(String username) { RealmResource realm = adminClient.realm(bc.consumerRealmName()); - UserResource user = ApiUtil.findUserByUsernameId(realm, username); + UserResource user = AdminApiUtil.findUserByUsernameId(realm, username); // Add CONFIGURE_TOTP requiredAction to the user UserRepresentation userRep = UserBuilder.edit(user.toRepresentation()).requiredAction(UserModel.RequiredAction.CONFIGURE_TOTP.toString()).build(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcFirstBrokerLoginTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcFirstBrokerLoginTest.java index 0e289017f2f5..741c83ff166b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcFirstBrokerLoginTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcFirstBrokerLoginTest.java @@ -35,7 +35,7 @@ import org.openqa.selenium.NoSuchElementException; import org.openqa.selenium.WebElement; -import static org.keycloak.testsuite.admin.ApiUtil.removeUserByUsername; +import static org.keycloak.testsuite.admin.AdminApiUtil.removeUserByUsername; import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_ALIAS; import static org.keycloak.testsuite.broker.BrokerTestConstants.USER_EMAIL; import static org.keycloak.testsuite.broker.BrokerTestTools.createIdentityProvider; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcPostBrokerLoginTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcPostBrokerLoginTest.java index 3a9f367e6f53..f736d291acbb 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcPostBrokerLoginTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcPostBrokerLoginTest.java @@ -45,7 +45,7 @@ import org.junit.Test; import static org.keycloak.models.utils.TimeBasedOTP.DEFAULT_INTERVAL_SECONDS; -import static org.keycloak.testsuite.admin.ApiUtil.removeUserByUsername; +import static org.keycloak.testsuite.admin.AdminApiUtil.removeUserByUsername; import static org.keycloak.testsuite.broker.BrokerRunOnServerUtil.configurePostBrokerLoginWithOTP; import static org.keycloak.testsuite.broker.BrokerTestTools.getConsumerRoot; import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/AbstractFAPITest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/AbstractFAPITest.java index 5efd7aabcfa1..d7a899b0eebf 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/AbstractFAPITest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/AbstractFAPITest.java @@ -43,7 +43,7 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.Assert; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.client.policies.AbstractClientPoliciesTest; import org.keycloak.testsuite.client.resources.TestOIDCEndpointsApplicationResource; import org.keycloak.testsuite.pages.AppPage; @@ -184,7 +184,7 @@ protected void assertSuccessfulTokenResponse(AccessTokenResponse tokenResponse) } protected void logoutUserAndRevokeConsent(String clientId, String username) { - UserResource user = ApiUtil.findUserByUsernameId(adminClient.realm(REALM_NAME), username); + UserResource user = AdminApiUtil.findUserByUsernameId(adminClient.realm(REALM_NAME), username); user.logout(); List> consents = user.getConsents(); org.junit.Assert.assertEquals(1, consents.size()); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/CIBATest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/CIBATest.java index a7b9a35dc322..dc5ebe4992be 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/CIBATest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/CIBATest.java @@ -72,7 +72,7 @@ import org.keycloak.services.clientpolicy.executor.HolderOfKeyEnforcerExecutorFactory; import org.keycloak.services.clientpolicy.executor.SecureSigningAlgorithmForSignedJwtExecutorFactory; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.client.policies.AbstractClientPoliciesTest; import org.keycloak.testsuite.client.resources.TestApplicationResourceUrls; import org.keycloak.testsuite.client.resources.TestOIDCEndpointsApplicationResource; @@ -214,10 +214,10 @@ public void testAttackerClientUseVictimAuthReqIdAttack() throws Exception { final String victimClientPassword = "password"; final String attackerClientPassword = TEST_CLIENT_PASSWORD; String victimClientAuthReqId = null; - victimClientResource = ApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), victimClientName); + victimClientResource = AdminApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), victimClientName); victimClientRep = victimClientResource.toRepresentation(); prepareCIBASettings(victimClientResource, victimClientRep); - attackerClientResource = ApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), attackerClientName); + attackerClientResource = AdminApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), attackerClientName); attackerClientRep = attackerClientResource.toRepresentation(); prepareCIBASettings(attackerClientResource, attackerClientRep); @@ -254,7 +254,7 @@ public void testAttackerClientUseAuthReqIdInCallbackEndpoint() throws Exception final String bindingMessage = "BASTION"; // prepare CIBA settings - clientResource = ApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); clientRep = clientResource.toRepresentation(); prepareCIBASettings(clientResource, clientRep); @@ -284,7 +284,7 @@ public void testAuthenticationChannelUnexpectedError() throws Exception { final String signal = "GODOWN"; // prepare CIBA settings - clientResource = ApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); clientRep = clientResource.toRepresentation(); prepareCIBASettings(clientResource, clientRep); oauth.scope(OAuth2Constants.OFFLINE_ACCESS); @@ -313,7 +313,7 @@ public void testBackchannelAuthnReqWithDeactivatedUser() throws Exception { final String username = "nutzername-deaktiviert"; // prepare CIBA settings - clientResource = ApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); clientRep = clientResource.toRepresentation(); prepareCIBASettings(clientResource, clientRep); oauth.scope(OAuth2Constants.OFFLINE_ACCESS); @@ -337,7 +337,7 @@ public void testBackchannelAuthnReqWithUnknownUser() throws Exception { final String bindingMessage = "BASTION"; // prepare CIBA settings - clientResource = ApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); clientRep = clientResource.toRepresentation(); prepareCIBASettings(clientResource, clientRep); oauth.scope(OAuth2Constants.OFFLINE_ACCESS); @@ -361,7 +361,7 @@ public void testBackchannelAuthnReqWithoutLoginHint() throws Exception { final String bindingMessage = "BASTION"; // prepare CIBA settings - clientResource = ApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); clientRep = clientResource.toRepresentation(); prepareCIBASettings(clientResource, clientRep); oauth.scope(OAuth2Constants.OFFLINE_ACCESS); @@ -382,7 +382,7 @@ public void testLoginHintTokenRequiredButNotSend() throws Exception { ClientRepresentation clientRep = null; try { final String username = "nutzername-schwarz"; - clientResource = ApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); clientRep = clientResource.toRepresentation(); prepareCIBASettings(clientResource, clientRep); RealmRepresentation rep = backupCIBAPolicy(); @@ -412,7 +412,7 @@ public void testBadBindingMessage() throws Exception { oauth.client(TEST_CLIENT_NAME, TEST_CLIENT_PASSWORD); final String username = "nutzername-schwarz"; - clientResource = ApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); clientRep = clientResource.toRepresentation(); prepareCIBASettings(clientResource, clientRep); @@ -455,7 +455,7 @@ public void testDifferentUserAuthenticated() throws Exception { final String bindingMessage = "BASTION"; // prepare CIBA settings - clientResource = ApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); clientRep = clientResource.toRepresentation(); prepareCIBASettings(clientResource, clientRep); oauth.scope(OAuth2Constants.OFFLINE_ACCESS); @@ -488,7 +488,7 @@ public void testTokenRevocation() throws Exception { final String bindingMessage = "BASTION"; // prepare CIBA settings - clientResource = ApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); clientRep = clientResource.toRepresentation(); prepareCIBASettings(clientResource, clientRep); oauth.scope(OAuth2Constants.OFFLINE_ACCESS); @@ -533,7 +533,7 @@ public void testChangeInterval() throws Exception { try { final String firstUsername = "nutzername-schwarz"; final String secondUsername = "nutzername-rot"; - clientResource = ApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); clientRep = clientResource.toRepresentation(); prepareCIBASettings(clientResource, clientRep); @@ -572,7 +572,7 @@ public void testAccessThrottling() throws Exception { final String bindingMessage = "BASTION"; // prepare CIBA settings - clientResource = ApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); clientRep = clientResource.toRepresentation(); prepareCIBASettings(clientResource, clientRep); RealmRepresentation rep = backupCIBAPolicy(); @@ -638,7 +638,7 @@ public void testTokenRequestAfterIntervalButNotYetAuthenticated() throws Excepti final String bindingMessage = "BASTION"; // prepare CIBA settings - clientResource = ApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); clientRep = clientResource.toRepresentation(); prepareCIBASettings(clientResource, clientRep); RealmRepresentation rep = backupCIBAPolicy(); @@ -769,7 +769,7 @@ public void testBackchannelClientValidations() throws Exception { ClientRepresentation clientRep = null; try { // prepare CIBA settings - clientResource = ApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); assertThat(clientResource, notNullValue()); clientRep = clientResource.toRepresentation(); @@ -838,7 +838,7 @@ public void testPingMode_requestWithInvalidClientNotificationShouldFail() throws ClientRepresentation clientRep = null; try { // prepare CIBA settings - clientResource = ApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); assertThat(clientResource, notNullValue()); clientRep = clientResource.toRepresentation(); @@ -873,7 +873,7 @@ public void testPingModeSuccess() throws Exception { additionalParameters.put("user_device", "mobile"); // prepare CIBA settings - clientResource = ApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); assertThat(clientResource, notNullValue()); clientRep = clientResource.toRepresentation(); @@ -939,7 +939,7 @@ public void testPingMode_clientNotificationSentEvenForUserCancel() throws Except final String username = "nutzername-rot"; // prepare CIBA settings - clientResource = ApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); assertThat(clientResource, notNullValue()); clientRep = clientResource.toRepresentation(); @@ -977,7 +977,7 @@ public void testMultipleUsersBackchannelAuthenticationFlows() throws Exception { final String secondUsername = "nutzername-rot"; String firstUserAuthReqId = null; String secondUserAuthReqId = null; - clientResource = ApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); clientRep = clientResource.toRepresentation(); prepareCIBASettings(clientResource, clientRep); @@ -1025,7 +1025,7 @@ public void testExplicitConsentRequiredBackchannelAuthenticationFlows() throws E final String clientName = "third-party"; // see testrealm.json : "consentRequired": true final String clientPassword = "password"; String clientAuthReqId = null; - clientResource = ApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), clientName); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), clientName); clientRep = clientResource.toRepresentation(); prepareCIBASettings(clientResource, clientRep); @@ -1072,13 +1072,13 @@ public void testMultipleClientsBackchannelAuthenticationFlows() throws Exception String firstClientAuthReqId = null; String secondClientAuthReqId = null; - firstClientResource = ApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), firstClientName); + firstClientResource = AdminApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), firstClientName); assertThat(firstClientResource, notNullValue()); firstClientRep = firstClientResource.toRepresentation(); prepareCIBASettings(firstClientResource, firstClientRep); - secondClientResource = ApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), secondClientName); + secondClientResource = AdminApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), secondClientName); assertThat(secondClientResource, notNullValue()); secondClientRep = secondClientResource.toRepresentation(); @@ -1132,13 +1132,13 @@ public void testVerifyHolderOfAuthenticationRequestRef() throws Exception { final String secondClientPassword = TEST_CLIENT_PASSWORD; String firstClientAuthReqId = null; - firstClientResource = ApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), firstClientName); + firstClientResource = AdminApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), firstClientName); assertThat(firstClientResource, notNullValue()); firstClientRep = firstClientResource.toRepresentation(); prepareCIBASettings(firstClientResource, firstClientRep); - secondClientResource = ApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), secondClientName); + secondClientResource = AdminApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), secondClientName); assertThat(secondClientResource, notNullValue()); secondClientRep = secondClientResource.toRepresentation(); @@ -1173,7 +1173,7 @@ public void testRequestTokenBeforeAuthenticationNotCompleted() throws Exception final String username = "nutzername-rot"; // prepare CIBA settings - clientResource = ApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); assertThat(clientResource, notNullValue()); clientRep = clientResource.toRepresentation(); @@ -1218,7 +1218,7 @@ public void testRequestTokenAfterAuthReqIdExpired() throws Exception { final String username = "nutzername-rot"; // prepare CIBA settings - clientResource = ApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); assertThat(clientResource, notNullValue()); clientRep = clientResource.toRepresentation(); @@ -1260,7 +1260,7 @@ public void testCallbackAfterAuthenticationRequestExpired() throws Exception { final String username = "nutzername-rot"; // prepare CIBA settings - clientResource = ApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); assertThat(clientResource, notNullValue()); clientRep = clientResource.toRepresentation(); @@ -1297,7 +1297,7 @@ public void testDuplicatedTokenRequestWithSameAuthReqId() throws Exception { final String username = "nutzername-gelb"; // prepare CIBA settings - clientResource = ApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); assertThat(clientResource, notNullValue()); clientRep = clientResource.toRepresentation(); @@ -1339,7 +1339,7 @@ public void testOtherClientSendTokenRequest() throws Exception { final String username = "nutzername-rot"; // prepare CIBA settings - clientResource = ApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); assertThat(clientResource, notNullValue()); clientRep = clientResource.toRepresentation(); @@ -1402,7 +1402,7 @@ public void testCibaGrantDeactivated() throws Exception { final String username = "nutzername-rot"; // prepare CIBA settings with ciba grant deactivated - clientResource = ApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); assertThat(clientResource, notNullValue()); clientRep = clientResource.toRepresentation(); @@ -1424,7 +1424,7 @@ public void testCibaGrantDeactivated() throws Exception { assertThat(response.getErrorDescription(), is("Client not allowed OIDC CIBA Grant")); // activate ciba grant - clientResource = ApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); assertThat(clientResource, notNullValue()); clientRep = clientResource.toRepresentation(); @@ -1447,7 +1447,7 @@ public void testCibaGrantDeactivated() throws Exception { doAuthenticationChannelCallback(authenticationChannelReq); // deactivate ciba grant - clientResource = ApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); assertThat(clientResource, notNullValue()); clientRep = clientResource.toRepresentation(); @@ -1576,7 +1576,7 @@ public void testBackchannelAuthenticationFlowWithInvalidSignedAuthenticationRequ String bindingMessage = "Flughafen-Frankfurt-am-Main"; // prepare CIBA settings - clientResource = ApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); clientRep = clientResource.toRepresentation(); prepareCIBASettings(clientResource, clientRep); @@ -1823,7 +1823,7 @@ private void testSecureCibaSessionEnforceExecutor(boolean useRequestUri) throws final String username = "nutzername-rot"; // prepare CIBA settings - clientResource = ApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); clientRep = clientResource.toRepresentation(); prepareCIBASettings(clientResource, clientRep); @@ -1923,7 +1923,7 @@ public void testExtendedClientPolicyInterfacesForBackchannelAuthenticationReques updatePolicies(json); // Add role to the client - ClientResource clientResource = ApiUtil.findClientByClientId(adminClient.realm(REALM_NAME), clientId); + ClientResource clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(REALM_NAME), clientId); clientResource.roles().create(RoleBuilder.create().name(roleName).build()); oauth.client(clientId, clientSecret); @@ -1987,7 +1987,7 @@ public void testExtendedClientPolicyInterfacesForBackchannelTokenRequest() throw updatePolicies(json); // Add role to the client - ClientResource clientResource = ApiUtil.findClientByClientId(adminClient.realm(REALM_NAME), clientId); + ClientResource clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(REALM_NAME), clientId); clientResource.roles().create(RoleBuilder.create().name(roleName).build()); oauth.client(clientId, clientSecret); @@ -2245,7 +2245,7 @@ public void testHolderOfKeyEnforceExecutor() throws Exception { additionalParameters.put("user_device", "mobile"); // prepare CIBA settings - clientResource = ApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); clientRep = clientResource.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setUseMtlsHoKToken(true); clientResource.update(clientRep); @@ -2298,7 +2298,7 @@ public void testHolderOfKeyEnforceExecutor() throws Exception { assertTrue(logoutResponse.isSuccess()); } finally { updatePolicies("{}"); - clientResource = ApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); clientRep = clientResource.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setUseMtlsHoKToken(false); clientResource.update(clientRep); @@ -2500,7 +2500,7 @@ public void testBackchannelAuthenticationFlowWithInvalidScope() throws Exception final String invalidScope = "not_exist_scope"; // prepare CIBA settings - clientResource = ApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); assertThat(clientResource, notNullValue()); clientRep = clientResource.toRepresentation(); @@ -2545,7 +2545,7 @@ private void testBackchannelAuthenticationFlowWithInvalidSignedAuthenticationReq oauth.client(clientId, clientSecret); // prepare CIBA settings - clientResource = ApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), clientId); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), clientId); clientRep = clientResource.toRepresentation(); prepareCIBASettings(clientResource, clientRep); @@ -2569,7 +2569,7 @@ protected void registerSharedInvalidAuthenticationRequest(AuthorizationEndpointR // Set required signature for request_uri // use and set jwks_url - ClientResource clientResource = ApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), clientId); + ClientResource clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), clientId); ClientRepresentation clientRep = clientResource.toRepresentation(); Map attr = Optional.ofNullable(clientRep.getAttributes()).orElse(new HashMap<>()); attr.put(CibaConfig.CIBA_BACKCHANNEL_AUTH_REQUEST_SIGNING_ALG, sigAlg); @@ -2606,7 +2606,7 @@ private void testBackchannelAuthenticationFlowWithSignedAuthenticationRequest(bo final String bindingMessage = "BASTION"; // prepare CIBA settings - clientResource = ApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); clientRep = clientResource.toRepresentation(); prepareCIBASettings(clientResource, clientRep); @@ -2684,7 +2684,7 @@ protected void registerSharedAuthenticationRequest(AuthorizationEndpointRequestO // Set required signature for request_uri // use and set jwks_url - ClientResource clientResource = ApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), clientId); + ClientResource clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), clientId); ClientRepresentation clientRep = clientResource.toRepresentation(); if (requestedSigAlg != null) { Map attr = Optional.ofNullable(clientRep.getAttributes()).orElse(new HashMap<>()); @@ -2726,7 +2726,7 @@ private void testAuthenticationChannelErrorCase(Status statusCallback, Status st final String username = "nutzername-rot"; // prepare CIBA settings - clientResource = ApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); assertThat(clientResource, notNullValue()); clientRep = clientResource.toRepresentation(); @@ -2973,7 +2973,7 @@ private void testBackchannelAuthenticationFlow(boolean isOfflineAccess, String b additionalParameters.put("user_device", "mobile"); // prepare CIBA settings - clientResource = ApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(TEST_REALM_NAME), TEST_CLIENT_NAME); assertThat(clientResource, notNullValue()); clientRep = clientResource.toRepresentation(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientRegistrationPoliciesTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientRegistrationPoliciesTest.java index ee61a0e83812..ee2009e768c2 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientRegistrationPoliciesTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientRegistrationPoliciesTest.java @@ -63,6 +63,7 @@ import org.keycloak.services.clientregistration.policy.impl.ProtocolMappersClientRegistrationPolicyFactory; import org.keycloak.services.clientregistration.policy.impl.TrustedHostClientRegistrationPolicyFactory; import org.keycloak.testsuite.Assert; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.util.JsonSerialization; @@ -263,7 +264,7 @@ public void testAnonConsentRequired() throws Exception { // Assert new client has consent required String clientId = client.getClientId(); - ClientRepresentation clientRep = ApiUtil.findClientByClientId(realmResource(), clientId).toRepresentation(); + ClientRepresentation clientRep = AdminApiUtil.findClientByClientId(realmResource(), clientId).toRepresentation(); Assert.assertTrue(clientRep.isConsentRequired()); // Try update with disabled consent required. Should fail @@ -283,7 +284,7 @@ public void testAnonFullScopeAllowed() throws Exception { // Assert new client has fullScopeAllowed disabled String clientId = client.getClientId(); - ClientRepresentation clientRep = ApiUtil.findClientByClientId(realmResource(), clientId).toRepresentation(); + ClientRepresentation clientRep = AdminApiUtil.findClientByClientId(realmResource(), clientId).toRepresentation(); Assert.assertFalse(clientRep.isFullScopeAllowed()); // Try update with disabled consent required. Should fail @@ -303,7 +304,7 @@ public void testClientDisabledPolicy() throws Exception { // Assert new client is enabled OIDCClientRepresentation client = create(); String clientId = client.getClientId(); - ClientRepresentation clientRep = ApiUtil.findClientByClientId(realmResource(), clientId).toRepresentation(); + ClientRepresentation clientRep = AdminApiUtil.findClientByClientId(realmResource(), clientId).toRepresentation(); Assert.assertTrue(clientRep.isEnabled()); // Add client-disabled policy @@ -320,7 +321,7 @@ public void testClientDisabledPolicy() throws Exception { // Assert new client is disabled client = create(); clientId = client.getClientId(); - clientRep = ApiUtil.findClientByClientId(realmResource(), clientId).toRepresentation(); + clientRep = AdminApiUtil.findClientByClientId(realmResource(), clientId).toRepresentation(); Assert.assertFalse(clientRep.isEnabled()); // Try enable client. Should fail @@ -466,7 +467,7 @@ public void testClientScopesPolicy() throws Exception { assertFail(ClientRegOp.UPDATE, registeredClient, 403, "Not permitted to use specified clientScope"); // Update client with the clientScope via Admin REST - ClientResource client = ApiUtil.findClientByClientId(realmResource(), "test-app"); + ClientResource client = AdminApiUtil.findClientByClientId(realmResource(), "test-app"); client.addDefaultClientScope(clientScopeId); // Now the update via clientRegistration is permitted too as scope was already set @@ -505,7 +506,7 @@ public void testClientScopesPolicyWithPermittedScope() throws Exception { Assert.assertNotNull(registeredClient.getRegistrationAccessToken()); // Revert client scope - ApiUtil.findClientResourceByClientId(realmResource(), "test-app").remove(); + AdminApiUtil.findClientResourceByClientId(realmResource(), "test-app").remove(); realmResource().clientScopes().get(clientScopeId).remove(); } @@ -542,7 +543,7 @@ public void testProtocolMappersCreate() throws Exception { assertFail(ClientRegOp.CREATE, clientRep, 403, "ProtocolMapper type not allowed"); // Revert policy change - ApiUtil.findClientResourceByClientId(realmResource(), "test-app").remove(); + AdminApiUtil.findClientResourceByClientId(realmResource(), "test-app").remove(); protocolMapperPolicyRep.getConfig().get(ProtocolMappersClientRegistrationPolicyFactory.ALLOWED_PROTOCOL_MAPPER_TYPES).remove(HardcodedRole.PROVIDER_ID); realmResource().components().component(protocolMapperPolicyRep.getId()).update(protocolMapperPolicyRep); } @@ -589,7 +590,7 @@ public void testProtocolMappersUpdate() throws Exception { reg.update(registeredClient); // Revert client - ApiUtil.findClientResourceByClientId(realmResource(), "test-app").remove(); + AdminApiUtil.findClientResourceByClientId(realmResource(), "test-app").remove(); } @Test @@ -610,7 +611,7 @@ public void passingAnAlreadyAssignedProtocolMapperWithDisallowedTypeDoesNotFail( reg.update(clientResource.toRepresentation()); // Revert client - ApiUtil.findClientResourceByClientId(realmResource(), "test-app").remove(); + AdminApiUtil.findClientResourceByClientId(realmResource(), "test-app").remove(); } @Test @@ -633,7 +634,7 @@ public void passingNewProtocolMapperOfDisallowedTypeInAdditionToAnAlreadyAssigne assertFail(ClientRegOp.UPDATE, representation, 403, "Missing id for mapper named 'Hardcoded foo role'"); // Revert client - ApiUtil.findClientResourceByClientId(realmResource(), "test-app").remove(); + AdminApiUtil.findClientResourceByClientId(realmResource(), "test-app").remove(); } @Test @@ -656,7 +657,7 @@ public void alteringAnAlreadyAssignedProtocolMappersConfigWithDisallowedTypeFail assertFail(ClientRegOp.UPDATE, representation, 403, "ProtocolMapper type not allowed"); // Revert client - ApiUtil.findClientResourceByClientId(realmResource(), "test-app").remove(); + AdminApiUtil.findClientResourceByClientId(realmResource(), "test-app").remove(); } @Test @@ -678,7 +679,7 @@ public void alteringAnAlreadyAssignedProtocolMappersIdWithDisallowedTypeFails() assertFail(ClientRegOp.UPDATE, representation, 403, "No existing mapper model found for id"); // Revert client - ApiUtil.findClientResourceByClientId(realmResource(), "test-app").remove(); + AdminApiUtil.findClientResourceByClientId(realmResource(), "test-app").remove(); } @Test @@ -692,7 +693,7 @@ public void testProtocolMappersConsentRequired() throws Exception { Assert.assertNull(registeredClient.getProtocolMappers()); // Revert - ApiUtil.findClientResourceByClientId(realmResource(), "test-app").remove(); + AdminApiUtil.findClientResourceByClientId(realmResource(), "test-app").remove(); } @@ -715,7 +716,7 @@ public void testProtocolMappersRemoveBuiltins() throws Exception { ProtocolMapperRepresentation hardcodedMapper = registeredClient.getProtocolMappers().get(0); // Revert - ApiUtil.findClientResourceByClientId(realmResource(), "test-app").remove(); + AdminApiUtil.findClientResourceByClientId(realmResource(), "test-app").remove(); protocolMapperPolicyRep.getConfig().get(ProtocolMappersClientRegistrationPolicyFactory.ALLOWED_PROTOCOL_MAPPER_TYPES).remove(HardcodedRole.PROVIDER_ID); realmResource().components().component(protocolMapperPolicyRep.getId()).update(protocolMapperPolicyRep); } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/MutualTLSClientTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/MutualTLSClientTest.java index 9602e729557c..a9cd0218ce55 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/MutualTLSClientTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/MutualTLSClientTest.java @@ -17,7 +17,7 @@ import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.util.KeycloakModelUtils; import org.keycloak.testsuite.util.MutualTLSUtils; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; @@ -218,7 +218,7 @@ private void testClientInvocationWithOBBClient(String expectedSubjectDN, boolean Supplier clientWithProperCertificate = MutualTLSUtils::newCloseableHttpClientWithOBBKeyStoreAndTrustStore; // Canonical - ClientResource client = ApiUtil.findClientByClientId(testRealm(), OBB_SUBJECT_DN_CLIENT_ID); + ClientResource client = AdminApiUtil.findClientByClientId(testRealm(), OBB_SUBJECT_DN_CLIENT_ID); ClientRepresentation clientRep = client.toRepresentation(); OIDCAdvancedConfigWrapper config = OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep); config.setTlsClientAuthSubjectDn(expectedSubjectDN); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/OIDCClientRegistrationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/OIDCClientRegistrationTest.java index 50d9a34ae600..9c66ed2cd020 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/OIDCClientRegistrationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/OIDCClientRegistrationTest.java @@ -53,7 +53,7 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.oidc.OIDCClientRepresentation; import org.keycloak.testsuite.Assert; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.util.KeycloakModelUtils; import org.keycloak.util.JsonSerialization; @@ -809,7 +809,7 @@ public void testTlsClientAuthSubjectDn() throws Exception { } private ClientRepresentation getKeycloakClient(String clientId) { - return ApiUtil.findClientByClientId(adminClient.realms().realm(REALM_NAME), clientId).toRepresentation(); + return AdminApiUtil.findClientByClientId(adminClient.realms().realm(REALM_NAME), clientId).toRepresentation(); } @Test diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/OIDCPairwiseClientRegistrationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/OIDCPairwiseClientRegistrationTest.java index 8cf3dd6dc56d..803d1f3c0479 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/OIDCPairwiseClientRegistrationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/OIDCPairwiseClientRegistrationTest.java @@ -43,7 +43,7 @@ import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.representations.oidc.OIDCClientRepresentation; import org.keycloak.testsuite.Assert; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.client.resources.TestApplicationResourceUrls; import org.keycloak.testsuite.client.resources.TestOIDCEndpointsApplicationResource; import org.keycloak.testsuite.util.AdminClientUtil; @@ -204,7 +204,7 @@ public void updateToPairwiseThroughAdminRESTFailure() throws Exception { String clientId = response.getClientId(); ProtocolMapperRepresentation pairwiseProtMapper = SHA256PairwiseSubMapper.createPairwiseMapper(sectorIdentifierUri, null); RealmResource realmResource = realmsResouce().realm("test"); - ClientResource clientResource = ApiUtil.findClientByClientId(realmsResouce().realm("test"), clientId); + ClientResource clientResource = AdminApiUtil.findClientByClientId(realmsResouce().realm("test"), clientId); Response resp = clientResource.getProtocolMappers().createMapper(pairwiseProtMapper); Assert.assertEquals(400, resp.getStatus()); @@ -493,7 +493,7 @@ public void addDefaultBasicClientScope(String clientId) { .filter(scope-> scope.getName().equals(OIDCLoginProtocolFactory.BASIC_SCOPE)) .findFirst() .ifPresent(scope-> { - ApiUtil.findClientResourceByClientId(adminClient.realm(REALM_NAME), clientId).addDefaultClientScope(scope.getId()); + AdminApiUtil.findClientResourceByClientId(adminClient.realm(REALM_NAME), clientId).addDefaultClientScope(scope.getId()); }); } @@ -503,7 +503,7 @@ public void removeDefaultBasicClientScope(String clientId) { .filter(scope-> scope.getName().equals(OIDCLoginProtocolFactory.BASIC_SCOPE)) .findFirst() .ifPresent(scope-> { - ApiUtil.findClientResourceByClientId(adminClient.realm(REALM_NAME), clientId).removeDefaultClientScope(scope.getId()); + AdminApiUtil.findClientResourceByClientId(adminClient.realm(REALM_NAME), clientId).removeDefaultClientScope(scope.getId()); }); } } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/AbstractClientPoliciesTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/AbstractClientPoliciesTest.java index 9f183c1a5ec4..a53bc0c01141 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/AbstractClientPoliciesTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/AbstractClientPoliciesTest.java @@ -125,6 +125,7 @@ import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AssertEvents; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.client.resources.TestApplicationResourceUrls; import org.keycloak.testsuite.client.resources.TestOIDCEndpointsApplicationResource; @@ -168,7 +169,7 @@ import org.junit.Before; import org.junit.Rule; -import static org.keycloak.testsuite.admin.ApiUtil.findUserByUsername; +import static org.keycloak.testsuite.admin.AdminApiUtil.findUserByUsername; import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientAccessTypeConditionConfig; import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientRolesConditionConfig; import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientScopesConditionConfig; @@ -620,7 +621,7 @@ protected AuthorizationEndpointRequestObject createValidRequestObjectForSecureRe protected void registerRequestObject(AuthorizationEndpointRequestObject requestObject, String clientId, String sigAlg, boolean isUseRequestUri) throws IOException { // Set required signature for request_uri // use and set jwks_url - ClientResource clientResource = ApiUtil.findClientByClientId(adminClient.realm(REALM_NAME), clientId); + ClientResource clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(REALM_NAME), clientId); assert clientResource != null; ClientRepresentation clientRep = clientResource.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setRequestObjectSignatureAlg(sigAlg); @@ -1142,7 +1143,7 @@ protected String signRequestObject(AuthorizationEndpointRequestObject requestObj TestOIDCEndpointsApplicationResource client = testingClient.testApp().oidcClientEndpoints(); // use and set jwks_url - ClientResource clientResource = ApiUtil.findClientByClientId(adminClient.realm(oauth.getRealm()), oauth.getClientId()); + ClientResource clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(oauth.getRealm()), oauth.getClientId()); assert clientResource != null; ClientRepresentation clientRep = clientResource.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setUseJwksUrl(true); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/ClientPoliciesExecutorTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/ClientPoliciesExecutorTest.java index 5ca41c5e1741..1fa5cdd7e554 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/ClientPoliciesExecutorTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/ClientPoliciesExecutorTest.java @@ -88,7 +88,7 @@ import org.keycloak.services.clientpolicy.executor.SecureSessionEnforceExecutorFactory; import org.keycloak.services.clientpolicy.executor.SecureSigningAlgorithmExecutorFactory; import org.keycloak.services.clientpolicy.executor.SecureSigningAlgorithmForSignedJwtExecutorFactory; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.client.resources.TestApplicationResourceUrls; import org.keycloak.testsuite.client.resources.TestOIDCEndpointsApplicationResource; @@ -260,7 +260,7 @@ public void testSecureClientAuthenticatorDuringLogin() throws Exception { successfulLoginAndLogout(clientId, "secret"); // Add role to the client - ClientResource clientResource = ApiUtil.findClientByClientId(adminClient.realm(REALM_NAME), clientId); + ClientResource clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(REALM_NAME), clientId); assert clientResource != null; ClientRepresentation clientRep = clientResource.toRepresentation(); Assert.assertEquals(ClientIdAndSecretAuthenticator.PROVIDER_ID, clientRep.getClientAuthenticatorType()); @@ -1418,7 +1418,7 @@ public void testSecureSigningAlgorithmForSignedJwtEnforceExecutorWithSecureAlg() adminClient.realm(REALM_NAME).clients().get(cid).roles().create(RoleBuilder.create().name(roleCommonName).build()); - ClientResource clientResource = ApiUtil.findClientByClientId(adminClient.realm(REALM_NAME), clientId); + ClientResource clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(REALM_NAME), clientId); assert clientResource != null; ClientRepresentation clientRep = clientResource.toRepresentation(); @@ -1509,7 +1509,7 @@ public void testSecureSigningAlgorithmForSignedJwtEnforceExecutorWithNotSecureAl adminClient.realm(REALM_NAME).clients().get(cid).roles().create(RoleBuilder.create().name(roleAlphaName).build()); adminClient.realm(REALM_NAME).clients().get(cid).roles().create(RoleBuilder.create().name(roleCommonName).build()); - ClientResource clientResource = ApiUtil.findClientByClientId(adminClient.realm(REALM_NAME), clientId); + ClientResource clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(REALM_NAME), clientId); assert clientResource != null; ClientRepresentation clientRep = clientResource.toRepresentation(); @@ -1740,7 +1740,7 @@ public void testSecureClientAuthenticationAssertionExecutor() throws Exception { String clientId = generateSuffixedName(CLIENT_NAME); createClientByAdmin(clientId, (ClientRepresentation clientRep) -> clientRep.setClientAuthenticatorType(JWTClientAuthenticator.PROVIDER_ID)); - ClientResource clientResource = ApiUtil.findClientByClientId(adminClient.realm(REALM_NAME), clientId); + ClientResource clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(REALM_NAME), clientId); assert clientResource != null; ClientRepresentation clientRep = clientResource.toRepresentation(); @@ -1787,7 +1787,7 @@ public void testSecureClientAuthenticationAssertionExecutor() throws Exception { assertEquals(400, tokenResponse.getStatusCode()); // Send a token request with valid 'aud' . Should succeed - UserResource user = ApiUtil.findUserByUsernameId(adminClient.realm(REALM_NAME), TEST_USER_NAME); + UserResource user = AdminApiUtil.findUserByUsernameId(adminClient.realm(REALM_NAME), TEST_USER_NAME); user.logout(); loginResponse = oauth.loginForm().doLogin(TEST_USER_NAME, TEST_USER_PASSWORD); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/ClientPoliciesExtendedEventTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/ClientPoliciesExtendedEventTest.java index 5b82c2b45f4d..11da5ec4fe77 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/ClientPoliciesExtendedEventTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/ClientPoliciesExtendedEventTest.java @@ -69,7 +69,7 @@ import org.junit.Test; import static org.keycloak.testsuite.AbstractAdminTest.loadJson; -import static org.keycloak.testsuite.admin.ApiUtil.findUserByUsername; +import static org.keycloak.testsuite.admin.AdminApiUtil.findUserByUsername; import static org.keycloak.testsuite.util.ClientPoliciesUtil.createAnyClientConditionConfig; import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientAccessTypeConditionConfig; import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientRolesConditionConfig; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/ClientPoliciesTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/ClientPoliciesTest.java index eb1010af3187..f577dca3e7a6 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/ClientPoliciesTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/ClientPoliciesTest.java @@ -119,7 +119,7 @@ import static org.keycloak.OAuth2Constants.SCOPE_PHONE; import static org.keycloak.testsuite.AbstractAdminTest.loadJson; -import static org.keycloak.testsuite.admin.ApiUtil.findClientResourceByClientId; +import static org.keycloak.testsuite.admin.AdminApiUtil.findClientResourceByClientId; import static org.keycloak.testsuite.util.ClientPoliciesUtil.createAnyClientConditionConfig; import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientRolesConditionConfig; import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientScopesConditionConfig; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/AbstractFailoverClusterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/AbstractFailoverClusterTest.java index 79b3e29204aa..7a92b3690b80 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/AbstractFailoverClusterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/AbstractFailoverClusterTest.java @@ -22,7 +22,7 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.Assert; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.InfoPage; import org.keycloak.testsuite.pages.LoginPage; @@ -100,7 +100,7 @@ public void setup() { .password("password") .build(); - String userId = ApiUtil.createUserWithAdminClient(adminClient.realm("test"), user); + String userId = AdminApiUtil.createUserWithAdminClient(adminClient.realm("test"), user); getCleanup().addUserId(userId); oauth.clientId("test-app"); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/GroupInvalidationClusterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/GroupInvalidationClusterTest.java index 15e88599c346..7f9498311c6d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/GroupInvalidationClusterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/GroupInvalidationClusterTest.java @@ -11,6 +11,7 @@ import org.keycloak.admin.client.resource.GroupsResource; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.representations.idm.GroupRepresentation; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.arquillian.ContainerInfo; import org.keycloak.testsuite.util.GroupBuilder; @@ -137,7 +138,7 @@ protected GroupRepresentation testEntityUpdates(GroupRepresentation group, boole parentGroup = readEntityOnCurrentFailNode(parentGroup); group = readEntityOnCurrentFailNode(group); - assertTrue(ApiUtil.groupContainsSubgroup(entityResourceOnCurrentFailNode(parentGroup), group)); + assertTrue(AdminApiUtil.groupContainsSubgroup(entityResourceOnCurrentFailNode(parentGroup), group)); assertEquals(parentGroup.getPath() + "/" + group.getName(), group.getPath()); verifyEntityUpdateDuringFailover(group, backendFailover); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/composites/AbstractCompositeKeycloakTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/composites/AbstractCompositeKeycloakTest.java index ca546a8b5b2d..1b2b81a11868 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/composites/AbstractCompositeKeycloakTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/composites/AbstractCompositeKeycloakTest.java @@ -19,7 +19,7 @@ import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.testsuite.AbstractKeycloakTest; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; /** * @@ -32,6 +32,6 @@ protected RealmResource testRealm() { } protected String getUserId(String username) { - return ApiUtil.findUserByUsername(testRealm(), username).getId(); + return AdminApiUtil.findUserByUsername(testRealm(), username).getId(); } } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/composites/CompositeRoleTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/composites/CompositeRoleTest.java index 99250a8bd625..717049959b80 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/composites/CompositeRoleTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/composites/CompositeRoleTest.java @@ -28,7 +28,7 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.testsuite.Assert; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.util.ClientBuilder; import org.keycloak.testsuite.util.RealmBuilder; @@ -164,7 +164,7 @@ public void before() { addClientLevelScopeMapping("APP_COMPOSITE_APPLICATION", "APP_ROLE_APPLICATION", "APP_ROLE_2"); // createRealmAppCompositeRole - ClientResource appRoleApplication = ApiUtil.findClientByClientId(testRealm(), "APP_ROLE_APPLICATION"); + ClientResource appRoleApplication = AdminApiUtil.findClientByClientId(testRealm(), "APP_ROLE_APPLICATION"); RoleResource appRole1 = appRoleApplication.roles().get("APP_ROLE_1"); RoleBuilder realmAppCompositeRole = RoleBuilder.create() @@ -175,15 +175,15 @@ public void before() { testRealm().rolesById().addComposites(id, Collections.singletonList(appRole1.toRepresentation())); // addRealmAppCompositeToUsers - UserResource userRsc = ApiUtil.findUserByUsernameId(testRealm(), "REALM_APP_COMPOSITE_USER"); + UserResource userRsc = AdminApiUtil.findUserByUsernameId(testRealm(), "REALM_APP_COMPOSITE_USER"); RoleRepresentation realmAppCompositeRolee = testRealm().roles().get("REALM_APP_COMPOSITE_ROLE").toRepresentation(); userRsc.roles().realmLevel().add(Collections.singletonList(realmAppCompositeRolee)); // addRealmAppCompositeToUsers2 - userRsc = ApiUtil.findUserByUsernameId(testRealm(), "APP_COMPOSITE_USER"); + userRsc = AdminApiUtil.findUserByUsernameId(testRealm(), "APP_COMPOSITE_USER"); userRsc.roles().realmLevel().add(Collections.singletonList(realmAppCompositeRolee)); - ClientResource appCompositeApplication = ApiUtil.findClientByClientId(testRealm(), "APP_COMPOSITE_APPLICATION"); + ClientResource appCompositeApplication = AdminApiUtil.findClientByClientId(testRealm(), "APP_COMPOSITE_APPLICATION"); RoleResource appCompositeRole = appCompositeApplication.roles().get("APP_COMPOSITE_ROLE"); // addCompositeRolesToAppCompositeRoleInAppCompositeApplication @@ -192,7 +192,7 @@ public void before() { toAdd.add(testRealm().roles().get("REALM_ROLE_2").toRepresentation()); toAdd.add(testRealm().roles().get("REALM_ROLE_3").toRepresentation()); - ClientResource appRolesApplication = ApiUtil.findClientByClientId(testRealm(), "APP_ROLE_APPLICATION"); + ClientResource appRolesApplication = AdminApiUtil.findClientByClientId(testRealm(), "APP_ROLE_APPLICATION"); RoleRepresentation appRole1Rep = appRolesApplication.roles().get("APP_ROLE_1").toRepresentation(); toAdd.add(appRole1Rep); @@ -203,14 +203,14 @@ public void before() { } private void addRealmLevelScopeMapping(String clientId, String roleName) { - ClientResource client = ApiUtil.findClientByClientId(testRealm(), clientId); + ClientResource client = AdminApiUtil.findClientByClientId(testRealm(), clientId); RoleRepresentation role = testRealm().roles().get(roleName).toRepresentation(); client.getScopeMappings().realmLevel().add(Collections.singletonList(role)); } private void addClientLevelScopeMapping(String targetClientId, String sourceClientId, String roleName) { - ClientResource targetClient = ApiUtil.findClientByClientId(testRealm(), targetClientId); - ClientResource sourceClient = ApiUtil.findClientByClientId(testRealm(), sourceClientId); + ClientResource targetClient = AdminApiUtil.findClientByClientId(testRealm(), targetClientId); + ClientResource sourceClient = AdminApiUtil.findClientByClientId(testRealm(), sourceClientId); RoleRepresentation role = sourceClient.roles().get(roleName).toRepresentation(); targetClient.getScopeMappings().clientLevel(sourceClient.toRepresentation().getId()).add(Collections.singletonList(role)); } @@ -350,11 +350,11 @@ public void testRecursiveComposites() throws Exception { RoleRepresentation realmComposite1 = testRealm().roles().get("REALM_COMPOSITE_1").toRepresentation(); testRealm().roles().get("REALM_ROLE_1").addComposites(Collections.singletonList(realmComposite1)); - UserResource userResource = ApiUtil.findUserByUsernameId(testRealm(), "REALM_COMPOSITE_1_USER"); + UserResource userResource = AdminApiUtil.findUserByUsernameId(testRealm(), "REALM_COMPOSITE_1_USER"); List realmRoles = userResource.roles().realmLevel().listEffective(); Assert.assertNames(realmRoles, "REALM_COMPOSITE_1", "REALM_ROLE_1"); - userResource = ApiUtil.findUserByUsernameId(testRealm(), "REALM_ROLE_1_USER"); + userResource = AdminApiUtil.findUserByUsernameId(testRealm(), "REALM_ROLE_1_USER"); realmRoles = userResource.roles().realmLevel().listEffective(); Assert.assertNames(realmRoles, "REALM_COMPOSITE_1", "REALM_ROLE_1"); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/docker/DockerClientTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/docker/DockerClientTest.java index 6a90ced2561e..4800174fde6c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/docker/DockerClientTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/docker/DockerClientTest.java @@ -23,7 +23,7 @@ import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.hamcrest.Matchers; @@ -159,7 +159,7 @@ public void afterAbstractKeycloakTest() throws Exception { @Test public void shouldPerformDockerAuthAgainstRegistry() throws Exception { - UserRepresentation dockerUser = ApiUtil.findUserByUsername(adminClient.realm(REALM_ID), DOCKER_USER); + UserRepresentation dockerUser = AdminApiUtil.findUserByUsername(adminClient.realm(REALM_ID), DOCKER_USER); log.info("Starting the attempt for login..."); Container.ExecResult result = dockerClientContainer.execInContainer("docker", "login", "-u", DOCKER_USER, "-p", DOCKER_USER_PASSWORD, REGISTRY_HOSTNAME + ":" + REGISTRY_PORT); @@ -190,7 +190,7 @@ public void shouldPerformDockerAuthAgainstRegistry() throws Exception { assertLogin(dockerUser); // disable and login should fail - ClientResource client = ApiUtil.findClientByClientId(adminClient.realm(REALM_ID), CLIENT_ID); + ClientResource client = AdminApiUtil.findClientByClientId(adminClient.realm(REALM_ID), CLIENT_ID); ClientRepresentation clientRep = client.toRepresentation(); clientRep.setEnabled(Boolean.FALSE); client.update(clientRep); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/exportimport/ExportImportUtil.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/exportimport/ExportImportUtil.java index 5e49df7070bb..8d62c5abb57d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/exportimport/ExportImportUtil.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/exportimport/ExportImportUtil.java @@ -74,7 +74,7 @@ import org.keycloak.storage.ldap.mappers.FullNameLDAPStorageMapperFactory; import org.keycloak.storage.ldap.mappers.LDAPStorageMapper; import org.keycloak.testsuite.ProfileAssume; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.client.KeycloakTestingClient; import org.keycloak.util.JsonSerialization; @@ -123,11 +123,11 @@ public static void assertDataImportedInRealm(Keycloak adminClient, KeycloakTesti Assert.assertEquals(10, resources.size()); // Test applications imported - ClientRepresentation application = ApiUtil.findClientByClientId(realmRsc, "Application").toRepresentation(); - ClientRepresentation otherApp = ApiUtil.findClientByClientId(realmRsc, "OtherApp").toRepresentation(); - ClientRepresentation accountApp = ApiUtil.findClientByClientId(realmRsc, Constants.ACCOUNT_MANAGEMENT_CLIENT_ID).toRepresentation(); - ClientRepresentation testAppAuthzApp = ApiUtil.findClientByClientId(realmRsc, "test-app-authz").toRepresentation(); - ClientResource nonExisting = ApiUtil.findClientByClientId(realmRsc, "NonExisting"); + ClientRepresentation application = AdminApiUtil.findClientByClientId(realmRsc, "Application").toRepresentation(); + ClientRepresentation otherApp = AdminApiUtil.findClientByClientId(realmRsc, "OtherApp").toRepresentation(); + ClientRepresentation accountApp = AdminApiUtil.findClientByClientId(realmRsc, Constants.ACCOUNT_MANAGEMENT_CLIENT_ID).toRepresentation(); + ClientRepresentation testAppAuthzApp = AdminApiUtil.findClientByClientId(realmRsc, "test-app-authz").toRepresentation(); + ClientResource nonExisting = AdminApiUtil.findClientByClientId(realmRsc, "NonExisting"); Assert.assertNotNull(application); Assert.assertNotNull(otherApp); Assert.assertNull(nonExisting); @@ -159,8 +159,8 @@ public static void assertDataImportedInRealm(Keycloak adminClient, KeycloakTesti Assert.assertEquals("browser", flowRep.getAlias()); // Test finding applications by ID - Assert.assertNull(ApiUtil.findClientResourceById(realmRsc, "982734")); - Assert.assertEquals(application.getId(), ApiUtil.findClientResourceById(realmRsc, application.getId()).toRepresentation().getId()); + Assert.assertNull(AdminApiUtil.findClientResourceById(realmRsc, "982734")); + Assert.assertEquals(application.getId(), AdminApiUtil.findClientResourceById(realmRsc, application.getId()).toRepresentation().getId()); // Test role mappings @@ -222,7 +222,7 @@ public static void assertDataImportedInRealm(Keycloak adminClient, KeycloakTesti Assert.assertTrue(attrVals.contains("val21") && attrVals.contains("val22")); // Test client - ClientResource oauthClient = ApiUtil.findClientResourceByClientId(realmRsc, "oauthclient"); + ClientResource oauthClient = AdminApiUtil.findClientResourceByClientId(realmRsc, "oauthclient"); ClientRepresentation oauthClientRep = oauthClient.toRepresentation(); Assert.assertEquals("clientpassword", oauthClient.getSecret().getValue()); Assert.assertTrue(oauthClientRep.isEnabled()); @@ -601,7 +601,7 @@ private static boolean containsRole(Collection roles, RoleRe } private static void assertAuthorizationSettingsOtherApp(RealmResource realmRsc) { - AuthorizationResource authzResource = ApiUtil.findAuthorizationSettings(realmRsc, "OtherApp"); + AuthorizationResource authzResource = AdminApiUtil.findAuthorizationSettings(realmRsc, "OtherApp"); Assert.assertNotNull(authzResource); List resources = authzResource.resources().resources(); @@ -614,7 +614,7 @@ private static void assertAuthorizationSettingsOtherApp(RealmResource realmRsc) } private static void assertAuthorizationSettingsTestAppAuthz(RealmResource realmRsc) { - AuthorizationResource authzResource = ApiUtil.findAuthorizationSettings(realmRsc, "test-app-authz"); + AuthorizationResource authzResource = AdminApiUtil.findAuthorizationSettings(realmRsc, "test-app-authz"); Assert.assertNotNull(authzResource); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/AbstractKerberosSingleRealmTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/AbstractKerberosSingleRealmTest.java index 2d25fe6cfc09..1a615c1df062 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/AbstractKerberosSingleRealmTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/AbstractKerberosSingleRealmTest.java @@ -48,7 +48,7 @@ import org.junit.Assume; import org.junit.Test; -import static org.keycloak.testsuite.admin.ApiUtil.findClientByClientId; +import static org.keycloak.testsuite.admin.AdminApiUtil.findClientByClientId; /** * Contains just test methods diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/AbstractKerberosTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/AbstractKerberosTest.java index 636ae7c9525e..7b6220a0644b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/AbstractKerberosTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/AbstractKerberosTest.java @@ -56,6 +56,7 @@ import org.keycloak.testsuite.AbstractAuthTest; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AssertEvents; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.LoginPage; @@ -299,7 +300,7 @@ protected void removeAllUsers() { protected UserRepresentation assertUser(String expectedUsername, String expectedEmail, String expectedFirstname, String expectedLastname, String expectedKerberosPrincipal, boolean updateProfileActionExpected) { try { - UserRepresentation user = ApiUtil.findUserByUsername(testRealmResource(), expectedUsername); + UserRepresentation user = AdminApiUtil.findUserByUsername(testRealmResource(), expectedUsername); Assert.assertNotNull(user); Assert.assertEquals(expectedEmail, user.getEmail()); Assert.assertEquals(expectedFirstname, user.getFirstName()); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/KerberosStandaloneTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/KerberosStandaloneTest.java index 593902bbd201..f41eabf6614b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/KerberosStandaloneTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/KerberosStandaloneTest.java @@ -45,7 +45,7 @@ import org.keycloak.testsuite.ActionURIUtils; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.KerberosEmbeddedServer; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.arquillian.annotation.UncaughtServerErrorExpected; import org.keycloak.testsuite.pages.InfoPage; import org.keycloak.testsuite.pages.LoginPasswordUpdatePage; @@ -219,7 +219,7 @@ public void testUserProfile() throws Exception { assertSuccessfulSpnegoLogin("hnelson", "hnelson", "secret"); // User-profile data should be present (including KERBEROS_PRINCIPAL attribute) - UserResource johnResource = ApiUtil.findUserByUsernameId(testRealmResource(), "hnelson"); + UserResource johnResource = AdminApiUtil.findUserByUsernameId(testRealmResource(), "hnelson"); UserRepresentation john = johnResource.toRepresentation(true); Assert.assertNames(john.getUserProfileMetadata().getAttributes(), UserModel.FIRST_NAME, UserModel.LAST_NAME, UserModel.EMAIL, UserModel.USERNAME, KerberosConstants.KERBEROS_PRINCIPAL); @@ -287,7 +287,7 @@ public void testRemoveUserTest() throws Exception { assertSuccessfulSpnegoLogin("hnelson", "hnelson", "secret"); // User-profile data should be present (including KERBEROS_PRINCIPAL attribute) - UserResource johnResource = ApiUtil.findUserByUsernameId(testRealmResource(), "hnelson"); + UserResource johnResource = AdminApiUtil.findUserByUsernameId(testRealmResource(), "hnelson"); UserRepresentation john = johnResource.toRepresentation(true); Assert.assertNames(john.getUserProfileMetadata().getAttributes(), UserModel.FIRST_NAME, UserModel.LAST_NAME, UserModel.EMAIL, UserModel.USERNAME, KerberosConstants.KERBEROS_PRINCIPAL); johnResource.remove(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPAdminRestApiTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPAdminRestApiTest.java index 848b576f3e48..93ebb270f2a8 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPAdminRestApiTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPAdminRestApiTest.java @@ -40,6 +40,7 @@ import org.keycloak.representations.userprofile.config.UPConfig; import org.keycloak.storage.UserStorageProvider; import org.keycloak.storage.ldap.idm.model.LDAPObject; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.util.LDAPRule; import org.keycloak.testsuite.util.LDAPTestUtils; @@ -145,7 +146,7 @@ public void createUserWithAdminRest() throws Exception { @Test public void updateUserWithAdminRest() throws Exception { - UserResource userRes = ApiUtil.findUserByUsernameId(testRealm(), "johnkeycloak"); + UserResource userRes = AdminApiUtil.findUserByUsernameId(testRealm(), "johnkeycloak"); UserRepresentation user = userRes.toRepresentation(); List origLdapId = new ArrayList<>(user.getAttributes().get(LDAPConstants.LDAP_ID)); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPMSADMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPMSADMapperTest.java index aedb75b73efc..9f5c590a234d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPMSADMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPMSADMapperTest.java @@ -33,7 +33,7 @@ import org.keycloak.storage.ldap.mappers.msad.MSADUserAccountControlStorageMapper; import org.keycloak.storage.ldap.mappers.msad.MSADUserAccountControlStorageMapperFactory; import org.keycloak.storage.ldap.mappers.msad.UserAccountControl; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.LoginPasswordUpdatePage; import org.keycloak.testsuite.util.LDAPRule; @@ -139,7 +139,7 @@ public void test01RegisterUserWithWeakPasswordFirst() { @Test public void test02UpdatePasswordTest() { // Add required action to user johnkeycloak through Keycloak admin API - UserResource john = ApiUtil.findUserByUsernameId(adminClient.realm("test"), "johnkeycloak"); + UserResource john = AdminApiUtil.findUserByUsernameId(adminClient.realm("test"), "johnkeycloak"); UserRepresentation johnRep = john.toRepresentation(); johnRep.setRequiredActions(Collections.singletonList(UserModel.RequiredAction.UPDATE_PASSWORD.name())); john.update(johnRep); @@ -174,7 +174,7 @@ public void test02UpdatePasswordTest() { @Test public void test03UpdatePasswordWithLDAPDirectly() { // Add required action to user johnkeycloak through Keycloak admin API - UserResource john = ApiUtil.findUserByUsernameId(adminClient.realm("test"), "johnkeycloak"); + UserResource john = AdminApiUtil.findUserByUsernameId(adminClient.realm("test"), "johnkeycloak"); UserRepresentation johnRep = john.toRepresentation(); johnRep.setRequiredActions(Collections.singletonList(UserModel.RequiredAction.UPDATE_PASSWORD.name())); john.update(johnRep); @@ -224,7 +224,7 @@ public void test04UpdateLDAPDirectlyToSetUpdatePassword() { Assert.assertEquals(0, getPwdLastSetOfJohn()); // Check Admin REST API contains UPDATE_PASSWORD required action - UserResource john = ApiUtil.findUserByUsernameId(adminClient.realm("test"), "johnkeycloak"); + UserResource john = AdminApiUtil.findUserByUsernameId(adminClient.realm("test"), "johnkeycloak"); UserRepresentation johnRep = john.toRepresentation(); Assert.assertEquals(UserModel.RequiredAction.UPDATE_PASSWORD.name(), johnRep.getRequiredActions().get(0)); @@ -263,7 +263,7 @@ public void test05UpdatePasswordUnsyncedMode() { }); // Add required action to user johnkeycloak through Keycloak admin API. Due UNSYNCED mode, this should update Keycloak DB, but not MSAD - UserResource john = ApiUtil.findUserByUsernameId(adminClient.realm("test"), "johnkeycloak"); + UserResource john = AdminApiUtil.findUserByUsernameId(adminClient.realm("test"), "johnkeycloak"); UserRepresentation johnRep = john.toRepresentation(); johnRep.setRequiredActions(Collections.singletonList(UserModel.RequiredAction.UPDATE_PASSWORD.name())); john.update(johnRep); @@ -328,7 +328,7 @@ public void test06RegisterNewUser() { }); // Logout and login again. Success - ApiUtil.findUserByUsernameId(adminClient.realm("test"), "registeruser3").logout(); + AdminApiUtil.findUserByUsernameId(adminClient.realm("test"), "registeruser3").logout(); oauth.openLoginForm(); loginPage.login("registeruser3", "Password1"); Assert.assertEquals(AppPage.RequestType.AUTH_RESPONSE, appPage.getRequestType()); @@ -353,7 +353,7 @@ public void test07DisabledUserInMSADSwitchedToEnabledInKeycloak() { }); // Check user disabled in both admin REST API and MSAD - UserResource john = ApiUtil.findUserByUsernameId(adminClient.realm("test"), "johnkeycloak"); + UserResource john = AdminApiUtil.findUserByUsernameId(adminClient.realm("test"), "johnkeycloak"); UserRepresentation johnRep = john.toRepresentation(); Assert.assertFalse(johnRep.isEnabled()); @@ -400,7 +400,7 @@ public void test08DisabledUserUnsyncedMode() { }); // Disable user johnkeycloak through Keycloak admin API. Due UNSYNCED mode, this should update Keycloak DB, but not MSAD - UserResource john = ApiUtil.findUserByUsernameId(adminClient.realm("test"), "johnkeycloak"); + UserResource john = AdminApiUtil.findUserByUsernameId(adminClient.realm("test"), "johnkeycloak"); UserRepresentation johnRep = john.toRepresentation(); johnRep.setEnabled(false); john.update(johnRep); @@ -457,7 +457,7 @@ public void test09DisableUserImportDisabled() { }); // check user is enabled both locally and on MSAD. - UserResource john = ApiUtil.findUserByUsernameId(adminClient.realm("test"), "johnkeycloak"); + UserResource john = AdminApiUtil.findUserByUsernameId(adminClient.realm("test"), "johnkeycloak"); UserRepresentation johnRep = john.toRepresentation(); Assert.assertTrue(johnRep.isEnabled()); Assert.assertTrue(isJohnEnabledInMSAD()); @@ -497,7 +497,7 @@ public void test09DisableUserImportDisabled() { @Test public void test10DisabledUserSwitchedToEnabledOnMSAD() { // disable user johnkeycloak via REST API - should be disabled in MSAD as well. - UserResource john = ApiUtil.findUserByUsernameId(adminClient.realm("test"), "johnkeycloak"); + UserResource john = AdminApiUtil.findUserByUsernameId(adminClient.realm("test"), "johnkeycloak"); UserRepresentation johnRep = john.toRepresentation(); johnRep.setEnabled(false); john.update(johnRep); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPPasswordModifyExtensionTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPPasswordModifyExtensionTest.java index 1a116cc62c14..076abaf138b4 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPPasswordModifyExtensionTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPPasswordModifyExtensionTest.java @@ -30,7 +30,7 @@ import org.keycloak.storage.ldap.mappers.HardcodedLDAPAttributeMapper; import org.keycloak.storage.ldap.mappers.HardcodedLDAPAttributeMapperFactory; import org.keycloak.storage.ldap.mappers.LDAPStorageMapper; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.util.AccountHelper; import org.keycloak.testsuite.util.LDAPRule; @@ -121,7 +121,7 @@ public void registerUserLdapSuccess() { registerPage.register("firstName", "lastName", "email2@check.cz", "registerUserSuccess2", "Password1", "Password1"); Assert.assertEquals(AppPage.RequestType.AUTH_RESPONSE, appPage.getRequestType()); - UserRepresentation user = ApiUtil.findUserByUsername(testRealm(),"registerUserSuccess2"); + UserRepresentation user = AdminApiUtil.findUserByUsername(testRealm(),"registerUserSuccess2"); Assert.assertNotNull(user); assertFederatedUserLink(user); Assert.assertEquals("registerusersuccess2", user.getUsername()); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPProvidersIntegrationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPProvidersIntegrationTest.java index 0fd51e0781bd..4e0e9a9e50bb 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPProvidersIntegrationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPProvidersIntegrationTest.java @@ -72,6 +72,7 @@ import org.keycloak.storage.ldap.mappers.LDAPStorageMapper; import org.keycloak.storage.ldap.mappers.UserAttributeLDAPStorageMapper; import org.keycloak.testsuite.AbstractAuthTest; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.util.AccountHelper; @@ -621,7 +622,7 @@ public void ldapPasswordChangeWithAdminEndpointAndRequiredAction() throws Except Assert.assertEquals(AppPage.RequestType.AUTH_RESPONSE, appPage.getRequestType()); - UserResource user = ApiUtil.findUserByUsernameId(testRealm(), username); + UserResource user = AdminApiUtil.findUserByUsernameId(testRealm(), username); String userId = user.toRepresentation().getId(); events.expectRegister(username, email).assertEvent(); @@ -634,7 +635,7 @@ public void ldapPasswordChangeWithAdminEndpointAndRequiredAction() throws Except assertPasswordConfiguredThroughLDAPOnly(user); // Update password through admin REST endpoint. Assert user can authenticate with the new password - ApiUtil.resetUserPassword(user, "Password1-updated1", false); + AdminApiUtil.resetUserPassword(user, "Password1-updated1", false); oauth.openLoginForm(); @@ -748,7 +749,7 @@ public void registerUserLdapSuccess() { registerPage.register("firstName", "lastName", "email2@check.cz", "register-user-success2", "Password1", "Password1"); Assert.assertEquals(AppPage.RequestType.AUTH_RESPONSE, appPage.getRequestType()); - UserRepresentation user = ApiUtil.findUserByUsername(testRealm(),"register-user-success2"); + UserRepresentation user = AdminApiUtil.findUserByUsername(testRealm(),"register-user-success2"); Assert.assertNotNull(user); assertFederatedUserLink(user); Assert.assertEquals("register-user-success2", user.getUsername()); @@ -1019,7 +1020,7 @@ public void testReadonly() { appRealm.updateComponent(ctx.getLdapModel()); }); - UserRepresentation userRep = ApiUtil.findUserByUsername(testRealm(), "johnkeycloak"); + UserRepresentation userRep = AdminApiUtil.findUserByUsername(testRealm(), "johnkeycloak"); assertFederatedUserLink(userRep); testingClient.server().run(session -> { @@ -1072,17 +1073,17 @@ public void testReadonly() { @Test public void testRemoveFederatedUser() { - UserRepresentation user = ApiUtil.findUserByUsername(testRealm(), "register-user-success2"); + UserRepresentation user = AdminApiUtil.findUserByUsername(testRealm(), "register-user-success2"); // Case when this test was executed "alone" (User "registerusersuccess2" is registered inside registerUserLdapSuccess) if (user == null) { registerUserLdapSuccess(); - user = ApiUtil.findUserByUsername(testRealm(), "register-user-success2"); + user = AdminApiUtil.findUserByUsername(testRealm(), "register-user-success2"); } assertFederatedUserLink(user); testRealm().users().get(user.getId()).remove(); - user = ApiUtil.findUserByUsername(testRealm(), "register-user-success2"); + user = AdminApiUtil.findUserByUsername(testRealm(), "register-user-success2"); Assert.assertNull(user); } @@ -1253,7 +1254,7 @@ public void testUnsynced() throws Exception { }); // Test admin REST endpoints - UserResource userResource = ApiUtil.findUserByUsernameId(testRealm(), "johnkeycloak"); + UserResource userResource = AdminApiUtil.findUserByUsernameId(testRealm(), "johnkeycloak"); // Assert password is stored locally List storedCredentials = userResource.credentials().stream() diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPReadOnlyTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPReadOnlyTest.java index ad0c9a520910..23189e666483 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPReadOnlyTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPReadOnlyTest.java @@ -44,7 +44,7 @@ import org.keycloak.storage.ldap.mappers.LDAPStorageMapper; import org.keycloak.storage.ldap.mappers.msad.MSADUserAccountControlStorageMapper; import org.keycloak.storage.ldap.mappers.msad.MSADUserAccountControlStorageMapperFactory; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.LoginConfigTotpPage; import org.keycloak.testsuite.util.LDAPRule; @@ -145,7 +145,7 @@ public void testReadOnlyWithTOTPEnabled() { // Revert TOTP setTotpRequirementExecutionForRealm(AuthenticationExecutionModel.Requirement.CONDITIONAL, AuthenticationExecutionModel.Requirement.ALTERNATIVE); - UserResource user = ApiUtil.findUserByUsernameId(testRealm(), "johnkeycloak"); + UserResource user = AdminApiUtil.findUserByUsernameId(testRealm(), "johnkeycloak"); String totpCredentialId = user.credentials().stream() .filter(credentialRep -> credentialRep.getType().equals(OTPCredentialModel.TYPE)) .findFirst().get().getId(); @@ -155,13 +155,13 @@ public void testReadOnlyWithTOTPEnabled() { // KEYCLOAK-3365 @Test public void testReadOnlyUserDoesNotThrowIfUnchanged() { - UserResource user = ApiUtil.findUserByUsernameId(testRealm(), "johnkeycloak"); + UserResource user = AdminApiUtil.findUserByUsernameId(testRealm(), "johnkeycloak"); UserRepresentation userRepresentation = user.toRepresentation(); userRepresentation.setRequiredActions(Collections.singletonList(UserModel.RequiredAction.CONFIGURE_TOTP.toString())); user.update(userRepresentation); // assert - user = ApiUtil.findUserByUsernameId(testRealm(), "johnkeycloak"); + user = AdminApiUtil.findUserByUsernameId(testRealm(), "johnkeycloak"); userRepresentation = user.toRepresentation(); Assert.assertEquals(userRepresentation.getRequiredActions().size(), 1); Assert.assertEquals(userRepresentation.getRequiredActions().get(0), UserModel.RequiredAction.CONFIGURE_TOTP.toString()); @@ -176,7 +176,7 @@ public void testUpdateLocale() { RealmRepresentation realm = testRealm().toRepresentation(); realm.setInternationalizationEnabled(true); testRealm().update(realm); - UserResource user = ApiUtil.findUserByUsernameId(testRealm(), "johnkeycloak"); + UserResource user = AdminApiUtil.findUserByUsernameId(testRealm(), "johnkeycloak"); UserRepresentation userRepresentation = user.toRepresentation(); String language = "pt_BR"; @@ -194,7 +194,7 @@ public void testUpdateLocale() { // KEYCLOAK-3365 @Test(expected = ClientErrorException.class) public void testReadOnlyUserThrowsIfChanged() { - UserResource user = ApiUtil.findUserByUsernameId(testRealm(), "johnkeycloak"); + UserResource user = AdminApiUtil.findUserByUsernameId(testRealm(), "johnkeycloak"); UserRepresentation userRepresentation = user.toRepresentation(); userRepresentation.setFirstName("Jane"); user.update(userRepresentation); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPUserProfileTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPUserProfileTest.java index 0d66cfd30b9d..d45d537c0967 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPUserProfileTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPUserProfileTest.java @@ -42,7 +42,7 @@ import org.keycloak.storage.ldap.idm.model.LDAPObject; import org.keycloak.storage.ldap.mappers.UserAttributeLDAPStorageMapper; import org.keycloak.storage.ldap.mappers.UserAttributeLDAPStorageMapperFactory; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.pages.LoginUpdateProfilePage; import org.keycloak.testsuite.util.LDAPRule; import org.keycloak.testsuite.util.LDAPTestUtils; @@ -102,7 +102,7 @@ protected void afterImportTestRealm() { @Test public void testUserProfile() { // Test user profile of user johnkeycloak in admin API - UserResource johnResource = ApiUtil.findUserByUsernameId(testRealm(), "johnkeycloak"); + UserResource johnResource = AdminApiUtil.findUserByUsernameId(testRealm(), "johnkeycloak"); UserRepresentation john = johnResource.toRepresentation(true); assertUser(john, "johnkeycloak", "john@email.org", "John", "Doe", "1234"); @@ -142,7 +142,7 @@ public void testUserProfileWithDefinedAttribute() throws IOException { testRealm().users().userProfile().update(config); // Defined postal_code in user profile config should have preference - UserResource johnResource = ApiUtil.findUserByUsernameId(testRealm(), "johnkeycloak"); + UserResource johnResource = AdminApiUtil.findUserByUsernameId(testRealm(), "johnkeycloak"); UserRepresentation john = johnResource.toRepresentation(true); Assert.assertEquals("Postal Code", john.getUserProfileMetadata().getAttributeMetadata("postal_code").getDisplayName()); @@ -183,7 +183,7 @@ public void testUserProfileWithMetadataAttributeDefinedInUserProfileConfig() { } testRealm().users().userProfile().update(config); - UserResource johnResource = ApiUtil.findUserByUsernameId(testRealm(), "johnkeycloak"); + UserResource johnResource = AdminApiUtil.findUserByUsernameId(testRealm(), "johnkeycloak"); UserRepresentation john = johnResource.toRepresentation(true); Assert.assertNotNull(john.getAttributes().get(LDAPConstants.LDAP_ENTRY_DN)); Assert.assertNotNull(john.getAttributes().get(LDAPConstants.LDAP_ID)); @@ -206,7 +206,7 @@ public void testUserProfileWithReadOnlyLdap() { // Test user profile of user johnkeycloak in admin console as well as account console. Check attributes are writable. setLDAPReadOnly(); try { - UserResource johnResource = ApiUtil.findUserByUsernameId(testRealm(), "johnkeycloak"); + UserResource johnResource = AdminApiUtil.findUserByUsernameId(testRealm(), "johnkeycloak"); UserRepresentation john = johnResource.toRepresentation(true); assertProfileAttributes(john, null, true, "username", "email", "firstName", "lastName", "postal_code"); @@ -236,7 +236,7 @@ public void testUserProfileWithReadOnlyLdapLocalUser() { // Test local user is writable and has only attributes defined explicitly in user-profile setLDAPReadOnly(); try { - UserResource maryResource = ApiUtil.findUserByUsernameId(testRealm(), "marykeycloak"); + UserResource maryResource = AdminApiUtil.findUserByUsernameId(testRealm(), "marykeycloak"); UserRepresentation mary = maryResource.toRepresentation(true); // LDAP is read-only, but local user has all the attributes writable @@ -280,7 +280,7 @@ public void testUserProfileWithoutImport() { testRealm().users().userProfile().update(config); // Test local user is writable and has only attributes defined explicitly in user-profile // Test user profile of user johnkeycloak in admin API - UserResource johnResource = ApiUtil.findUserByUsernameId(testRealm(), "johnkeycloak2"); + UserResource johnResource = AdminApiUtil.findUserByUsernameId(testRealm(), "johnkeycloak2"); UserRepresentation john = johnResource.toRepresentation(true); assertUser(john, "johnkeycloak2", "john2@email.org", "John", "Doe", "1234"); @@ -320,29 +320,29 @@ public void testMultipleLDAPProviders() { }); // the provider for this user does not have postal_code mapper - UserResource userResource = ApiUtil.findUserByUsernameId(testRealm(), "anotherjohn"); + UserResource userResource = AdminApiUtil.findUserByUsernameId(testRealm(), "anotherjohn"); UserRepresentation userRep = userResource.toRepresentation(true); Assert.assertNull(userRep.getAttributes().get("postal_code")); // the provider for this user does have postal_code mapper - userResource = ApiUtil.findUserByUsernameId(testRealm(), "johnkeycloak"); + userResource = AdminApiUtil.findUserByUsernameId(testRealm(), "johnkeycloak"); userRep = userResource.toRepresentation(true); Assert.assertNotNull(userRep.getAttributes().get("postal_code")); setLDAPReadOnly(); try { // the second provider is not readonly - userResource = ApiUtil.findUserByUsernameId(testRealm(), "anotherjohn"); + userResource = AdminApiUtil.findUserByUsernameId(testRealm(), "anotherjohn"); userRep = userResource.toRepresentation(true); assertProfileAttributes(userRep, null, false, "username", "email", "firstName", "lastName"); // the original provider is readonly - userResource = ApiUtil.findUserByUsernameId(testRealm(), "johnkeycloak"); + userResource = AdminApiUtil.findUserByUsernameId(testRealm(), "johnkeycloak"); userRep = userResource.toRepresentation(true); assertProfileAttributes(userRep, null, true, "username", "email", "firstName", "lastName", "postal_code"); // the second provider is not readonly - userResource = ApiUtil.findUserByUsernameId(testRealm(), "anotherjohn"); + userResource = AdminApiUtil.findUserByUsernameId(testRealm(), "anotherjohn"); userRep = userResource.toRepresentation(true); assertProfileAttributes(userRep, null, false, "username", "email", "firstName", "lastName"); } finally { @@ -383,11 +383,11 @@ public void testUsernameRespectFormatFromExternalStore() { LDAPTestUtils.updateLDAPPassword(ctx.getLdapProvider(), john3, "Password1"); }); - UserResource johnResource = ApiUtil.findUserByUsernameId(testRealm(), upperCaseUsername); + UserResource johnResource = AdminApiUtil.findUserByUsernameId(testRealm(), upperCaseUsername); UserRepresentation john = johnResource.toRepresentation(true); Assert.assertEquals(upperCaseUsername, john.getUsername()); - johnResource = ApiUtil.findUserByUsernameId(testRealm(), upperCaseUsername.toLowerCase()); + johnResource = AdminApiUtil.findUserByUsernameId(testRealm(), upperCaseUsername.toLowerCase()); john = johnResource.toRepresentation(true); Assert.assertEquals(upperCaseUsername, john.getUsername()); @@ -420,11 +420,11 @@ public void testUsernameRespectFormatFromExternalStoreAD() { LDAPTestUtils.updateLDAPPassword(ctx.getLdapProvider(), john3, "Password1"); }); - UserResource johnResource = ApiUtil.findUserByUsernameId(testRealm(), upperCaseUsername); + UserResource johnResource = AdminApiUtil.findUserByUsernameId(testRealm(), upperCaseUsername); UserRepresentation john = johnResource.toRepresentation(true); Assert.assertEquals(upperCaseUsername, john.getUsername()); - johnResource = ApiUtil.findUserByUsernameId(testRealm(), upperCaseUsername.toLowerCase()); + johnResource = AdminApiUtil.findUserByUsernameId(testRealm(), upperCaseUsername.toLowerCase()); john = johnResource.toRepresentation(true); Assert.assertEquals(upperCaseUsername, john.getUsername()); @@ -440,7 +440,7 @@ public void testUsernameRespectFormatFromExternalStoreAD() { @Test public void testUpdateEmailWhenEmailAsUsernameEnabledAndEditUsernameDisabled() { String username = "johnkeycloak"; - UserResource johnResource = ApiUtil.findUserByUsernameId(testRealm(), username); + UserResource johnResource = AdminApiUtil.findUserByUsernameId(testRealm(), username); UserRepresentation john = johnResource.toRepresentation(true); String email = "john@email.org"; assertUser(john, username, email, "John", "Doe", "1234"); @@ -489,7 +489,7 @@ public void testUpdateEmailVerifiedWithReadOnlyLdapAndUpperCaseEmail() { setEmailMapperAlwaysReadFromLDAP(true); try { // Fetch the user via admin API - email should be returned as lowercase - UserResource userResource = ApiUtil.findUserByUsernameId(testRealm(), "uppercaseemailuser"); + UserResource userResource = AdminApiUtil.findUserByUsernameId(testRealm(), "uppercaseemailuser"); UserRepresentation userRep = userResource.toRepresentation(); Assert.assertEquals("uppercase@email.org", userRep.getEmail()); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/noimport/LDAPProvidersIntegrationNoImportTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/noimport/LDAPProvidersIntegrationNoImportTest.java index 8000747f0dd9..6e7b59abf53d 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/noimport/LDAPProvidersIntegrationNoImportTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/noimport/LDAPProvidersIntegrationNoImportTest.java @@ -45,7 +45,7 @@ import org.keycloak.storage.ldap.mappers.FullNameLDAPStorageMapperFactory; import org.keycloak.storage.ldap.mappers.LDAPStorageMapper; import org.keycloak.storage.ldap.mappers.UserAttributeLDAPStorageMapper; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.federation.ldap.LDAPProvidersIntegrationTest; import org.keycloak.testsuite.federation.ldap.LDAPTestAsserts; import org.keycloak.testsuite.federation.ldap.LDAPTestContext; @@ -301,7 +301,7 @@ public void testFullNameMapperWriteOnly() { // Tests that attempt to change some user attributes, which are not mapped to LDAP, will fail @Test public void testImpossibleToChangeNonLDAPMappedAttributes() { - UserResource john = ApiUtil.findUserByUsernameId(testRealm(), "johnkeycloak"); + UserResource john = AdminApiUtil.findUserByUsernameId(testRealm(), "johnkeycloak"); UserRepresentation johnRep = john.toRepresentation(); String firstNameOrig = johnRep.getFirstName(); @@ -369,7 +369,7 @@ public void testImpossibleToChangeNonLDAPMappedAttributes() { @Test public void testCannotUpdateReadOnlyUserImportDisabled() { - UserResource user = ApiUtil.findUserByUsernameId(testRealm(), "johnkeycloak"); + UserResource user = AdminApiUtil.findUserByUsernameId(testRealm(), "johnkeycloak"); try { UserRepresentation rep = user.toRepresentation(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/ClientStorageTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/ClientStorageTest.java index 34c2998e3fef..cd2e041c7f75 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/ClientStorageTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/ClientStorageTest.java @@ -74,7 +74,7 @@ import static java.util.Calendar.HOUR_OF_DAY; import static java.util.Calendar.MINUTE; -import static org.keycloak.testsuite.admin.ApiUtil.findUserByUsername; +import static org.keycloak.testsuite.admin.AdminApiUtil.findUserByUsername; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageOTPTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageOTPTest.java index 6fc526cafc30..eecaa82b2ade 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageOTPTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageOTPTest.java @@ -40,7 +40,7 @@ import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.federation.DummyUserFederationProvider; import org.keycloak.testsuite.federation.DummyUserFederationProviderFactory; import org.keycloak.testsuite.pages.AppPage; @@ -105,7 +105,7 @@ public void addProvidersBeforeTest() throws URISyntaxException, IOException { .username("test-user") .email("test-user@something.org") .build(); - String testUserId = ApiUtil.createUserWithAdminClient(testRealm(), user); + String testUserId = AdminApiUtil.createUserWithAdminClient(testRealm(), user); getCleanup().addUserId(testUserId); } @@ -114,7 +114,7 @@ public void addProvidersBeforeTest() throws URISyntaxException, IOException { @Test public void testCredentialsThroughRESTAPI() { // Test that test-user has federation link on him - UserResource user = ApiUtil.findUserByUsernameId(testRealm(), "test-user"); + UserResource user = AdminApiUtil.findUserByUsernameId(testRealm(), "test-user"); Assert.assertEquals(componentId, user.toRepresentation().getFederationLink()); // Test that both "password" and "otp" are configured for the test-user @@ -147,7 +147,7 @@ public void testAuthentication() { public void testUpdateOTP() throws IOException { try (RealmAttributeUpdater rau = new RealmAttributeUpdater(testRealm()).setOtpPolicyCodeReusable(true).update()) { // Add requiredAction to the user for update OTP - UserResource user = ApiUtil.findUserByUsernameId(testRealm(), "test-user"); + UserResource user = AdminApiUtil.findUserByUsernameId(testRealm(), "test-user"); UserRepresentation userRep = user.toRepresentation(); userRep.setRequiredActions(Collections.singletonList(UserModel.RequiredAction.CONFIGURE_TOTP.toString())); user.update(userRep); @@ -218,11 +218,11 @@ public void testNormalUser() { .username("test-user2") .email("test-user2@something.org") .build(); - String testUserId = ApiUtil.createUserWithAdminClient(testRealm(), user); + String testUserId = AdminApiUtil.createUserWithAdminClient(testRealm(), user); getCleanup().addUserId(testUserId); // Assert he has federation link on him - UserResource userResource = ApiUtil.findUserByUsernameId(testRealm(), "test-user2"); + UserResource userResource = AdminApiUtil.findUserByUsernameId(testRealm(), "test-user2"); Assert.assertEquals(componentId, userResource.toRepresentation().getFederationLink()); // Assert no userStorage supported credentials shown through admin REST API for that user. For this user, the validation of password and OTP is not delegated @@ -230,7 +230,7 @@ public void testNormalUser() { Assert.assertTrue(userResource.getConfiguredUserStorageCredentialTypes().isEmpty()); // Update password - ApiUtil.resetUserPassword(userResource, "pass", false); + AdminApiUtil.resetUserPassword(userResource, "pass", false); // Authenticate as the user. Only the password will be required for him oauth.openLoginForm(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageTest.java index 45fd44eac4de..988dc893d928 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageTest.java @@ -53,6 +53,7 @@ import org.keycloak.storage.UserStorageProvider; import org.keycloak.storage.UserStorageUtil; import org.keycloak.testsuite.AbstractAuthTest; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.arquillian.annotation.ModelTest; import org.keycloak.testsuite.federation.UserMapStorage; @@ -286,7 +287,7 @@ public void testLoginSuccessWithSpecialCharacter() { @Test public void testUpdate() { - UserRepresentation thor = ApiUtil.findUserByUsername(testRealmResource(), "thor"); + UserRepresentation thor = AdminApiUtil.findUserByUsername(testRealmResource(), "thor"); // update entity thor.setFirstName("Stian"); @@ -302,7 +303,7 @@ public void testUpdate() { testRealmResource().users().get(thor.getId()).update(thor); // check entity - thor = ApiUtil.findUserByUsername(testRealmResource(), "thor"); + thor = AdminApiUtil.findUserByUsername(testRealmResource(), "thor"); Assert.assertEquals("Stian", thor.getFirstName()); Assert.assertEquals("Thorgersen", thor.getLastName()); Assert.assertEquals("thor@hammer.com", thor.getEmail()); @@ -334,13 +335,13 @@ public void testUpdate() { testRealmResource().users().get(thor.getId()).update(thor); // change pass - ApiUtil.resetUserPassword(testRealmResource().users().get(thor.getId()), "lightning", false); + AdminApiUtil.resetUserPassword(testRealmResource().users().get(thor.getId()), "lightning", false); loginSuccessAndLogout("thor", "lightning"); // update role RoleRepresentation r = new RoleRepresentation("foo-role", "foo role", false); testRealmResource().roles().create(r); - ApiUtil.assignRealmRoles(testRealmResource(), thor.getId(), "foo-role"); + AdminApiUtil.assignRealmRoles(testRealmResource(), thor.getId(), "foo-role"); // check role boolean foundRole = false; @@ -357,7 +358,7 @@ public void testUpdate() { propProviderRWId = addComponent(newPropProviderRW()); loginSuccessAndLogout("thor", "hammer"); - thor = ApiUtil.findUserByUsername(testRealmResource(), "thor"); + thor = AdminApiUtil.findUserByUsername(testRealmResource(), "thor"); Assert.assertNull(thor.getFirstName()); Assert.assertNull(thor.getLastName()); @@ -424,7 +425,7 @@ public UserResource user(String userId) { public void testRegistration() { UserRepresentation memuser = new UserRepresentation(); memuser.setUsername("memuser"); - String uid = ApiUtil.createUserAndResetPasswordWithAdminClient(testRealmResource(), memuser, "password"); + String uid = AdminApiUtil.createUserAndResetPasswordWithAdminClient(testRealmResource(), memuser, "password"); loginSuccessAndLogout("memuser", "password"); loginSuccessAndLogout("memuser", "password"); loginSuccessAndLogout("memuser", "password"); @@ -484,11 +485,11 @@ public void testQuery() { g.setName("gods"); String gid = ApiUtil.getCreatedId(testRealmResource().groups().add(g)); - UserRepresentation user = ApiUtil.findUserByUsername(testRealmResource(), "apollo"); + UserRepresentation user = AdminApiUtil.findUserByUsername(testRealmResource(), "apollo"); testRealmResource().users().get(user.getId()).joinGroup(gid); - user = ApiUtil.findUserByUsername(testRealmResource(), "zeus"); + user = AdminApiUtil.findUserByUsername(testRealmResource(), "zeus"); testRealmResource().users().get(user.getId()).joinGroup(gid); - user = ApiUtil.findUserByUsername(testRealmResource(), "thor"); + user = AdminApiUtil.findUserByUsername(testRealmResource(), "thor"); testRealmResource().users().get(user.getId()).joinGroup(gid); queried.clear(); usernames.clear(); @@ -665,7 +666,7 @@ public void testDailyEviction() { @Test public void testWeeklyEviction() { - ApiUtil.findUserByUsername(testRealmResource(), "thor"); + AdminApiUtil.findUserByUsername(testRealmResource(), "thor"); // set eviction to 4 days from now Calendar eviction = Calendar.getInstance(); @@ -697,7 +698,7 @@ public void testWeeklyEviction() { @Test public void testMaxLifespan() { - ApiUtil.findUserByUsername(testRealmResource(), "thor"); + AdminApiUtil.findUserByUsername(testRealmResource(), "thor"); // set eviction to 1 hour from now ComponentRepresentation propProviderRW = testRealmResource().components().component(propProviderRWId).toRepresentation(); @@ -727,7 +728,7 @@ public void testMaxLifespan() { @Test public void testNoCache() { - ApiUtil.findUserByUsername(testRealmResource(), "thor"); + AdminApiUtil.findUserByUsername(testRealmResource(), "thor"); // set NO_CACHE policy ComponentRepresentation propProviderRW = testRealmResource().components().component(propProviderRWId).toRepresentation(); @@ -846,11 +847,11 @@ public void testRoleMembership() { testRealmResource().roles().create(role1); testRealmResource().roles().create(role2); - UserRepresentation thor = ApiUtil.findUserByUsername(testRealmResource(), "thor"); - ApiUtil.assignRealmRoles(testRealmResource(), thor.getId(), "role1", "role2"); + UserRepresentation thor = AdminApiUtil.findUserByUsername(testRealmResource(), "thor"); + AdminApiUtil.assignRealmRoles(testRealmResource(), thor.getId(), "role1", "role2"); - UserRepresentation zeus = ApiUtil.findUserByUsername(testRealmResource(), "zeus"); - ApiUtil.assignRealmRoles(testRealmResource(), zeus.getId(), "role1"); + UserRepresentation zeus = AdminApiUtil.findUserByUsername(testRealmResource(), "zeus"); + AdminApiUtil.assignRealmRoles(testRealmResource(), zeus.getId(), "role1"); testingClient.server().run(session -> { @@ -1038,14 +1039,14 @@ public void testCRUDCredentialsOfDifferentUser() { user.credentialManager().createStoredCredential(otp1); }); - UserResource user1 = ApiUtil.findUserByUsernameId(testRealmResource(), "thor"); + UserResource user1 = AdminApiUtil.findUserByUsernameId(testRealmResource(), "thor"); CredentialRepresentation otpCredential = user1.credentials().stream() .filter(credentialRep -> OTPCredentialModel.TYPE.equals(credentialRep.getType())) .findFirst() .get(); // Test that when admin operates on user "user2", who is saved in user-storage, he can't update, move or remove credentials of different user "user1" - UserResource user2 = ApiUtil.findUserByUsernameId(testRealmResource(), "tbrady"); + UserResource user2 = AdminApiUtil.findUserByUsernameId(testRealmResource(), "tbrady"); try { user2.setCredentialUserLabel(otpCredential.getId(), "new-label"); Assert.fail("Not expected to successfully update user label"); @@ -1095,7 +1096,7 @@ public void testGrantRoleTwice() { @Test public void testRespectUsernameFormatFromStorage() { loginSuccessAndLogout("uppercase", "uppercase"); - UserResource user = ApiUtil.findUserByUsernameId(testRealmResource(), "uppercase"); + UserResource user = AdminApiUtil.findUserByUsernameId(testRealmResource(), "uppercase"); UserRepresentation rep = user.toRepresentation(); assertEquals("uppercase".toUpperCase(), rep.getUsername()); } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AltSubflowForCredentialResetTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AltSubflowForCredentialResetTest.java index 8cf1d6854407..d5acb7bcadf3 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AltSubflowForCredentialResetTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AltSubflowForCredentialResetTest.java @@ -29,7 +29,7 @@ import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.client.KeycloakTestingClient; import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.pages.LoginPasswordResetPage; @@ -93,7 +93,7 @@ public void setup() { log.info("Adding login-test user"); UserRepresentation testUser = UserBuilder.create().username("login-test").email("login@test.com").enabled(true).build(); - userID = ApiUtil.createUserAndResetPasswordWithAdminClient(testRealm(), testUser, "password"); + userID = AdminApiUtil.createUserAndResetPasswordWithAdminClient(testRealm(), testUser, "password"); getCleanup().addUserId(userID); } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BrowserButtonsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BrowserButtonsTest.java index 9b85ba21b0db..a798b8d17a83 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BrowserButtonsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BrowserButtonsTest.java @@ -26,7 +26,7 @@ import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.AbstractChangeImportedUserPasswordsTest; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.ErrorPage; import org.keycloak.testsuite.pages.InfoPage; @@ -70,7 +70,7 @@ public void setup() { .build(); generatePasswords("login-test"); - userId = ApiUtil.createUserAndResetPasswordWithAdminClient(testRealm(), user, getPassword("login-test"), true); + userId = AdminApiUtil.createUserAndResetPasswordWithAdminClient(testRealm(), user, getPassword("login-test"), true); expectedMessagesCount = 0; getCleanup().addUserId(userId); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BrowserFlowTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BrowserFlowTest.java index 85680d751312..84a5765c7e9a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BrowserFlowTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BrowserFlowTest.java @@ -34,7 +34,7 @@ import org.keycloak.testsuite.AbstractChangeImportedUserPasswordsTest; import org.keycloak.testsuite.ActionURIUtils; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.auth.page.login.OneTimeCode; import org.keycloak.testsuite.authentication.SetUserAttributeAuthenticatorFactory; import org.keycloak.testsuite.broker.SocialLoginTest; @@ -400,7 +400,7 @@ public void testConditionalRoleAuthenticatorWithRealmRoleIncludedInCompositeReal .addComposites(Collections.singletonList(testRealm().roles().get(childRealmRoleName).toRepresentation())); // Add composite-realm-role-1 to user "user-with-two-configured-otp" - UserResource userResource = ApiUtil.findUserByUsernameId(testRealm(), "user-with-two-configured-otp"); + UserResource userResource = AdminApiUtil.findUserByUsernameId(testRealm(), "user-with-two-configured-otp"); userResource.roles().realmLevel().add(Collections.singletonList(testRealm().roles().get(compositeRealmRoleName).toRepresentation())); // A browser flow is configured with an OTPForm for users having the role "child-realm-role-1" @@ -450,7 +450,7 @@ public void testConditionalRoleAuthenticatorWithClientRoleIncludedInCompositeCli .addComposites(Collections.singletonList(testRealm().clients().get(testClient.getId()).roles().get(childClientRoleName).toRepresentation())); // Add composite-client-role-1 to user "user-with-two-configured-otp" - UserResource userResource = ApiUtil.findUserByUsernameId(testRealm(), "user-with-two-configured-otp") ; + UserResource userResource = AdminApiUtil.findUserByUsernameId(testRealm(), "user-with-two-configured-otp") ; userResource.roles().clientLevel(testClient.getId()) .add(Collections.singletonList(testRealm().clients().get(testClient.getId()).roles().get(compositeClientRoleName).toRepresentation())); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/FlowOverrideTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/FlowOverrideTest.java index ea5da086ad2b..49d873794862 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/FlowOverrideTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/FlowOverrideTest.java @@ -47,7 +47,7 @@ import org.keycloak.representations.idm.AuthenticationFlowRepresentation; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.arquillian.annotation.UncaughtServerErrorExpected; import org.keycloak.testsuite.authentication.PushButtonAuthenticatorFactory; @@ -380,7 +380,7 @@ public void testRestInterfaceWithBadId() throws Exception { } private void testWithRemovedFlowOverrideByClient(String binding, Consumer testNoOverride) { - ClientResource clientResource = ApiUtil.findClientByClientId(testRealm(), "test-app"); + ClientResource clientResource = AdminApiUtil.findClientByClientId(testRealm(), "test-app"); Assert.assertNotNull(clientResource); ClientRepresentation clientRep = clientResource.toRepresentation(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LevelOfAssuranceFlowTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LevelOfAssuranceFlowTest.java index 5a4baf059ddc..76dbc0800814 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LevelOfAssuranceFlowTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LevelOfAssuranceFlowTest.java @@ -66,7 +66,7 @@ import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.account.AccountRestClient; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.arquillian.annotation.DisableFeature; import org.keycloak.testsuite.authentication.PushButtonAuthenticatorFactory; import org.keycloak.testsuite.client.KeycloakTestingClient; @@ -160,7 +160,7 @@ public void configureTestRealm(RealmRepresentation testRealm) { @Before public void beforeTest() { - UserResource user = ApiUtil.findUserByUsernameId(testRealm(), "test-user@localhost"); + UserResource user = AdminApiUtil.findUserByUsernameId(testRealm(), "test-user@localhost"); UserRepresentation userRep = user.toRepresentation(); user.remove(); @@ -458,7 +458,7 @@ public void testRealmAcrLoaMapping() throws IOException { testRealm().update(realmRep); // Remove acr-to-loa mapping from the client. It should use realm acr-to-loa mapping - ClientResource testClient = ApiUtil.findClientByClientId(testRealm(), CLIENT_ID); + ClientResource testClient = AdminApiUtil.findClientByClientId(testRealm(), CLIENT_ID); ClientRepresentation testClientRep = testClient.toRepresentation(); testClientRep.getAttributes().put(Constants.ACR_LOA_MAP, "{}"); testClient.update(testClientRep); @@ -486,7 +486,7 @@ public void testRealmAcrLoaMapping() throws IOException { @Test public void testClientDefaultAcrValues() { - ClientResource testClient = ApiUtil.findClientByClientId(testRealm(), CLIENT_ID); + ClientResource testClient = AdminApiUtil.findClientByClientId(testRealm(), CLIENT_ID); ClientRepresentation testClientRep = testClient.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(testClientRep).setAttributeMultivalued(Constants.DEFAULT_ACR_VALUES, Arrays.asList("silver", "gold")); testClient.update(testClientRep); @@ -527,7 +527,7 @@ public void testClientDefaultAcrValuesValidation() throws IOException { testRealm().update(realmRep); // Value "foo" not used in any ACR-To-Loa mapping - ClientResource testClient = ApiUtil.findClientByClientId(testRealm(), CLIENT_ID); + ClientResource testClient = AdminApiUtil.findClientByClientId(testRealm(), CLIENT_ID); ClientRepresentation testClientRep = testClient.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(testClientRep).setAttributeMultivalued(Constants.DEFAULT_ACR_VALUES, Arrays.asList("silver", "2", "foo")); try { @@ -568,7 +568,7 @@ public void testClientMinimumAcrValueValidation() throws IOException { testRealm().update(realmRep); // Value "foo" not used in any ACR-To-Loa mapping - ClientResource testClient = ApiUtil.findClientByClientId(testRealm(), CLIENT_ID); + ClientResource testClient = AdminApiUtil.findClientByClientId(testRealm(), CLIENT_ID); ClientRepresentation testClientRep = testClient.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(testClientRep).setMinimumAcrValue("foo"); Assert.assertThrows(BadRequestException.class, () -> { @@ -864,7 +864,7 @@ public void testWithMultipleOTPCodes_clientSpecificAuthenticationFlow() throws E // Override step-up flow just for the client AuthenticationFlowRepresentation stepUpFlowRepresentation = AbstractAuthenticationTest.findFlowByAlias(FLOW_ALIAS, flows); - ClientResource testClient = ApiUtil.findClientByClientId(testRealm(), CLIENT_ID); + ClientResource testClient = AdminApiUtil.findClientByClientId(testRealm(), CLIENT_ID); ClientRepresentation testClientRep = testClient.toRepresentation(); testClientRep.setAuthenticationFlowBindingOverrides( Map.of(DefaultAuthenticationFlows.BROWSER_FLOW, stepUpFlowRepresentation.getId()) @@ -982,7 +982,7 @@ public void testWithOTPAndRecoveryCodesAtLevel2() { @Test public void testLoginWithMinimumAcrWithoutAcrValues() { - ClientResource testClient = ApiUtil.findClientByClientId(testRealm(), CLIENT_ID); + ClientResource testClient = AdminApiUtil.findClientByClientId(testRealm(), CLIENT_ID); ClientRepresentation testClientRep = testClient.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(testClientRep).setMinimumAcrValue("gold"); testClient.update(testClientRep); @@ -1000,7 +1000,7 @@ public void testLoginWithMinimumAcrWithoutAcrValues() { @Test public void testLoginWithMinimumAcrWithLowerAcrValues() { - ClientResource testClient = ApiUtil.findClientByClientId(testRealm(), CLIENT_ID); + ClientResource testClient = AdminApiUtil.findClientByClientId(testRealm(), CLIENT_ID); ClientRepresentation testClientRep = testClient.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(testClientRep).setMinimumAcrValue("gold"); testClient.update(testClientRep); @@ -1018,7 +1018,7 @@ public void testLoginWithMinimumAcrWithLowerAcrValues() { @Test public void testLoginWithMinimumAcrWithHigherAcrValues() { - ClientResource testClient = ApiUtil.findClientByClientId(testRealm(), CLIENT_ID); + ClientResource testClient = AdminApiUtil.findClientByClientId(testRealm(), CLIENT_ID); ClientRepresentation testClientRep = testClient.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(testClientRep).setMinimumAcrValue("gold"); testClient.update(testClientRep); @@ -1037,7 +1037,7 @@ public void testLoginWithMinimumAcrWithHigherAcrValues() { @Test public void testEssentialAcrMinimumOk() { - ClientResource testClient = ApiUtil.findClientByClientId(testRealm(), CLIENT_ID); + ClientResource testClient = AdminApiUtil.findClientByClientId(testRealm(), CLIENT_ID); ClientRepresentation testClientRep = testClient.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(testClientRep).setMinimumAcrValue("gold"); testClient.update(testClientRep); @@ -1056,7 +1056,7 @@ public void testEssentialAcrMinimumOk() { @Test public void testEssentialAcrMinimumTooLow() { - ClientResource testClient = ApiUtil.findClientByClientId(testRealm(), CLIENT_ID); + ClientResource testClient = AdminApiUtil.findClientByClientId(testRealm(), CLIENT_ID); ClientRepresentation testClientRep = testClient.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(testClientRep).setMinimumAcrValue("gold"); testClient.update(testClientRep); @@ -1072,7 +1072,7 @@ public void testEssentialAcrMinimumTooLow() { @Test public void testNonEssentialAcrMinimumUpgrade() { - ClientResource testClient = ApiUtil.findClientByClientId(testRealm(), CLIENT_ID); + ClientResource testClient = AdminApiUtil.findClientByClientId(testRealm(), CLIENT_ID); ClientRepresentation testClientRep = testClient.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(testClientRep).setMinimumAcrValue("gold"); testClient.update(testClientRep); @@ -1109,7 +1109,7 @@ public void testClientOverrideLOAFlow() throws Exception { } private String getCredentialIdByLabel(String credentialLabel) { - return ApiUtil.findUserByUsernameId(testRealm(), "test-user@localhost").credentials() + return AdminApiUtil.findUserByUsernameId(testRealm(), "test-user@localhost").credentials() .stream() .filter(credential -> "totp2-label".equals(credential.getUserLabel())) .map(CredentialRepresentation::getId) @@ -1117,7 +1117,7 @@ private String getCredentialIdByLabel(String credentialLabel) { } private String getCredentialIdByType(String credentialType) { - return ApiUtil.findUserByUsernameId(testRealm(), "test-user@localhost").credentials() + return AdminApiUtil.findUserByUsernameId(testRealm(), "test-user@localhost").credentials() .stream() .filter(credential -> credentialType.equals(credential.getType())) .map(CredentialRepresentation::getId) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LoginTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LoginTest.java index f142ce2b06ad..f48a96a48970 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LoginTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LoginTest.java @@ -54,6 +54,7 @@ import org.keycloak.testsuite.AbstractChangeImportedUserPasswordsTest; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.ProfileAssume; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.pages.AppPage; @@ -84,7 +85,7 @@ import org.openqa.selenium.JavascriptExecutor; import static org.keycloak.common.Profile.Feature.DYNAMIC_SCOPES; -import static org.keycloak.testsuite.admin.ApiUtil.findClientByClientId; +import static org.keycloak.testsuite.admin.AdminApiUtil.findClientByClientId; import static org.keycloak.testsuite.util.ServerURLs.getAuthServerContextRoot; import static org.keycloak.testsuite.util.oauth.OAuthClient.SERVER_ROOT; @@ -1069,7 +1070,7 @@ public void loginSuccessfulWithDynamicScope() { getCleanup().addClientScopeId(scopeId); response.close(); - ClientResource testApp = ApiUtil.findClientByClientId(testRealm(), "test-app"); + ClientResource testApp = AdminApiUtil.findClientByClientId(testRealm(), "test-app"); ClientRepresentation testAppRep = testApp.toRepresentation(); testApp.update(testAppRep); testApp.addOptionalClientScope(scopeId); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/MultipleTabsLoginTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/MultipleTabsLoginTest.java index e0cb482e0ffa..378ec3ac93d9 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/MultipleTabsLoginTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/MultipleTabsLoginTest.java @@ -47,7 +47,7 @@ import org.keycloak.testsuite.ActionURIUtils; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.ErrorPage; import org.keycloak.testsuite.pages.InfoPage; @@ -117,7 +117,7 @@ public void setup() { .requiredAction(UserModel.RequiredAction.UPDATE_PASSWORD.toString()) .build(); - userId = ApiUtil.createUserAndResetPasswordWithAdminClient(testRealm(), user, generatePassword("login-test"), true); + userId = AdminApiUtil.createUserAndResetPasswordWithAdminClient(testRealm(), user, generatePassword("login-test"), true); getCleanup().addUserId(userId); oauth.clientId("test-app"); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/PasswordHashingTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/PasswordHashingTest.java index d9e223d2b60e..37c4901b1890 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/PasswordHashingTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/PasswordHashingTest.java @@ -55,7 +55,7 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.arquillian.AuthServerTestEnricher; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.LoginPage; @@ -265,7 +265,7 @@ public void testPasswordRehashedWhenCredentialImportedWithDifferentKeySize() { // Create a user with the encoded password, simulating a user import from a different system using a specific key size UserRepresentation user = UserBuilder.create().username(username).build(); user.setCredentials(List.of(ExportUtils.exportCredential(passwordCredentialModel))); - ApiUtil.createUserWithAdminClient(adminClient.realm("test"), user); + AdminApiUtil.createUserWithAdminClient(adminClient.realm("test"), user); oauth.openLoginForm(); loginPage.login(username, password); @@ -383,7 +383,7 @@ public void testPbkdf2Sha256WithPadding() throws Exception { private String createUser(String username) { final String password = generatePassword(); - ApiUtil.createUserAndResetPasswordWithAdminClient(adminClient.realm("test"), UserBuilder.create().username(username).build(), password); + AdminApiUtil.createUserAndResetPasswordWithAdminClient(adminClient.realm("test"), UserBuilder.create().username(username).build(), password); return password; } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ReAuthenticationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ReAuthenticationTest.java index 519f65564e14..9a9179c19729 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ReAuthenticationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ReAuthenticationTest.java @@ -33,7 +33,7 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractChangeImportedUserPasswordsTest; import org.keycloak.testsuite.Assert; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.auth.page.login.OneTimeCode; import org.keycloak.testsuite.broker.SocialLoginTest; import org.keycloak.testsuite.pages.AppPage; @@ -116,7 +116,7 @@ public void configureTestRealm(RealmRepresentation testRealm) { @Test public void usernamePasswordFormReauthentication() { // Add fake github link to user account - UserResource user = ApiUtil.findUserByUsernameId(testRealm(), "test-user@localhost"); + UserResource user = AdminApiUtil.findUserByUsernameId(testRealm(), "test-user@localhost"); FederatedIdentityRepresentation fedLink = FederatedIdentityBuilder.create() .identityProvider("github") .userId("123") @@ -245,7 +245,7 @@ public void identityFirstFormReauthenticationWithGithubLink() { setupIdentityFirstFlow(); // Add fake federated link to the user - UserResource user = ApiUtil.findUserByUsernameId(testRealm(), "test-user@localhost"); + UserResource user = AdminApiUtil.findUserByUsernameId(testRealm(), "test-user@localhost"); FederatedIdentityRepresentation fedLink = FederatedIdentityBuilder.create() .identityProvider("github") .userId("123") diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/RecoveryAuthnCodesAuthenticatorTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/RecoveryAuthnCodesAuthenticatorTest.java index 91b1ea56ffdd..318b6e135d06 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/RecoveryAuthnCodesAuthenticatorTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/RecoveryAuthnCodesAuthenticatorTest.java @@ -36,7 +36,7 @@ import org.keycloak.services.resources.account.AccountCredentialResource; import org.keycloak.testsuite.AbstractChangeImportedUserPasswordsTest; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.broker.util.SimpleHttpDefault; import org.keycloak.testsuite.client.KeycloakTestingClient; import org.keycloak.testsuite.pages.AppPage; @@ -151,7 +151,7 @@ void configureBrowserFlowWithRecoveryAuthnCodes(KeycloakTestingClient testingCli .defineAsBrowserFlow() ); - ApiUtil.removeUserByUsername(testRealm(), "test-user@localhost"); + AdminApiUtil.removeUserByUsername(testRealm(), "test-user@localhost"); createUser("test", "test-user@localhost", generatePassword("test-user@localhost"), UserModel.RequiredAction.CONFIGURE_RECOVERY_AUTHN_CODES.name()); } @@ -218,7 +218,7 @@ public void test02SetupRecoveryAuthnCodesLogoutOtherSessionsNotChecked() { @Test public void test03SetupRecoveryAuthnCodesModifyGeneratedAt() { // add the configure recovery codes action - UserResource testUser = ApiUtil.findUserByUsernameId(testRealm(), "test-user@localhost"); + UserResource testUser = AdminApiUtil.findUserByUsernameId(testRealm(), "test-user@localhost"); UserRepresentation userRepresentation = testUser.toRepresentation(); userRepresentation.setRequiredActions(Arrays.asList(UserModel.RequiredAction.CONFIGURE_RECOVERY_AUTHN_CODES.name())); testUser.update(userRepresentation); @@ -250,7 +250,7 @@ public void test03SetupRecoveryAuthnCodesModifyGeneratedAt() { @Test public void test04SetupRecoveryAuthnCodesModifyGeneratedCodes() { // add the configure recovery codes action - UserResource testUser = ApiUtil.findUserByUsernameId(testRealm(), "test-user@localhost"); + UserResource testUser = AdminApiUtil.findUserByUsernameId(testRealm(), "test-user@localhost"); UserRepresentation userRepresentation = testUser.toRepresentation(); userRepresentation.setRequiredActions(Arrays.asList(UserModel.RequiredAction.CONFIGURE_RECOVERY_AUTHN_CODES.name())); testUser.update(userRepresentation); @@ -489,7 +489,7 @@ public void test09recoveryAuthnCodesWithThresholdConfigured() throws Exception { authMgt.updateRequiredAction(requiredAction.getAlias(), requiredAction); // Add required action to the user - UserResource testUser = ApiUtil.findUserByUsernameId(testRealm(), "test-user@localhost"); + UserResource testUser = AdminApiUtil.findUserByUsernameId(testRealm(), "test-user@localhost"); UserRepresentation userRepresentation = testUser.toRepresentation(); userRepresentation.setRequiredActions(Arrays.asList(UserModel.RequiredAction.CONFIGURE_RECOVERY_AUTHN_CODES.name())); testUser.update(userRepresentation); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ResetCredentialsAlternativeFlowsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ResetCredentialsAlternativeFlowsTest.java index 7d93a67b359f..a6a343777258 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ResetCredentialsAlternativeFlowsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ResetCredentialsAlternativeFlowsTest.java @@ -33,7 +33,7 @@ import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.AbstractAuthenticationTest; import org.keycloak.testsuite.actions.AbstractAppInitiatedActionTest; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.ErrorPage; import org.keycloak.testsuite.pages.LoginConfigTotpPage; @@ -124,7 +124,7 @@ public void setup() { .build(); password = generatePassword(); - userId = ApiUtil.createUserAndResetPasswordWithAdminClient(testRealm(), user, password); + userId = AdminApiUtil.createUserAndResetPasswordWithAdminClient(testRealm(), user, password); getCleanup().addUserId(userId); } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ResetPasswordTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ResetPasswordTest.java index c8e2ccb609a0..f1a26443b5d5 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ResetPasswordTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ResetPasswordTest.java @@ -58,6 +58,7 @@ import org.keycloak.storage.UserStorageProviderModel; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.AssertEvents; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.arquillian.annotation.IgnoreBrowserDriver; import org.keycloak.testsuite.federation.UserMapStorageFactory; @@ -143,7 +144,7 @@ public void setup() { .build(); password = generatePassword(); - userId = ApiUtil.createUserAndResetPasswordWithAdminClient(testRealm(), defaultUser, password); + userId = AdminApiUtil.createUserAndResetPasswordWithAdminClient(testRealm(), defaultUser, password); defaultUser.setId(userId); expectedMessagesCount = 0; getCleanup().addUserId(userId); @@ -329,7 +330,7 @@ public void resetPasswordLinkErrorFlows() { Assert.assertEquals("Invalid parameter: redirect_uri", errorPage.getError()); // Client disabled - ClientResource client = ApiUtil.findClientByClientId(testRealm(), "test-app"); + ClientResource client = AdminApiUtil.findClientByClientId(testRealm(), "test-app"); ClientRepresentation clientRep = client.toRepresentation(); clientRep.setEnabled(false); client.update(clientRep); @@ -570,7 +571,7 @@ private String resetPassword(String username, String password, boolean relogin) // relogin is forced therefore the info page should be displayed Assert.assertEquals("Your account has been updated.", infoPage.getInfo()); String backToAppLink = infoPage.getBackToApplicationLink(); - ClientRepresentation client = ApiUtil.findClientByClientId(adminClient.realm("test"), "test-app").toRepresentation(); + ClientRepresentation client = AdminApiUtil.findClientByClientId(adminClient.realm("test"), "test-app").toRepresentation(); Assert.assertEquals(backToAppLink, client.getBaseUrl()); oauth.openLoginForm(); loginPage.assertCurrent(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/VerifyProfileTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/VerifyProfileTest.java index 5b8296b86a03..2dd0494385f8 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/VerifyProfileTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/VerifyProfileTest.java @@ -36,7 +36,7 @@ import org.keycloak.representations.userprofile.config.UPConfig; import org.keycloak.testsuite.AbstractChangeImportedUserPasswordsTest; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.AppPage.RequestType; import org.keycloak.testsuite.pages.LoginPage; @@ -439,7 +439,7 @@ public void testUsernameOnlyIfEmailAsUsernameIsDisabledWithUpdateEmailFeature() setUserProfileConfiguration(CONFIGURATION_FOR_USER_EDIT); updateUser(user5Id, null, "ExistingLast", null); - ApiUtil.enableRequiredAction(testRealm(), RequiredAction.UPDATE_EMAIL, true); + AdminApiUtil.enableRequiredAction(testRealm(), RequiredAction.UPDATE_EMAIL, true); try { setUserProfileConfiguration(null); @@ -473,7 +473,7 @@ public void testUsernameOnlyIfEmailAsUsernameIsDisabledWithUpdateEmailFeature() assertTrue(verifyProfilePage.isUsernamePresent()); assertFalse(verifyProfilePage.isEmailPresent()); } finally { - ApiUtil.enableRequiredAction(testRealm(), RequiredAction.UPDATE_EMAIL, false); + AdminApiUtil.enableRequiredAction(testRealm(), RequiredAction.UPDATE_EMAIL, false); realm.setEditUsernameAllowed(false); realm.setRegistrationEmailAsUsername(false); testRealm().update(realm); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/AbstractMigrationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/AbstractMigrationTest.java index 1ac0e1249014..580f0051caf2 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/AbstractMigrationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/AbstractMigrationTest.java @@ -87,7 +87,7 @@ import org.keycloak.storage.UserStorageProvider; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.Assert; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.broker.util.SimpleHttpDefault; import org.keycloak.testsuite.exportimport.ExportImportUtil; import org.keycloak.testsuite.runonserver.RunHelpers; @@ -460,7 +460,7 @@ protected void testMigrationTo26_4_0() { private void testClientContainsExpectedClientScopes() { // Test OIDC client contains expected client scopes - ClientResource migrationTestOIDCClient = ApiUtil.findClientByClientId(migrationRealm, "migration-test-client"); + ClientResource migrationTestOIDCClient = AdminApiUtil.findClientByClientId(migrationRealm, "migration-test-client"); List defaultClientScopes = migrationTestOIDCClient.getDefaultClientScopes().stream() .map(ClientScopeRepresentation::getName) .collect(Collectors.toList()); @@ -481,7 +481,7 @@ private void testClientContainsExpectedClientScopes() { )); // Test SAML client - ClientResource migrationTestSAMLClient = ApiUtil.findClientByClientId(migrationRealm, "migration-saml-client"); + ClientResource migrationTestSAMLClient = AdminApiUtil.findClientByClientId(migrationRealm, "migration-saml-client"); defaultClientScopes = migrationTestSAMLClient.getDefaultClientScopes().stream() .map(ClientScopeRepresentation::getName) .collect(Collectors.toList()); @@ -949,7 +949,7 @@ private void testPostLogoutRedirectUrisSet(RealmResource realm) { private void testOfflineScopeAddedToClient() { log.infof("Testing offline_access optional scope present in realm %s for client migration-test-client", migrationRealm.toRepresentation().getRealm()); - List optionalClientScopes = ApiUtil.findClientByClientId(this.migrationRealm, "migration-test-client").getOptionalClientScopes(); + List optionalClientScopes = AdminApiUtil.findClientByClientId(this.migrationRealm, "migration-test-client").getOptionalClientScopes(); boolean found = optionalClientScopes.stream().filter((ClientScopeRepresentation clientScope) -> { @@ -966,7 +966,7 @@ private void testOfflineScopeAddedToClient() { private void testRolesAndWebOriginsScopesAddedToClient() { log.infof("Testing roles and web-origins default scopes present in realm %s for client migration-test-client", migrationRealm.toRepresentation().getRealm()); - List defaultClientScopes = ApiUtil.findClientByClientId(this.migrationRealm, "migration-test-client").getDefaultClientScopes(); + List defaultClientScopes = AdminApiUtil.findClientByClientId(this.migrationRealm, "migration-test-client").getDefaultClientScopes(); Set defaultClientScopeNames = defaultClientScopes.stream() .map(ClientScopeRepresentation::getName) @@ -987,7 +987,7 @@ private void testRolesAndWebOriginsScopesAddedToClient() { private void testMicroprofileJWTScopeAddedToClient() { log.infof("Testing microprofile-jwt optional scope present in realm %s for client migration-test-client", migrationRealm.toRepresentation().getRealm()); - List optionalClientScopes = ApiUtil.findClientByClientId(this.migrationRealm, "migration-test-client").getOptionalClientScopes(); + List optionalClientScopes = AdminApiUtil.findClientByClientId(this.migrationRealm, "migration-test-client").getOptionalClientScopes(); Set defaultClientScopeNames = optionalClientScopes.stream() .map(ClientScopeRepresentation::getName) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AccessTokenDuplicateEmailsNotCleanedUpTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AccessTokenDuplicateEmailsNotCleanedUpTest.java index 5b6f116c695c..34303c199772 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AccessTokenDuplicateEmailsNotCleanedUpTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AccessTokenDuplicateEmailsNotCleanedUpTest.java @@ -30,7 +30,7 @@ import org.openqa.selenium.By; import static org.keycloak.testsuite.AbstractAdminTest.loadJson; -import static org.keycloak.testsuite.admin.ApiUtil.findUserByUsername; +import static org.keycloak.testsuite.admin.AdminApiUtil.findUserByUsername; import static org.junit.Assert.assertEquals; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AccessTokenDuplicateEmailsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AccessTokenDuplicateEmailsTest.java index 9ecd9514c3c9..057c633d4226 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AccessTokenDuplicateEmailsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AccessTokenDuplicateEmailsTest.java @@ -30,7 +30,7 @@ import org.openqa.selenium.By; import static org.keycloak.testsuite.AbstractAdminTest.loadJson; -import static org.keycloak.testsuite.admin.ApiUtil.findUserByUsername; +import static org.keycloak.testsuite.admin.AdminApiUtil.findUserByUsername; import static org.keycloak.testsuite.util.ServerURLs.getAuthServerContextRoot; import static org.junit.Assert.assertEquals; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AccessTokenNoEmailLoginTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AccessTokenNoEmailLoginTest.java index 24f097b23519..d8893c9306bd 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AccessTokenNoEmailLoginTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AccessTokenNoEmailLoginTest.java @@ -28,7 +28,7 @@ import org.openqa.selenium.By; import static org.keycloak.testsuite.AbstractAdminTest.loadJson; -import static org.keycloak.testsuite.admin.ApiUtil.findUserByUsername; +import static org.keycloak.testsuite.admin.AdminApiUtil.findUserByUsername; import static org.junit.Assert.assertEquals; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AccessTokenTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AccessTokenTest.java index fe27a8eea597..d765668a31f8 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AccessTokenTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AccessTokenTest.java @@ -79,6 +79,7 @@ import org.keycloak.testsuite.ActionURIUtils; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.ProfileAssume; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.util.AdminClientUtil; import org.keycloak.testsuite.util.ClientBuilder; @@ -116,9 +117,9 @@ import static org.keycloak.testsuite.AbstractAdminTest.loadJson; import static org.keycloak.testsuite.Assert.assertExpiration; -import static org.keycloak.testsuite.admin.ApiUtil.findClientByClientId; -import static org.keycloak.testsuite.admin.ApiUtil.findUserByUsername; -import static org.keycloak.testsuite.admin.ApiUtil.findUserByUsernameId; +import static org.keycloak.testsuite.admin.AdminApiUtil.findClientByClientId; +import static org.keycloak.testsuite.admin.AdminApiUtil.findUserByUsername; +import static org.keycloak.testsuite.admin.AdminApiUtil.findUserByUsernameId; import static org.keycloak.testsuite.util.ProtocolMapperUtil.createRoleNameMapper; import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_SSL_REQUIRED; import static org.keycloak.testsuite.util.oauth.OAuthClient.AUTH_SERVER_ROOT; @@ -878,7 +879,7 @@ public void testClientScope() throws Exception { assertEquals(201, response.getStatus()); response.close(); - ClientRepresentation clientRep = ApiUtil.findClientByClientId(realm, "test-app").toRepresentation(); + ClientRepresentation clientRep = AdminApiUtil.findClientByClientId(realm, "test-app").toRepresentation(); realm.clients().get(clientRep.getId()).addDefaultClientScope(clientScopeId); clientRep.setFullScopeAllowed(false); realm.clients().get(clientRep.getId()).update(clientRep); @@ -1172,7 +1173,7 @@ protected Response executeGrantRequest(WebTarget grantTarget, String username, S @Test public void clientAccessTokenLifespanOverride() { - ClientResource client = ApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); + ClientResource client = AdminApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); ClientRepresentation clientRep = client.toRepresentation(); RealmResource realm = adminClient.realm("test"); @@ -1216,7 +1217,7 @@ public void clientAccessTokenLifespanOverride() { @Test public void testClientSessionMaxLifespan() throws Exception { - ClientResource client = ApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); + ClientResource client = AdminApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); ClientRepresentation clientRepresentation = client.toRepresentation(); RealmResource realm = adminClient.realm("test"); @@ -1257,7 +1258,7 @@ public void testClientSessionMaxLifespan() throws Exception { @Test public void testClientOfflineSessionMaxLifespan() throws Exception { - ClientResource client = ApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); + ClientResource client = AdminApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); ClientRepresentation clientRepresentation = client.toRepresentation(); RealmResource realm = adminClient.realm("test"); @@ -1304,7 +1305,7 @@ public void testClientOfflineSessionMaxLifespan() throws Exception { @Test public void accessTokenRequestNoRefreshToken() { - ClientResource client = ApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); + ClientResource client = AdminApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); ClientRepresentation clientRepresentation = client.toRepresentation(); clientRepresentation.getAttributes().put(OIDCConfigAttributes.USE_REFRESH_TOKEN, "false"); client.update(clientRepresentation); @@ -1409,11 +1410,11 @@ private void validateTokenECDSASignature(String expectedAlg) { try { TokenSignatureUtil.changeRealmTokenSignatureProvider(adminClient, expectedAlg); - TokenSignatureUtil.changeClientAccessTokenSignatureProvider(ApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"), expectedAlg); + TokenSignatureUtil.changeClientAccessTokenSignatureProvider(AdminApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"), expectedAlg); validateTokenSignatureLength(ECDSAAlgorithm.getSignatureLength(expectedAlg)); } finally { TokenSignatureUtil.changeRealmTokenSignatureProvider(adminClient, Algorithm.RS256); - TokenSignatureUtil.changeClientAccessTokenSignatureProvider(ApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"), Algorithm.RS256); + TokenSignatureUtil.changeClientAccessTokenSignatureProvider(AdminApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"), Algorithm.RS256); } } @@ -1439,11 +1440,11 @@ private void conductAccessTokenRequest(String expectedRefreshAlg, String expecte try { /// Realm Setting is used for ID Token Signature Algorithm TokenSignatureUtil.changeRealmTokenSignatureProvider(adminClient, expectedIdTokenAlg); - TokenSignatureUtil.changeClientAccessTokenSignatureProvider(ApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"), expectedAccessAlg); + TokenSignatureUtil.changeClientAccessTokenSignatureProvider(AdminApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"), expectedAccessAlg); tokenRequest(expectedRefreshAlg, expectedAccessAlg, expectedIdTokenAlg, idTokenCurve); } finally { TokenSignatureUtil.changeRealmTokenSignatureProvider(adminClient, Algorithm.RS256); - TokenSignatureUtil.changeClientAccessTokenSignatureProvider(ApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"), Algorithm.RS256); + TokenSignatureUtil.changeClientAccessTokenSignatureProvider(AdminApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"), Algorithm.RS256); } } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/BackchannelLogoutTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/BackchannelLogoutTest.java index f1adc3da2407..0f5d5ad1c233 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/BackchannelLogoutTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/BackchannelLogoutTest.java @@ -48,8 +48,8 @@ import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; -import static org.keycloak.testsuite.admin.ApiUtil.createUserWithAdminClient; -import static org.keycloak.testsuite.admin.ApiUtil.resetUserPassword; +import static org.keycloak.testsuite.admin.AdminApiUtil.createUserWithAdminClient; +import static org.keycloak.testsuite.admin.AdminApiUtil.resetUserPassword; import static org.keycloak.testsuite.broker.BrokerTestTools.getConsumerRoot; import static org.keycloak.testsuite.util.WaitUtils.waitUntilElement; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientAuthPostMethodTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientAuthPostMethodTest.java index 9358a6c85d79..074f80e7789a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientAuthPostMethodTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientAuthPostMethodTest.java @@ -34,7 +34,7 @@ import org.keycloak.testsuite.AbstractAdminTest; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.apache.http.NameValuePair; @@ -99,7 +99,7 @@ public void testPostAuthentication() { @Test public void testBasicAuthenticationNotAllowedWhenPostRequested() { // Update client to request client_secret_post client authentication method - ClientResource client = ApiUtil.findClientByClientId(adminClient.realm("test"), oauth.getClientId()); + ClientResource client = AdminApiUtil.findClientByClientId(adminClient.realm("test"), oauth.getClientId()); ClientRepresentation clientRep = client.toRepresentation(); OIDCClientSecretConfigWrapper.fromClientRepresentation(clientRep).setClientSecretAuthenticationAllowedMethod(OIDCLoginProtocol.CLIENT_SECRET_POST); client.update(clientRep); @@ -128,7 +128,7 @@ public void testBasicAuthenticationNotAllowedWhenPostRequested() { @Test public void testPostAuthenticationNotAllowedWhenBasicRequested() { // Update client to request client_secret_basic client authentication method - ClientResource client = ApiUtil.findClientByClientId(adminClient.realm("test"), oauth.getClientId()); + ClientResource client = AdminApiUtil.findClientByClientId(adminClient.realm("test"), oauth.getClientId()); ClientRepresentation clientRep = client.toRepresentation(); OIDCClientSecretConfigWrapper.fromClientRepresentation(clientRep).setClientSecretAuthenticationAllowedMethod(OIDCLoginProtocol.CLIENT_SECRET_BASIC); client.update(clientRep); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientAuthSecretSignedJWTTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientAuthSecretSignedJWTTest.java index c3b4bd963b90..15f6f9bb0343 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientAuthSecretSignedJWTTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientAuthSecretSignedJWTTest.java @@ -59,6 +59,7 @@ import org.keycloak.testsuite.AbstractAdminTest; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.AssertEvents; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.util.ClientPoliciesUtil; @@ -137,7 +138,7 @@ public void testCodeToTokenRequestSuccessHS512() throws Exception { @Test public void testCodeToTokenRequestSuccessWhenClientHasGeneratedKeys() throws Exception { // Test when client has public/private keys generated despite the fact that it uses client-secret for the client authentication (and not those keys) - ApiUtil.findClientByClientId(adminClient.realm("test"), "test-app").getCertficateResource("jwt.credential").generate(); + AdminApiUtil.findClientByClientId(adminClient.realm("test"), "test-app").getCertficateResource("jwt.credential").generate(); testCodeToTokenRequestSuccess(Algorithm.HS256); } @@ -145,7 +146,7 @@ public void testCodeToTokenRequestSuccessWhenClientHasGeneratedKeys() throws Exc @Test public void testCodeToTokenRequestFailureWhenClientHasPrivateKeyJWT() throws Exception { // Setup client for "private_key_jwt" authentication - ClientResource client = ApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); + ClientResource client = AdminApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); client.getCertficateResource("jwt.credential").generate(); ClientRepresentation clientRep = client.toRepresentation(); clientRep.setClientAuthenticatorType(JWTClientAuthenticator.PROVIDER_ID); @@ -200,7 +201,7 @@ public void testCodeToTokenRequestFailureHS384Enforced() throws Exception { final String realmName = "test"; final String clientId = "test-app"; try { - clientResource = ApiUtil.findClientByClientId(adminClient.realm(realmName), clientId); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(realmName), clientId); clientRep = clientResource.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setTokenEndpointAuthSigningAlg(Algorithm.HS384); clientResource.update(clientRep); @@ -209,7 +210,7 @@ public void testCodeToTokenRequestFailureHS384Enforced() throws Exception { } catch (Exception e) { fail(); } finally { - clientResource = ApiUtil.findClientByClientId(adminClient.realm(realmName), clientId); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(realmName), clientId); clientRep = clientResource.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setTokenEndpointAuthSigningAlg(null); clientResource.update(clientRep); @@ -223,7 +224,7 @@ public void testCodeToTokenRequestFailureHS512Enforced() throws Exception { final String realmName = "test"; final String clientId = "test-app"; try { - clientResource = ApiUtil.findClientByClientId(adminClient.realm(realmName), clientId); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(realmName), clientId); clientRep = clientResource.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setTokenEndpointAuthSigningAlg(Algorithm.HS512); clientResource.update(clientRep); @@ -239,7 +240,7 @@ public void testCodeToTokenRequestFailureHS512Enforced() throws Exception { } catch (Exception e) { fail(); } finally { - clientResource = ApiUtil.findClientByClientId(adminClient.realm(realmName), clientId); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(realmName), clientId); clientRep = clientResource.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setTokenEndpointAuthSigningAlg(null); clientResource.update(clientRep); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientAuthSignedJWTTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientAuthSignedJWTTest.java index e07585d857ba..527deb4d8c71 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientAuthSignedJWTTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientAuthSignedJWTTest.java @@ -45,7 +45,7 @@ import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.services.util.CertificateInfoHelper; import org.keycloak.testsuite.Assert; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.util.ClientManager; import org.keycloak.testsuite.util.KeyUtils; import org.keycloak.testsuite.util.KeystoreUtils; @@ -197,7 +197,7 @@ public void testCodeToTokenRequestSuccessES256Enforced() throws Exception { ClientResource clientResource = null; ClientRepresentation clientRep = null; try { - clientResource = ApiUtil.findClientByClientId(adminClient.realm("test"), "client2"); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm("test"), "client2"); clientRep = clientResource.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setTokenEndpointAuthSigningAlg(Algorithm.ES256); clientResource.update(clientRep); @@ -206,7 +206,7 @@ public void testCodeToTokenRequestSuccessES256Enforced() throws Exception { } catch (Exception e) { Assert.fail(); } finally { - clientResource = ApiUtil.findClientByClientId(adminClient.realm("test"), "client2"); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm("test"), "client2"); clientRep = clientResource.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setTokenEndpointAuthSigningAlg(null); clientResource.update(clientRep); @@ -566,7 +566,7 @@ class CertificateHolder { } final CertificateHolder backupClient1Cert = new CertificateHolder(); - backupClient1Cert.certificate = ApiUtil.findClientByClientId(adminClient.realm("test"), "client1") + backupClient1Cert.certificate = AdminApiUtil.findClientByClientId(adminClient.realm("test"), "client1") .toRepresentation().getAttributes().get(JWTClientAuthenticator.CERTIFICATE_ATTR); ClientManager.realm(adminClient.realm("test")).clientId("client1") @@ -772,7 +772,7 @@ public void testAssertionReuse() throws Exception { @Test public void testAuthenticationFailsWhenClientSecretJWTAuthenticatorSet() throws Exception { // Set client authenticator to JWT signed by client secret. - ClientResource clientResource = ApiUtil.findClientByClientId(adminClient.realm("test"), "client1"); + ClientResource clientResource = AdminApiUtil.findClientByClientId(adminClient.realm("test"), "client1"); ClientRepresentation clientRep = clientResource.toRepresentation(); clientRep.setClientAuthenticatorType(JWTClientSecretAuthenticator.PROVIDER_ID); clientResource.update(clientRep); @@ -847,7 +847,7 @@ public void testCodeToTokenRequestFailureES256Enforced() throws Exception { ClientResource clientResource = null; ClientRepresentation clientRep = null; try { - clientResource = ApiUtil.findClientByClientId(adminClient.realm("test"), "client2"); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm("test"), "client2"); clientRep = clientResource.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setTokenEndpointAuthSigningAlg(Algorithm.ES256); clientResource.update(clientRep); @@ -856,7 +856,7 @@ public void testCodeToTokenRequestFailureES256Enforced() throws Exception { } catch (Exception e) { Assert.fail(); } finally { - clientResource = ApiUtil.findClientByClientId(adminClient.realm("test"), "client2"); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm("test"), "client2"); clientRep = clientResource.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setTokenEndpointAuthSigningAlg(null); clientResource.update(clientRep); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/DPoPTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/DPoPTest.java index 0386ca48ef82..8a535204250f 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/DPoPTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/DPoPTest.java @@ -81,6 +81,7 @@ import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AssertEvents; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.broker.util.SimpleHttpDefault; import org.keycloak.testsuite.util.AdminClientUtil; @@ -1099,14 +1100,14 @@ private void testDPoPProofFailure(String dpopProofEncoded, String errorDescripti } private void changeDPoPBound(String clientId, boolean isEnabled) { - ClientResource clientResource = ApiUtil.findClientByClientId(adminClient.realm(REALM_NAME), clientId); + ClientResource clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(REALM_NAME), clientId); ClientRepresentation clientRep = clientResource.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setUseDPoP(isEnabled); clientResource.update(clientRep); } private void modifyClient(String clientId, BiConsumer modify) { - ClientResource clientResource = ApiUtil.findClientByClientId(adminClient.realm(REALM_NAME), clientId); + ClientResource clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(REALM_NAME), clientId); ClientRepresentation clientRep = clientResource.toRepresentation(); OIDCAdvancedConfigWrapper configWrapper = OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep); modify.accept(clientRep, configWrapper); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/LogoutTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/LogoutTest.java index 2ba418d7e678..426528116497 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/LogoutTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/LogoutTest.java @@ -47,7 +47,7 @@ import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.updaters.ClientAttributeUpdater; import org.keycloak.testsuite.updaters.RealmAttributeUpdater; @@ -240,7 +240,7 @@ public void testRemoveAuthSessionWhenUserSessionFromIdTokenIsInvalid() throws IO .lastName("last") .enabled(true) .build()).close(); - UserRepresentation user = ApiUtil.findUserByUsername(realm, "user-0"); + UserRepresentation user = AdminApiUtil.findUserByUsername(realm, "user-0"); Assert.assertNotNull(user); oauth.openLoginForm(); @@ -274,7 +274,7 @@ public void testRemoveAuthSessionWhenUserSessionFromIdTokenIsInvalid() throws IO .idTokenHint(idTokenString) .postLogoutRedirectUri(oauth.APP_AUTH_ROOT) .open(); - user = ApiUtil.findUserByUsername(realm, "user-1"); + user = AdminApiUtil.findUserByUsername(realm, "user-1"); Assert.assertNotNull(user); realm.users().get(user.getId()).remove(); } @@ -286,7 +286,7 @@ public void logoutUserByAdmin() { loginPage.login("test-user@localhost", "password"); String sessionId = events.expectLogin().assertEvent().getSessionId(); - UserRepresentation user = ApiUtil.findUserByUsername(adminClient.realm("test"), "test-user@localhost"); + UserRepresentation user = AdminApiUtil.findUserByUsername(adminClient.realm("test"), "test-user@localhost"); Assert.assertEquals((Object) 0, user.getNotBefore()); adminClient.realm("test").users().get(user.getId()).logout(); @@ -339,11 +339,11 @@ private void backchannelLogoutRequest(String expectedRefreshAlg, String expected public void backchannelLogoutRequest_RealmRS384_ClientRS512() throws Exception { try { TokenSignatureUtil.changeRealmTokenSignatureProvider(adminClient, "RS384"); - TokenSignatureUtil.changeClientAccessTokenSignatureProvider(ApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"), "RS512"); + TokenSignatureUtil.changeClientAccessTokenSignatureProvider(AdminApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"), "RS512"); backchannelLogoutRequest(Constants.INTERNAL_SIGNATURE_ALGORITHM, "RS512", "RS384"); } finally { TokenSignatureUtil.changeRealmTokenSignatureProvider(adminClient, "RS256"); - TokenSignatureUtil.changeClientAccessTokenSignatureProvider(ApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"), "RS256"); + TokenSignatureUtil.changeClientAccessTokenSignatureProvider(AdminApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"), "RS256"); } } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuth2DeviceAuthorizationGrantTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuth2DeviceAuthorizationGrantTest.java index b3d8490f9f8c..154340448aea 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuth2DeviceAuthorizationGrantTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuth2DeviceAuthorizationGrantTest.java @@ -42,7 +42,7 @@ import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.pages.ErrorPage; import org.keycloak.testsuite.pages.OAuth2DeviceVerificationPage; import org.keycloak.testsuite.pages.OAuthGrantPage; @@ -519,7 +519,7 @@ public void testPublicClientConsentWithoutScopes() throws Exception { @Test public void testNoRefreshToken() throws Exception { - ClientResource client = ApiUtil.findClientByClientId(adminClient.realm(REALM_NAME), DEVICE_APP); + ClientResource client = AdminApiUtil.findClientByClientId(adminClient.realm(REALM_NAME), DEVICE_APP); ClientRepresentation clientRepresentation = client.toRepresentation(); clientRepresentation.getAttributes().put(OIDCConfigAttributes.USE_REFRESH_TOKEN, "false"); client.update(clientRepresentation); @@ -743,7 +743,7 @@ public void testDuplicatedRequestParams() throws Exception { @Test public void testDeviceCodeLifespanPerClient() throws Exception { getTestingClient().testing().setTestingInfinispanTimeService(); - ClientResource client = ApiUtil.findClientByClientId(adminClient.realm(REALM_NAME), DEVICE_APP); + ClientResource client = AdminApiUtil.findClientByClientId(adminClient.realm(REALM_NAME), DEVICE_APP); ClientRepresentation clientRepresentation = client.toRepresentation(); // Device Authorization Request from device oauth.realm(REALM_NAME); @@ -793,7 +793,7 @@ public void testDeviceCodeLifespanPerClient() throws Exception { @Test public void testDevicePollingIntervalPerClient() throws Exception { getTestingClient().testing().setTestingInfinispanTimeService(); - ClientResource client = ApiUtil.findClientByClientId(adminClient.realm(REALM_NAME), DEVICE_APP); + ClientResource client = AdminApiUtil.findClientByClientId(adminClient.realm(REALM_NAME), DEVICE_APP); ClientRepresentation clientRepresentation = client.toRepresentation(); // Device Authorization Request from device oauth.realm(REALM_NAME); @@ -1041,7 +1041,7 @@ public void testNotFoundClient() throws Exception { @Test public void testClientWithErrors() throws Exception { try { - ClientResource client = ApiUtil.findClientByClientId(adminClient.realm(REALM_NAME), DEVICE_APP_PUBLIC); + ClientResource client = AdminApiUtil.findClientByClientId(adminClient.realm(REALM_NAME), DEVICE_APP_PUBLIC); ClientRepresentation clientRepresentation = client.toRepresentation(); clientRepresentation.getAttributes().put(OAuth2DeviceConfig.OAUTH2_DEVICE_AUTHORIZATION_GRANT_ENABLED, "false"); client.update(clientRepresentation); @@ -1065,7 +1065,7 @@ public void testClientWithErrors() throws Exception { Assert.assertEquals("Bearer-only applications are not allowed to initiate browser login.", response.getErrorDescription()); } finally { - ClientResource client = ApiUtil.findClientByClientId(adminClient.realm(REALM_NAME), DEVICE_APP_PUBLIC); + ClientResource client = AdminApiUtil.findClientByClientId(adminClient.realm(REALM_NAME), DEVICE_APP_PUBLIC); ClientRepresentation clientRepresentation = client.toRepresentation(); clientRepresentation.getAttributes().put(OAuth2DeviceConfig.OAUTH2_DEVICE_AUTHORIZATION_GRANT_ENABLED, "true"); clientRepresentation.setBearerOnly(false); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthGrantTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthGrantTest.java index b3cbc8dea526..ba9347492a5c 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthGrantTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthGrantTest.java @@ -39,6 +39,7 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.AssertEvents; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.pages.AppPage; @@ -57,7 +58,7 @@ import org.openqa.selenium.By; import static org.keycloak.testsuite.AbstractAdminTest.loadJson; -import static org.keycloak.testsuite.admin.ApiUtil.findClientByClientId; +import static org.keycloak.testsuite.admin.AdminApiUtil.findClientByClientId; import static org.keycloak.testsuite.auth.page.AuthRealm.TEST; import static org.junit.Assert.assertEquals; @@ -428,7 +429,7 @@ public void oauthGrantClientScopeMappers() throws Exception { Assert.assertTrue(((List) userConsents.get(0).get("grantedClientScopes")).stream().anyMatch(p -> p.equals("foo-addr"))); // Login as admin and see the consent screen of particular user - UserResource user = ApiUtil.findUserByUsernameId(appRealm, "test-user@localhost"); + UserResource user = AdminApiUtil.findUserByUsernameId(appRealm, "test-user@localhost"); List> consents = user.getConsents(); Assert.assertEquals(1, consents.size()); @@ -476,13 +477,13 @@ public void oauthGrantOrderedClientScopes() throws Exception { // Add GUI Order to client scopes --- email=1, profile=2 RealmResource appRealm = adminClient.realm(REALM_NAME); - ClientScopeResource emailScope = ApiUtil.findClientScopeByName(appRealm, "email"); + ClientScopeResource emailScope = AdminApiUtil.findClientScopeByName(appRealm, "email"); ClientScopeRepresentation emailRep = emailScope.toRepresentation(); emailRep.getAttributes().put(ClientScopeModel.GUI_ORDER, "1"); emailScope.update(emailRep); Assert.assertEquals("1", emailRep.getAttributes().get(ClientScopeModel.GUI_ORDER)); - ClientScopeResource profileScope = ApiUtil.findClientScopeByName(appRealm, "profile"); + ClientScopeResource profileScope = AdminApiUtil.findClientScopeByName(appRealm, "profile"); ClientScopeRepresentation profileRep = profileScope.toRepresentation(); profileRep.getAttributes().put(ClientScopeModel.GUI_ORDER, "2"); profileScope.update(profileRep); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthProofKeyForCodeExchangeTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthProofKeyForCodeExchangeTest.java index bd7158b951ef..56c1b205487d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthProofKeyForCodeExchangeTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthProofKeyForCodeExchangeTest.java @@ -24,7 +24,7 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.util.ClientManager; import org.keycloak.testsuite.util.UserBuilder; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; @@ -36,7 +36,7 @@ import org.junit.Test; import static org.keycloak.testsuite.AbstractAdminTest.loadJson; -import static org.keycloak.testsuite.admin.ApiUtil.findUserByUsername; +import static org.keycloak.testsuite.admin.AdminApiUtil.findUserByUsername; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; @@ -483,7 +483,7 @@ private void expectSuccessfulResponseFromTokenEndpoint(String codeId, String ses // KEYCLOAK-10747 Explicit Proof Key for Code Exchange Activation Settings private void setPkceActivationSettings(String clientId, String codeChallengeMethodName) { - ClientResource clientResource = ApiUtil.findClientByClientId(adminClient.realm("test"), clientId); + ClientResource clientResource = AdminApiUtil.findClientByClientId(adminClient.realm("test"), clientId); ClientRepresentation clientRep = clientResource.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setPkceCodeChallengeMethod(codeChallengeMethodName); clientResource.update(clientRep); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthScopeInTokenResponseTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthScopeInTokenResponseTest.java index 9116ed3b2eeb..fb27be029a73 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthScopeInTokenResponseTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthScopeInTokenResponseTest.java @@ -17,6 +17,7 @@ import org.keycloak.representations.idm.ClientScopeRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; @@ -187,7 +188,7 @@ public void specifyMultipleExistingScopesTest() throws Exception { String userScopeId = ApiUtil.getCreatedId(response); getCleanup().addClientScopeId(userScopeId); - ApiUtil.findClientResourceByClientId(realmsResouce().realm("test"), "test-app").addOptionalClientScope(userScopeId); + AdminApiUtil.findClientResourceByClientId(realmsResouce().realm("test"), "test-app").addOptionalClientScope(userScopeId); String loginUser = "john-doh@localhost"; @@ -217,7 +218,7 @@ public void specifyMultipleExistingScopesTest() throws Exception { expectSuccessfulResponseFromTokenEndpoint(code, expectedScope); // Cleanup - ApiUtil.findClientResourceByClientId(realmsResouce().realm("test"), "test-app").removeOptionalClientScope(userScopeId); + AdminApiUtil.findClientResourceByClientId(realmsResouce().realm("test"), "test-app").removeOptionalClientScope(userScopeId); } private void expectSuccessfulResponseFromTokenEndpoint(String code, String expectedScope) throws Exception { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OIDCProtocolMappersTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OIDCProtocolMappersTest.java index 66f03546c8e7..8036c1cc8a3c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OIDCProtocolMappersTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OIDCProtocolMappersTest.java @@ -61,6 +61,7 @@ import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AssertEvents; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.updaters.ClientAttributeUpdater; @@ -83,9 +84,9 @@ import static org.keycloak.OAuth2Constants.SCOPE_PROFILE; import static org.keycloak.testsuite.AbstractAdminTest.loadJson; -import static org.keycloak.testsuite.admin.ApiUtil.findClientByClientId; -import static org.keycloak.testsuite.admin.ApiUtil.findClientResourceByClientId; -import static org.keycloak.testsuite.admin.ApiUtil.findUserByUsernameId; +import static org.keycloak.testsuite.admin.AdminApiUtil.findClientByClientId; +import static org.keycloak.testsuite.admin.AdminApiUtil.findClientResourceByClientId; +import static org.keycloak.testsuite.admin.AdminApiUtil.findUserByUsernameId; import static org.keycloak.testsuite.admin.ApiUtil.getCreatedId; import static org.keycloak.testsuite.util.ProtocolMapperUtil.createAddressMapper; import static org.keycloak.testsuite.util.ProtocolMapperUtil.createClaimMapper; @@ -780,7 +781,7 @@ public void testUserRoleToAttributeMappers() throws Exception { ProtocolMapperRepresentation realmMapper = ProtocolMapperUtil.createUserRealmRoleMappingMapper("pref.", "Realm roles mapper", "roles-custom.realm", true, true, true); ProtocolMapperRepresentation clientMapper = ProtocolMapperUtil.createUserClientRoleMappingMapper("test-app", null, "Client roles mapper", "roles-custom.test-app", true, true, true); - ProtocolMappersResource protocolMappers = ApiUtil.findClientResourceByClientId(adminClient.realm("test"), "test-app").getProtocolMappers(); + ProtocolMappersResource protocolMappers = AdminApiUtil.findClientResourceByClientId(adminClient.realm("test"), "test-app").getProtocolMappers(); protocolMappers.createMapper(Arrays.asList(realmMapper, clientMapper)); // Login user @@ -810,7 +811,7 @@ public void testUserRoleToAttributeMappers() throws Exception { public void testUserRolesMovedFromAccessTokenProperties() throws Exception { RealmResource realm = adminClient.realm("test"); - ClientScopeResource rolesScope = ApiUtil.findClientScopeByName(realm, OIDCLoginProtocolFactory.ROLES_SCOPE); + ClientScopeResource rolesScope = AdminApiUtil.findClientScopeByName(realm, OIDCLoginProtocolFactory.ROLES_SCOPE); // Update builtin protocolMappers to put roles to different position (claim "custom.roles") for both realm and client roles ProtocolMapperRepresentation realmRolesMapper = null; @@ -871,11 +872,11 @@ public void testUserRolesMovedFromAccessTokenProperties() throws Exception { @Test public void testRolesAndAllowedOriginsRemovedFromAccessToken() throws Exception { RealmResource realm = adminClient.realm("test"); - ClientScopeRepresentation allowedOriginsScope = ApiUtil.findClientScopeByName(realm, OIDCLoginProtocolFactory.WEB_ORIGINS_SCOPE).toRepresentation(); - ClientScopeRepresentation rolesScope = ApiUtil.findClientScopeByName(realm, OIDCLoginProtocolFactory.ROLES_SCOPE).toRepresentation(); + ClientScopeRepresentation allowedOriginsScope = AdminApiUtil.findClientScopeByName(realm, OIDCLoginProtocolFactory.WEB_ORIGINS_SCOPE).toRepresentation(); + ClientScopeRepresentation rolesScope = AdminApiUtil.findClientScopeByName(realm, OIDCLoginProtocolFactory.ROLES_SCOPE).toRepresentation(); // Remove 'roles' and 'web-origins' scope from the client - ClientResource testApp = ApiUtil.findClientByClientId(realm, "test-app"); + ClientResource testApp = AdminApiUtil.findClientByClientId(realm, "test-app"); testApp.removeDefaultClientScope(allowedOriginsScope.getId()); testApp.removeDefaultClientScope(rolesScope.getId()); @@ -916,7 +917,7 @@ public void testUserRoleToAttributeMappersWithMultiValuedRoles() throws Exceptio ProtocolMapperRepresentation realmMapper = ProtocolMapperUtil.createUserRealmRoleMappingMapper("pref.", "Realm roles mapper", "roles-custom.realm", true, true, true); ProtocolMapperRepresentation clientMapper = ProtocolMapperUtil.createUserClientRoleMappingMapper("test-app", null, "Client roles mapper", "roles-custom.test-app", true, true, true); - ProtocolMappersResource protocolMappers = ApiUtil.findClientResourceByClientId(adminClient.realm("test"), "test-app").getProtocolMappers(); + ProtocolMappersResource protocolMappers = AdminApiUtil.findClientResourceByClientId(adminClient.realm("test"), "test-app").getProtocolMappers(); protocolMappers.createMapper(Arrays.asList(realmMapper, clientMapper)); // Login user @@ -954,14 +955,14 @@ public void testUserRoleToAttributeMappersWithFullScopeDisabled() throws Excepti ProtocolMapperRepresentation realmMapper = ProtocolMapperUtil.createUserRealmRoleMappingMapper("pref.", "Realm roles mapper", "roles-custom.realm", true, true, true); ProtocolMapperRepresentation clientMapper = ProtocolMapperUtil.createUserClientRoleMappingMapper("test-app", null, "Client roles mapper", "roles-custom.test-app", true, true, true); - ClientResource client = ApiUtil.findClientResourceByClientId(adminClient.realm("test"), "test-app"); + ClientResource client = AdminApiUtil.findClientResourceByClientId(adminClient.realm("test"), "test-app"); // Disable full-scope-allowed ClientRepresentation rep = client.toRepresentation(); rep.setFullScopeAllowed(false); client.update(rep); - ProtocolMappersResource protocolMappers = ApiUtil.findClientResourceByClientId(adminClient.realm("test"), "test-app").getProtocolMappers(); + ProtocolMappersResource protocolMappers = AdminApiUtil.findClientResourceByClientId(adminClient.realm("test"), "test-app").getProtocolMappers(); protocolMappers.createMapper(Arrays.asList(realmMapper, clientMapper)); // Login user @@ -1002,12 +1003,12 @@ public void testRoleMapperWithRoleInheritedFromMoreGroups() throws Exception { String clientId = "test-app"; ProtocolMapperRepresentation clientMapper = ProtocolMapperUtil.createUserClientRoleMappingMapper(clientId, null, "Client roles mapper", "roles-custom.test-app", true, true, true); - ProtocolMappersResource protocolMappers = ApiUtil.findClientResourceByClientId(adminClient.realm("test"), clientId).getProtocolMappers(); + ProtocolMappersResource protocolMappers = AdminApiUtil.findClientResourceByClientId(adminClient.realm("test"), clientId).getProtocolMappers(); protocolMappers.createMapper(Arrays.asList(clientMapper)); // Add user 'level2GroupUser' to the group 'level2Group2' GroupRepresentation level2Group2 = adminClient.realm("test").getGroupByPath("/topGroup/level2group2"); - UserResource level2GroupUser = ApiUtil.findUserByUsernameId(adminClient.realm("test"), "level2GroupUser"); + UserResource level2GroupUser = AdminApiUtil.findUserByUsernameId(adminClient.realm("test"), "level2GroupUser"); level2GroupUser.joinGroup(level2Group2.getId()); oauth.client(clientId, "password"); @@ -1036,7 +1037,7 @@ public void testUserGroupRoleToAttributeMappers() throws Exception { ProtocolMapperRepresentation realmMapper = ProtocolMapperUtil.createUserRealmRoleMappingMapper("pref.", "Realm roles mapper", "roles-custom.realm", true, true, true); ProtocolMapperRepresentation clientMapper = ProtocolMapperUtil.createUserClientRoleMappingMapper(clientId, "ta.", "Client roles mapper", "roles-custom.test-app", true, true, true); - ProtocolMappersResource protocolMappers = ApiUtil.findClientResourceByClientId(adminClient.realm("test"), clientId).getProtocolMappers(); + ProtocolMappersResource protocolMappers = AdminApiUtil.findClientResourceByClientId(adminClient.realm("test"), clientId).getProtocolMappers(); protocolMappers.createMapper(Arrays.asList(realmMapper, clientMapper)); // Login user @@ -1072,7 +1073,7 @@ public void testUserGroupRoleToAttributeMappersNotScopedOtherApp() throws Except ProtocolMapperRepresentation realmMapper = ProtocolMapperUtil.createUserRealmRoleMappingMapper("pref.", "Realm roles mapper", "roles-custom.realm", true, true, true); ProtocolMapperRepresentation clientMapper = ProtocolMapperUtil.createUserClientRoleMappingMapper(clientId, null, "Client roles mapper", "roles-custom." + clientId, true, true, true); - ProtocolMappersResource protocolMappers = ApiUtil.findClientResourceByClientId(adminClient.realm("test"), clientId).getProtocolMappers(); + ProtocolMappersResource protocolMappers = AdminApiUtil.findClientResourceByClientId(adminClient.realm("test"), clientId).getProtocolMappers(); protocolMappers.createMapper(Arrays.asList(realmMapper, clientMapper)); // Login user @@ -1112,7 +1113,7 @@ public void testUserGroupRoleToAttributeMappersScoped() throws Exception { ProtocolMapperRepresentation realmMapper = ProtocolMapperUtil.createUserRealmRoleMappingMapper("pref.", "Realm roles mapper", "roles-custom.realm", true, true, true); ProtocolMapperRepresentation clientMapper = ProtocolMapperUtil.createUserClientRoleMappingMapper(clientId, null, "Client roles mapper", "roles-custom.test-app-scope", true, true, true); - ProtocolMappersResource protocolMappers = ApiUtil.findClientResourceByClientId(adminClient.realm("test"), clientId).getProtocolMappers(); + ProtocolMappersResource protocolMappers = AdminApiUtil.findClientResourceByClientId(adminClient.realm("test"), clientId).getProtocolMappers(); protocolMappers.createMapper(Arrays.asList(realmMapper, clientMapper)); // Login user @@ -1146,7 +1147,7 @@ public void testUserGroupRoleToAttributeMappersScopedClientNotSet() throws Excep ProtocolMapperRepresentation realmMapper = ProtocolMapperUtil.createUserRealmRoleMappingMapper("pref.", "Realm roles mapper", "roles-custom.realm", true, true, true); ProtocolMapperRepresentation clientMapper = ProtocolMapperUtil.createUserClientRoleMappingMapper(null, null, "Client roles mapper", "roles-custom.test-app-scope", true, true, true); - ProtocolMappersResource protocolMappers = ApiUtil.findClientResourceByClientId(adminClient.realm("test"), clientId).getProtocolMappers(); + ProtocolMappersResource protocolMappers = AdminApiUtil.findClientResourceByClientId(adminClient.realm("test"), clientId).getProtocolMappers(); protocolMappers.createMapper(Arrays.asList(realmMapper, clientMapper)); // Login user @@ -1182,7 +1183,7 @@ public void testSingleValuedRoleMapping() throws Exception { ProtocolMapperRepresentation realmMapper = ProtocolMapperUtil.createUserRealmRoleMappingMapper("pref.", "Realm roles mapper", "roles-custom.realm", true, true, true,false); ProtocolMapperRepresentation clientMapper = ProtocolMapperUtil.createUserClientRoleMappingMapper(null, null, "Client roles mapper", "roles-custom.test-app-scope", true, true, true, false); - ProtocolMappersResource protocolMappers = ApiUtil.findClientResourceByClientId(adminClient.realm("test"), clientId).getProtocolMappers(); + ProtocolMappersResource protocolMappers = AdminApiUtil.findClientResourceByClientId(adminClient.realm("test"), clientId).getProtocolMappers(); protocolMappers.createMapper(Arrays.asList(realmMapper, clientMapper)); // Login user @@ -1871,10 +1872,10 @@ public void testHardcodeRoleAll() throws Exception { hardcodedRoleClientMapperId = ApiUtil.getCreatedId(resp); } // modify the default role mappers to be included in access, ID and user-info - ClientScopeResource rolesScope = ApiUtil.findClientScopeByName(testRealm, OIDCLoginProtocolFactory.ROLES_SCOPE); - ProtocolMapperRepresentation realmRolesMapper = ApiUtil.findProtocolMapperByName(rolesScope, OIDCLoginProtocolFactory.REALM_ROLES); + ClientScopeResource rolesScope = AdminApiUtil.findClientScopeByName(testRealm, OIDCLoginProtocolFactory.ROLES_SCOPE); + ProtocolMapperRepresentation realmRolesMapper = AdminApiUtil.findProtocolMapperByName(rolesScope, OIDCLoginProtocolFactory.REALM_ROLES); Map configRealmRoles = modifyScopeRolesMapperToBeIncludedInAll(rolesScope, realmRolesMapper); - ProtocolMapperRepresentation clientRolesMapper = ApiUtil.findProtocolMapperByName(rolesScope, OIDCLoginProtocolFactory.CLIENT_ROLES); + ProtocolMapperRepresentation clientRolesMapper = AdminApiUtil.findProtocolMapperByName(rolesScope, OIDCLoginProtocolFactory.CLIENT_ROLES); Map configClientRoles = modifyScopeRolesMapperToBeIncludedInAll(rolesScope, clientRolesMapper); // check that the hardcoded mappers are in the three responses @@ -1927,10 +1928,10 @@ public void testRoleNameMapperAll() throws Exception { clientRoleNameMapperId = ApiUtil.getCreatedId(resp); } // modify the default role mappers to be included in access, ID and user-info - ClientScopeResource rolesScope = ApiUtil.findClientScopeByName(testRealm, OIDCLoginProtocolFactory.ROLES_SCOPE); - ProtocolMapperRepresentation realmRolesMapper = ApiUtil.findProtocolMapperByName(rolesScope, OIDCLoginProtocolFactory.REALM_ROLES); + ClientScopeResource rolesScope = AdminApiUtil.findClientScopeByName(testRealm, OIDCLoginProtocolFactory.ROLES_SCOPE); + ProtocolMapperRepresentation realmRolesMapper = AdminApiUtil.findProtocolMapperByName(rolesScope, OIDCLoginProtocolFactory.REALM_ROLES); Map configRealmRoles = modifyScopeRolesMapperToBeIncludedInAll(rolesScope, realmRolesMapper); - ProtocolMapperRepresentation clientRolesMapper = ApiUtil.findProtocolMapperByName(rolesScope, OIDCLoginProtocolFactory.CLIENT_ROLES); + ProtocolMapperRepresentation clientRolesMapper = AdminApiUtil.findProtocolMapperByName(rolesScope, OIDCLoginProtocolFactory.CLIENT_ROLES); Map configClientRoles = modifyScopeRolesMapperToBeIncludedInAll(rolesScope, clientRolesMapper); // check that the role mappers are executed in the three responses diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/RPInitiatedLogoutTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/RPInitiatedLogoutTest.java index 8f34395a1482..e9d7f833f657 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/RPInitiatedLogoutTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/RPInitiatedLogoutTest.java @@ -44,6 +44,7 @@ import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AssertEvents; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.ErrorPage; @@ -635,7 +636,7 @@ public void logoutConsentRequired() { MatcherAssert.assertThat(false, is(isSessionActive(tokenResponse.getSessionState()))); assertCurrentUrlEquals(APP_REDIRECT_URI + "?state=somethingg"); - UserResource user = ApiUtil.findUserByUsernameId(testRealm(), "test-user@localhost"); + UserResource user = AdminApiUtil.findUserByUsernameId(testRealm(), "test-user@localhost"); user.revokeConsent("third-party"); } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ResourceOwnerPasswordCredentialsGrantTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ResourceOwnerPasswordCredentialsGrantTest.java index 894006d99155..0e73b09c24bb 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ResourceOwnerPasswordCredentialsGrantTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ResourceOwnerPasswordCredentialsGrantTest.java @@ -54,6 +54,7 @@ import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AssertEvents; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.util.ClientBuilder; @@ -202,7 +203,7 @@ public void grantAccessTokenWithDynamicScope() throws Exception { try(Response response = realmResource.clientScopes().create(clientScope)) { String scopeId = ApiUtil.getCreatedId(response); getCleanup().addClientScopeId(scopeId); - ClientResource resourceOwnerPublicClient = ApiUtil.findClientByClientId(realmResource, "resource-owner-public"); + ClientResource resourceOwnerPublicClient = AdminApiUtil.findClientByClientId(realmResource, "resource-owner-public"); ClientRepresentation testAppRep = resourceOwnerPublicClient.toRepresentation(); resourceOwnerPublicClient.update(testAppRep); resourceOwnerPublicClient.addOptionalClientScope(scopeId); @@ -363,11 +364,11 @@ public void grantRequest_ClientPS256_RealmES256() throws Exception { private void conductGrantRequest(String expectedRefreshAlg, String expectedAccessAlg, String realmTokenAlg) throws Exception { try { TokenSignatureUtil.changeRealmTokenSignatureProvider(adminClient, realmTokenAlg); - TokenSignatureUtil.changeClientAccessTokenSignatureProvider(ApiUtil.findClientByClientId(adminClient.realm("test"), "resource-owner"), expectedAccessAlg); + TokenSignatureUtil.changeClientAccessTokenSignatureProvider(AdminApiUtil.findClientByClientId(adminClient.realm("test"), "resource-owner"), expectedAccessAlg); grantRequest(expectedRefreshAlg, expectedAccessAlg); } finally { TokenSignatureUtil.changeRealmTokenSignatureProvider(adminClient, Algorithm.RS256); - TokenSignatureUtil.changeClientAccessTokenSignatureProvider(ApiUtil.findClientByClientId(adminClient.realm("test"), "resource-owner"), Algorithm.RS256); + TokenSignatureUtil.changeClientAccessTokenSignatureProvider(AdminApiUtil.findClientByClientId(adminClient.realm("test"), "resource-owner"), Algorithm.RS256); } return; } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ServiceAccountTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ServiceAccountTest.java index 25b4929784fc..e689406bfbc8 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ServiceAccountTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ServiceAccountTest.java @@ -49,7 +49,7 @@ import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.util.ClientBuilder; import org.keycloak.testsuite.util.ClientManager; import org.keycloak.testsuite.util.RealmBuilder; @@ -453,11 +453,11 @@ private void conductClientCredentialsAuthRequestWithRefreshToken(String expected try { /// Realm Setting is used for ID Token Signature Algorithm TokenSignatureUtil.changeRealmTokenSignatureProvider(adminClient, realmTokenAlg); - TokenSignatureUtil.changeClientAccessTokenSignatureProvider(ApiUtil.findClientByClientId(adminClient.realm("test"), "service-account-cl-refresh-on"), expectedAccessAlg); + TokenSignatureUtil.changeClientAccessTokenSignatureProvider(AdminApiUtil.findClientByClientId(adminClient.realm("test"), "service-account-cl-refresh-on"), expectedAccessAlg); clientCredentialsAuthSuccessWithRefreshToken(expectedRefreshAlg, expectedAccessAlg); } finally { TokenSignatureUtil.changeRealmTokenSignatureProvider(adminClient, Algorithm.RS256); - TokenSignatureUtil.changeClientAccessTokenSignatureProvider(ApiUtil.findClientByClientId(adminClient.realm("test"), "service-account-cl-refresh-on"), Algorithm.RS256); + TokenSignatureUtil.changeClientAccessTokenSignatureProvider(AdminApiUtil.findClientByClientId(adminClient.realm("test"), "service-account-cl-refresh-on"), Algorithm.RS256); } return; } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/TokenIntrospectionTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/TokenIntrospectionTest.java index de97199c14f2..fbb498a19dad 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/TokenIntrospectionTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/TokenIntrospectionTest.java @@ -45,7 +45,7 @@ import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.oidc.AbstractOIDCScopeTest; import org.keycloak.testsuite.oidc.OIDCScopeTest; import org.keycloak.testsuite.pages.LoginPage; @@ -382,7 +382,7 @@ public void testIntrospectAccessTokenPS256() throws Exception { private void testIntrospectAccessToken(String jwaAlgorithm) throws Exception { try { - TokenSignatureUtil.changeClientAccessTokenSignatureProvider(ApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"), jwaAlgorithm); + TokenSignatureUtil.changeClientAccessTokenSignatureProvider(AdminApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"), jwaAlgorithm); oauth.doLogin("test-user@localhost", "password"); String code = oauth.parseLoginResponse().getCode(); @@ -403,7 +403,7 @@ private void testIntrospectAccessToken(String jwaAlgorithm) throws Exception { // Assert expected scope OIDCScopeTest.assertScopes("openid email profile", rep.getScope()); } finally { - TokenSignatureUtil.changeClientAccessTokenSignatureProvider(ApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"), Algorithm.RS256); + TokenSignatureUtil.changeClientAccessTokenSignatureProvider(AdminApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"), Algorithm.RS256); } } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/hok/HoKTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/hok/HoKTest.java index 8b921c8baf19..d56bb797c6e9 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/hok/HoKTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/hok/HoKTest.java @@ -43,7 +43,7 @@ import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.client.KeycloakTestingClient; import org.keycloak.testsuite.drone.Different; import org.keycloak.testsuite.oauth.OAuthProofKeyForCodeExchangeTest; @@ -66,7 +66,7 @@ import org.junit.Test; import org.openqa.selenium.WebDriver; -import static org.keycloak.testsuite.admin.ApiUtil.findUserByUsername; +import static org.keycloak.testsuite.admin.AdminApiUtil.findUserByUsername; import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_SSL_REQUIRED; import static org.hamcrest.MatcherAssert.assertThat; @@ -175,7 +175,7 @@ public void enableHoKToken() { private void enableHoKToken(String clientId) { // Enable MTLS HoK Token - ClientResource clientResource = ApiUtil.findClientByClientId(adminClient.realm("test"), clientId); + ClientResource clientResource = AdminApiUtil.findClientByClientId(adminClient.realm("test"), clientId); ClientRepresentation clientRep = clientResource.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setUseMtlsHoKToken(true); clientResource.update(clientRep); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/par/ParTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/par/ParTest.java index 06b23fe96537..96a86ff0bde9 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/par/ParTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/par/ParTest.java @@ -49,7 +49,7 @@ import org.keycloak.representations.oidc.OIDCClientRepresentation; import org.keycloak.services.clientpolicy.ClientPolicyEvent; import org.keycloak.services.clientpolicy.condition.ClientRolesConditionFactory; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.client.policies.AbstractClientPoliciesTest; import org.keycloak.testsuite.client.resources.TestApplicationResourceUrls; import org.keycloak.testsuite.client.resources.TestOIDCEndpointsApplicationResource; @@ -76,7 +76,7 @@ import static org.keycloak.OAuthErrorException.INVALID_GRANT; import static org.keycloak.testsuite.AbstractAdminTest.loadJson; -import static org.keycloak.testsuite.admin.ApiUtil.findUserByUsername; +import static org.keycloak.testsuite.admin.AdminApiUtil.findUserByUsername; import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientRolesConditionConfig; import static org.keycloak.testsuite.util.ClientPoliciesUtil.createTestRaiseExeptionExecutorConfig; @@ -338,7 +338,7 @@ protected void initRequest() { // Step 3: Attempt to exchange code for token with the "fake code" from PAR String parId = requestUri.substring(requestUri.lastIndexOf(":" ) + 1); - String clientUUID = ApiUtil.findClientByClientId(adminClient.realm("test"), oauth.getClientId()).toRepresentation().getId(); + String clientUUID = AdminApiUtil.findClientByClientId(adminClient.realm("test"), oauth.getClientId()).toRepresentation().getId(); String fakeCode = parId + "." + sessionId + "." + clientUUID; AccessTokenResponse response = oauth.doAccessTokenRequest(fakeCode); assertEquals(400, response.getStatusCode()); @@ -389,7 +389,7 @@ public void testWrongSigningAlgorithmForRequestObject() throws Exception { TestOIDCEndpointsApplicationResource client = testingClient.testApp().oidcClientEndpoints(); // use and set jwks_url - ClientResource clientResource = ApiUtil + ClientResource clientResource = AdminApiUtil .findClientByClientId(adminClient.realm(oauth.getRealm()), oauth.getClientId()); ClientRepresentation clientRep = clientResource.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setUseJwksUrl(true); @@ -448,7 +448,7 @@ public void testSuccessfulUsingRequestParameter() throws Exception { TestOIDCEndpointsApplicationResource client = testingClient.testApp().oidcClientEndpoints(); // use and set jwks_url - ClientResource clientResource = ApiUtil.findClientByClientId(adminClient.realm(oauth.getRealm()), oauth.getClientId()); + ClientResource clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(oauth.getRealm()), oauth.getClientId()); ClientRepresentation clientRep = clientResource.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setUseJwksUrl(true); OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setJwksUrl(TestApplicationResourceUrls.clientJwksUri()); @@ -524,7 +524,7 @@ public void testRequestParameterPrecedenceOverOtherParameters() throws Exception TestOIDCEndpointsApplicationResource client = testingClient.testApp().oidcClientEndpoints(); // use and set jwks_url - ClientResource clientResource = ApiUtil.findClientByClientId(adminClient.realm(oauth.getRealm()), oauth.getClientId()); + ClientResource clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(oauth.getRealm()), oauth.getClientId()); ClientRepresentation clientRep = clientResource.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setUseJwksUrl(true); OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setJwksUrl(TestApplicationResourceUrls.clientJwksUri()); @@ -600,7 +600,7 @@ public void testIgnoreParameterIfNotSetinRequestObject() throws Exception { TestOIDCEndpointsApplicationResource client = testingClient.testApp().oidcClientEndpoints(); // use and set jwks_url - ClientResource clientResource = ApiUtil.findClientByClientId(adminClient.realm(oauth.getRealm()), oauth.getClientId()); + ClientResource clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(oauth.getRealm()), oauth.getClientId()); ClientRepresentation clientRep = clientResource.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setUseJwksUrl(true); OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setJwksUrl(TestApplicationResourceUrls.clientJwksUri()); @@ -1269,7 +1269,7 @@ public void testExtendedClientPolicyIntefacesForPar() throws Exception { updatePolicies(json); // Add role to the client - ClientResource clientResource = ApiUtil.findClientByClientId(adminClient.realm(REALM_NAME), clientId); + ClientResource clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(REALM_NAME), clientId); clientResource.roles().create(RoleBuilder.create().name(roleName).build()); // Pushed Authorization Request diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/par/ParWithDPoPTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/par/ParWithDPoPTest.java index 966fe38c4345..34fb2a27ac3f 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/par/ParWithDPoPTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/par/ParWithDPoPTest.java @@ -44,7 +44,7 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.oidc.OIDCClientRepresentation; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.client.policies.AbstractClientPoliciesTest; import org.keycloak.testsuite.client.resources.TestApplicationResourceUrls; import org.keycloak.testsuite.client.resources.TestOIDCEndpointsApplicationResource; @@ -1003,7 +1003,7 @@ private String generateRequestObject(String clientId, String dpopJkt) throws IOE TestOIDCEndpointsApplicationResource client = testingClient.testApp().oidcClientEndpoints(); // use and set jwks_url - ClientResource clientResource = ApiUtil.findClientByClientId(adminClient.realm(REALM_NAME), clientId); + ClientResource clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(REALM_NAME), clientId); ClientRepresentation clientRep = clientResource.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setUseJwksUrl(true); OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setJwksUrl(TestApplicationResourceUrls.clientJwksUri()); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/rar/DynamicScopesRARParseTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/rar/DynamicScopesRARParseTest.java index 5ed0a4ad9cd2..287372408fc0 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/rar/DynamicScopesRARParseTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/rar/DynamicScopesRARParseTest.java @@ -32,6 +32,7 @@ import org.keycloak.representations.AuthorizationDetailsJSONRepresentation; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.ClientScopeRepresentation; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; @@ -48,7 +49,7 @@ public class DynamicScopesRARParseTest extends AbstractRARParserTest { @Test public void generatedAuthorizationRequestsShouldMatchDefaultScopes() { - ClientResource testApp = ApiUtil.findClientByClientId(testRealm(), "test-app"); + ClientResource testApp = AdminApiUtil.findClientByClientId(testRealm(), "test-app"); List defScopes = testApp.getDefaultClientScopes(); oauth.openLoginForm(); oauth.scope("openid"); @@ -79,7 +80,7 @@ public void generatedAuthorizationRequestsShouldMatchRequestedAndDefaultScopes() getCleanup().addClientScopeId(scopeId); response.close(); - ClientResource testApp = ApiUtil.findClientByClientId(testRealm(), "test-app"); + ClientResource testApp = AdminApiUtil.findClientByClientId(testRealm(), "test-app"); ClientRepresentation testAppRep = testApp.toRepresentation(); testApp.update(testAppRep); testApp.addDefaultClientScope(scopeId); @@ -117,7 +118,7 @@ public void generatedAuthorizationRequestsShouldMatchRequestedDynamicAndDefaultS getCleanup().addClientScopeId(scopeId); response.close(); - ClientResource testApp = ApiUtil.findClientByClientId(testRealm(), "test-app"); + ClientResource testApp = AdminApiUtil.findClientByClientId(testRealm(), "test-app"); ClientRepresentation testAppRep = testApp.toRepresentation(); testApp.update(testAppRep); testApp.addOptionalClientScope(scopeId); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/tokenexchange/StandardTokenExchangeV1Test.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/tokenexchange/StandardTokenExchangeV1Test.java index e916f0a12b39..ecc5db2dc276 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/tokenexchange/StandardTokenExchangeV1Test.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/tokenexchange/StandardTokenExchangeV1Test.java @@ -37,7 +37,7 @@ import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.arquillian.annotation.DisableFeature; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.arquillian.annotation.UncaughtServerErrorExpected; @@ -328,7 +328,7 @@ public void testExchangeNoRefreshToken() throws Exception { oauth.realm(TEST); oauth.client("client-exchanger", "secret"); - ClientResource client = ApiUtil.findClientByClientId(adminClient.realm(TEST), "no-refresh-token"); + ClientResource client = AdminApiUtil.findClientByClientId(adminClient.realm(TEST), "no-refresh-token"); ClientRepresentation clientRepresentation = client.toRepresentation(); clientRepresentation.getAttributes().put(OIDCConfigAttributes.USE_REFRESH_TOKEN, "false"); client.update(clientRepresentation); @@ -378,7 +378,7 @@ public void testClientExchangeToItselfWithConsents() throws Exception { oauth.realm(TEST); String accessToken = getInitialAccessTokenForClientExchanger(); - ClientResource client = ApiUtil.findClientByClientId(adminClient.realm(TEST), "client-exchanger"); + ClientResource client = AdminApiUtil.findClientByClientId(adminClient.realm(TEST), "client-exchanger"); ClientRepresentation clientRepresentation = client.toRepresentation(); clientRepresentation.setConsentRequired(Boolean.TRUE); client.update(clientRepresentation); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/tokenexchange/StandardTokenExchangeV2Test.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/tokenexchange/StandardTokenExchangeV2Test.java index fbe8c6de5167..74c9c17b5b93 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/tokenexchange/StandardTokenExchangeV2Test.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/tokenexchange/StandardTokenExchangeV2Test.java @@ -64,6 +64,7 @@ import org.keycloak.services.clientpolicy.executor.JWTClaimEnforcerExecutor; import org.keycloak.services.clientpolicy.executor.JWTClaimEnforcerExecutorFactory; import org.keycloak.testsuite.AssertEvents; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.arquillian.annotation.UncaughtServerErrorExpected; import org.keycloak.testsuite.broker.util.SimpleHttpDefault; @@ -214,7 +215,7 @@ public void testSubjectTokenType() throws Exception { @Test @UncaughtServerErrorExpected public void testRequestedTokenType() throws Exception { - final UserRepresentation john = ApiUtil.findUserByUsername(adminClient.realm(TEST), "john"); + final UserRepresentation john = AdminApiUtil.findUserByUsername(adminClient.realm(TEST), "john"); oauth.realm(TEST); String accessToken = resourceOwnerLogin(john.getUsername(), "password", "subject-client", "secret").getAccessToken(); @@ -311,7 +312,7 @@ public void testRequestedTokenType() throws Exception { @Test @UncaughtServerErrorExpected public void testExchange() throws Exception { - final UserRepresentation john = ApiUtil.findUserByUsername(adminClient.realm(TEST), "john"); + final UserRepresentation john = AdminApiUtil.findUserByUsername(adminClient.realm(TEST), "john"); oauth.realm(TEST); String accessToken = resourceOwnerLogin("john", "password", "subject-client", "secret").getAccessToken(); { @@ -346,7 +347,7 @@ public void testExchange() throws Exception { @Test public void testTransientSessionForRequester() throws Exception { final RealmResource realm = adminClient.realm(TEST); - final UserRepresentation john = ApiUtil.findUserByUsername(realm, "john"); + final UserRepresentation john = AdminApiUtil.findUserByUsername(realm, "john"); oauth.realm(TEST); final String accessToken = resourceOwnerLogin("john", "password", "subject-client", "secret").getAccessToken(); @@ -379,7 +380,7 @@ public void testTransientSessionForRequester() throws Exception { @Test public void testTransientOfflineSessionForRequester() throws Exception { final RealmResource realm = adminClient.realm(TEST); - final UserRepresentation john = ApiUtil.findUserByUsername(realm, "john"); + final UserRepresentation john = AdminApiUtil.findUserByUsername(realm, "john"); try (RealmAttributeUpdater realUpdater = new RealmAttributeUpdater(realm) .setSsoSessionMaxLifespan(600) .update(); @@ -444,16 +445,16 @@ public void testTransientOfflineSessionForRequester() throws Exception { @Test public void testTransientSessionWithAdminApi() throws Exception { final RealmResource realm = adminClient.realm(TEST); - final UserRepresentation john = ApiUtil.findUserByUsername(realm, "john"); + final UserRepresentation john = AdminApiUtil.findUserByUsername(realm, "john"); // create a client-scope to the requester-client that adds realm-management view-role access - final ClientResource client = ApiUtil.findClientByClientId(realm, Constants.REALM_MANAGEMENT_CLIENT_ID); + final ClientResource client = AdminApiUtil.findClientByClientId(realm, Constants.REALM_MANAGEMENT_CLIENT_ID); createClientScopeForRole(realm, client, AdminRoles.VIEW_REALM, "realm-management-view-scope"); // update the user and the requester-client to include the view-realm permission try (RoleScopeUpdater roleScopeUpdater = UserAttributeUpdater.forUserByUsername(realm, "john") .clientRoleScope(client.toRepresentation().getId()) - .add(ApiUtil.findClientRoleByName(client, AdminRoles.VIEW_REALM).toRepresentation()) + .add(AdminApiUtil.findClientRoleByName(client, AdminRoles.VIEW_REALM).toRepresentation()) .update(); ClientAttributeUpdater clientUpdater = ClientAttributeUpdater.forClient(adminClient, TEST, "requester-client") .addOptionalClientScope("realm-management-view-scope") @@ -484,7 +485,7 @@ public void testTransientSessionWithAdminApi() throws Exception { @Test public void testTransientSessionWithAccountApi() throws Exception { final RealmResource realm = adminClient.realm(TEST); - final UserRepresentation john = ApiUtil.findUserByUsername(realm, "john"); + final UserRepresentation john = AdminApiUtil.findUserByUsername(realm, "john"); // create a client-scope for the requester-client that adds account view-profile access createClientScopeForRole(realm, Constants.ACCOUNT_MANAGEMENT_CLIENT_ID, AccountRoles.VIEW_PROFILE, "account-view-profile-scope"); @@ -576,7 +577,7 @@ public void testExchangeForIdToken() throws Exception { @Test @UncaughtServerErrorExpected public void testExchangeUsingServiceAccount() throws Exception { - final UserRepresentation user = ApiUtil.findClientResourceByClientId(adminClient.realm(TEST), "subject-client").getServiceAccountUser(); + final UserRepresentation user = AdminApiUtil.findClientResourceByClientId(adminClient.realm(TEST), "subject-client").getServiceAccountUser(); oauth.realm(TEST); oauth.client("subject-client", "secret"); @@ -688,7 +689,7 @@ public void testExchangeWithPublicClient() throws Exception { @Test public void testOptionalScopeParamRequestedWithoutAudience() throws Exception { - final UserRepresentation john = ApiUtil.findUserByUsername(adminClient.realm(TEST), "john"); + final UserRepresentation john = AdminApiUtil.findUserByUsername(adminClient.realm(TEST), "john"); String accessToken = resourceOwnerLogin("john", "password","subject-client", "secret").getAccessToken(); oauth.scope("optional-scope2"); AccessTokenResponse response = tokenExchange(accessToken, "requester-client", "secret", null, null); @@ -697,7 +698,7 @@ public void testOptionalScopeParamRequestedWithoutAudience() throws Exception { @Test public void testAudienceRequested() throws Exception { - final UserRepresentation john = ApiUtil.findUserByUsername(adminClient.realm(TEST), "john"); + final UserRepresentation john = AdminApiUtil.findUserByUsername(adminClient.realm(TEST), "john"); String accessToken = resourceOwnerLogin("john", "password","subject-client", "secret").getAccessToken(); AccessTokenResponse response = tokenExchange(accessToken, "requester-client", "secret", List.of("target-client1"), null); assertAudiencesAndScopes(response, john, List.of("target-client1"), List.of("default-scope1")); @@ -740,7 +741,7 @@ public void testScopeNotAllowed() throws Exception { @Test public void testScopeFilter() throws Exception { final RealmResource realm = adminClient.realm(TEST); - final UserRepresentation john = ApiUtil.findUserByUsername(realm, "john"); + final UserRepresentation john = AdminApiUtil.findUserByUsername(realm, "john"); String accessToken = resourceOwnerLogin("john", "password", "subject-client", "secret").getAccessToken(); AccessTokenResponse response = tokenExchange(accessToken, "requester-client", "secret", List.of("target-client2"), null); assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), response.getStatusCode()); @@ -767,7 +768,7 @@ public void testScopeFilter() throws Exception { assertAudiencesAndScopes(response, john, List.of("target-client1", "target-client2"), List.of("default-scope1", "optional-scope2")); //just check that the exchanged token contains the optional-scope2 mapped by the realm role - final UserRepresentation mike = ApiUtil.findUserByUsername(realm, "mike"); + final UserRepresentation mike = AdminApiUtil.findUserByUsername(realm, "mike"); accessToken = resourceOwnerLogin("mike", "password","subject-client", "secret").getAccessToken(); oauth.scope("optional-scope2"); response = tokenExchange(accessToken, "requester-client", "secret", null, null); @@ -781,7 +782,7 @@ public void testScopeFilter() throws Exception { @Test public void testScopeParamIncludedAudienceIncludedRefreshToken() throws Exception { - final UserRepresentation mike = ApiUtil.findUserByUsername(adminClient.realm(TEST), "mike"); + final UserRepresentation mike = AdminApiUtil.findUserByUsername(adminClient.realm(TEST), "mike"); try (ClientAttributeUpdater clientUpdater = ClientAttributeUpdater.forClient(adminClient, TEST, "requester-client") .setAttribute(OIDCConfigAttributes.STANDARD_TOKEN_EXCHANGE_REFRESH_ENABLED, OIDCAdvancedConfigWrapper.TokenExchangeRefreshTokenEnabled.SAME_SESSION.name()) .update()) { @@ -837,7 +838,7 @@ public void testExchangeDisabledOnClient() throws Exception { @Test public void testConsents() throws Exception { final RealmResource realm = adminClient.realm(TEST); - final UserResource mikeRes = ApiUtil.findUserByUsernameId(realm, "mike"); + final UserResource mikeRes = AdminApiUtil.findUserByUsernameId(realm, "mike"); final UserRepresentation mike = mikeRes.toRepresentation(); try (ClientAttributeUpdater clientUpdater = ClientAttributeUpdater.forClient(adminClient, TEST, "requester-client") .setConsentRequired(Boolean.TRUE) @@ -912,7 +913,7 @@ public void testOfflineAccessNotAllowed() throws Exception { // Issue 37116 @Test public void testOfflineAccessLoginWithRegularTokenExchange() throws Exception { - final UserRepresentation mike = ApiUtil.findUserByUsername(adminClient.realm(TEST), "mike"); + final UserRepresentation mike = AdminApiUtil.findUserByUsername(adminClient.realm(TEST), "mike"); try (ClientAttributeUpdater clientUpdater1 = ClientAttributeUpdater.forClient(adminClient, TEST, "requester-client") .setAttribute(OIDCConfigAttributes.STANDARD_TOKEN_EXCHANGE_REFRESH_ENABLED, OIDCAdvancedConfigWrapper.TokenExchangeRefreshTokenEnabled.SAME_SESSION.name()) .update(); @@ -965,9 +966,9 @@ public void testOfflineAccessNotAllowedAfterOfflineAccessLogin() throws Exceptio AccessToken originalToken = verifier.parse().getToken(); // Doublecheck count of sessions - String subjectClientUuid = ApiUtil.findClientByClientId(adminClient.realm(TEST), "subject-client").toRepresentation().getId(); - String requesterClientUuid = ApiUtil.findClientByClientId(adminClient.realm(TEST), "requester-client").toRepresentation().getId(); - UserResource user = ApiUtil.findUserByUsernameId(adminClient.realm(TEST), "mike"); + String subjectClientUuid = AdminApiUtil.findClientByClientId(adminClient.realm(TEST), "subject-client").toRepresentation().getId(); + String requesterClientUuid = AdminApiUtil.findClientByClientId(adminClient.realm(TEST), "requester-client").toRepresentation().getId(); + UserResource user = AdminApiUtil.findUserByUsernameId(adminClient.realm(TEST), "mike"); Assert.assertEquals(0, user.getUserSessions().size()); Assert.assertEquals(1, user.getOfflineSessions(subjectClientUuid).size()); Assert.assertEquals(0, user.getOfflineSessions(requesterClientUuid).size()); @@ -987,7 +988,7 @@ public void testOfflineAccessNotAllowedAfterOfflineAccessLogin() throws Exceptio @Test public void testIntrospectionWithExchangedTokenAfterSSOLoginOfRequesterClient() throws Exception { final RealmResource realm = adminClient.realm(TEST); - final UserResource mikeRes = ApiUtil.findUserByUsernameId(realm, "mike"); + final UserResource mikeRes = AdminApiUtil.findUserByUsernameId(realm, "mike"); final UserRepresentation mike = mikeRes.toRepresentation(); // Login with "subject-client" and create SSO session @@ -1040,7 +1041,7 @@ public void testClientPolicies() throws Exception { ).toString(); updatePolicies(json); - final UserRepresentation john = ApiUtil.findUserByUsername(adminClient.realm(TEST), "john"); + final UserRepresentation john = AdminApiUtil.findUserByUsername(adminClient.realm(TEST), "john"); String accessToken = resourceOwnerLogin("john", "password", "subject-client", "secret").getAccessToken(); AccessTokenResponse response = tokenExchange(accessToken, "requester-client", "secret", List.of("target-client1"), null); @@ -1072,7 +1073,7 @@ public void testDownscopeClientPolicies() throws Exception { updatePolicies(json); // request initial token with optional scope optional-scope2 - final UserRepresentation john = ApiUtil.findUserByUsername(adminClient.realm(TEST), "john"); + final UserRepresentation john = AdminApiUtil.findUserByUsername(adminClient.realm(TEST), "john"); String accessToken = resourceOwnerLogin("john", "password", "subject-client", "secret", "optional-scope2").getAccessToken(); AccessToken token = TokenVerifier.create(accessToken, AccessToken.class).parse().getToken(); assertScopes(token, List.of("email", "profile", "optional-scope2")); @@ -1171,7 +1172,7 @@ public void testTokenRevocation() throws Exception { ClientAttributeUpdater.forClient(adminClient, TEST, "requester-client") .setAttribute(OIDCConfigAttributes.STANDARD_TOKEN_EXCHANGE_REFRESH_ENABLED, OIDCAdvancedConfigWrapper.TokenExchangeRefreshTokenEnabled.SAME_SESSION.name()) .update(); - UserRepresentation johnUser = ApiUtil.findUserByUsernameId(adminClient.realm(TEST), "john").toRepresentation(); + UserRepresentation johnUser = AdminApiUtil.findUserByUsernameId(adminClient.realm(TEST), "john").toRepresentation(); oauth.realm(TEST); AccessTokenResponse accessTokenResponse = resourceOwnerLogin("john", "password", "subject-client", "secret"); @@ -1287,7 +1288,7 @@ public void testTokenRevocation() throws Exception { @Test public void testExchangeChainRequesters() throws Exception { - final UserRepresentation alice = ApiUtil.findUserByUsername(adminClient.realm(TEST), "alice"); + final UserRepresentation alice = AdminApiUtil.findUserByUsername(adminClient.realm(TEST), "alice"); oauth.realm(TEST); String accessToken = resourceOwnerLogin("alice", "password", "subject-client", "secret", "optional-requester-scope").getAccessToken(); @@ -1409,13 +1410,13 @@ private AccessToken assertAudiencesAndScopes(AccessTokenResponse tokenExchangeRe } private void createClientScopeForRole(RealmResource realm, String clientId, String clientRoleName, String clientScopeName) { - final ClientResource client = ApiUtil.findClientByClientId(realm, clientId); + final ClientResource client = AdminApiUtil.findClientByClientId(realm, clientId); createClientScopeForRole(realm, client, clientRoleName, clientScopeName); } private void createClientScopeForRole(RealmResource realm, ClientResource client, String clientRoleName, String clientScopeName) { final String clientUUID = client.toRepresentation().getId(); - final RoleRepresentation clientRole = ApiUtil.findClientRoleByName(client, clientRoleName).toRepresentation(); + final RoleRepresentation clientRole = AdminApiUtil.findClientRoleByName(client, clientRoleName).toRepresentation(); final ClientScopeRepresentation clientScope = new ClientScopeRepresentation(); clientScope.setName(clientScopeName); @@ -1459,7 +1460,7 @@ private void assertAccessTokenContext(String jti, AccessTokenContext.SessionType @Test public void testSenderConstrainedTokenRejection() throws Exception { - ClientResource client = ApiUtil.findClientByClientId(adminClient.realm(TEST), "subject-client"); + ClientResource client = AdminApiUtil.findClientByClientId(adminClient.realm(TEST), "subject-client"); // Create a protocol mapper that adds the cnf claim ProtocolMapperModel mapper = HardcodedClaim.create("test-cnf-mapper", "cnf", "{\"jkt\":\"test-thumbprint-12345\"}", "JSON", true, false, false); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCIssuerEndpointTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCIssuerEndpointTest.java index 119d3df21dfc..fcc5ff3e458e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCIssuerEndpointTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCIssuerEndpointTest.java @@ -101,6 +101,7 @@ import org.keycloak.services.managers.AppAuthManager; import org.keycloak.services.managers.AuthenticationManager; import org.keycloak.testsuite.Assert; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.runonserver.RunOnServerException; import org.keycloak.testsuite.util.AdminClientUtil; @@ -461,7 +462,7 @@ protected void assignOptionalClientScope(ClientRepresentation client, ClientScop } protected void logoutUser(String username) { - UserResource user = ApiUtil.findUserByUsernameId(adminClient.realm(TEST_REALM_NAME), username); + UserResource user = AdminApiUtil.findUserByUsernameId(adminClient.realm(TEST_REALM_NAME), username); user.logout(); } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AudienceTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AudienceTest.java index c7df16238027..4180ddddd26b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AudienceTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AudienceTest.java @@ -36,6 +36,7 @@ import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.Assert; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.util.ProtocolMapperUtil; import org.keycloak.testsuite.util.UserBuilder; @@ -99,7 +100,7 @@ public void importTestRealms() { @Before public void beforeTest() { // Check if already exists - ClientScopeResource clientScopeRes = ApiUtil.findClientScopeByName(testRealm(), "audience-scope"); + ClientScopeResource clientScopeRes = AdminApiUtil.findClientScopeByName(testRealm(), "audience-scope"); if (clientScopeRes != null) { return; } @@ -112,7 +113,7 @@ public void beforeTest() { String clientScopeId = ApiUtil.getCreatedId(resp); resp.close(); - ClientResource client = ApiUtil.findClientByClientId(testRealm(), "test-app"); + ClientResource client = AdminApiUtil.findClientByClientId(testRealm(), "test-app"); client.addOptionalClientScope(clientScopeId); } @@ -122,7 +123,7 @@ public void testAudienceProtocolMapperWithClientAudience() throws Exception { // Add audience protocol mapper to the clientScope "audience-scope" ProtocolMapperRepresentation audienceMapper = ProtocolMapperUtil.createAudienceMapper("audience mapper", "service-client", null, true, false, true); - ClientScopeResource clientScope = ApiUtil.findClientScopeByName(testRealm(), "audience-scope"); + ClientScopeResource clientScope = AdminApiUtil.findClientScopeByName(testRealm(), "audience-scope"); Response resp = clientScope.getProtocolMappers().createMapper(audienceMapper); String mapperId = ApiUtil.getCreatedId(resp); resp.close(); @@ -148,7 +149,7 @@ public void testAudienceProtocolMapperWithCustomAudience() throws Exception { // Add audience protocol mapper to the clientScope "audience-scope" ProtocolMapperRepresentation audienceMapper = ProtocolMapperUtil.createAudienceMapper("audience mapper 1", null, "http://host/service/ctx1", true, false, true); - ClientScopeResource clientScope = ApiUtil.findClientScopeByName(testRealm(), "audience-scope"); + ClientScopeResource clientScope = AdminApiUtil.findClientScopeByName(testRealm(), "audience-scope"); Response resp = clientScope.getProtocolMappers().createMapper(audienceMapper); String mapper1Id = ApiUtil.getCreatedId(resp); resp.close(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AuthorizationTokenEncryptionTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AuthorizationTokenEncryptionTest.java index 25caa9804b8a..1f10678ea43b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AuthorizationTokenEncryptionTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AuthorizationTokenEncryptionTest.java @@ -43,7 +43,7 @@ import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.arquillian.annotation.UncaughtServerErrorExpected; import org.keycloak.testsuite.client.resources.TestApplicationResourceUrls; import org.keycloak.testsuite.client.resources.TestOIDCEndpointsApplicationResource; @@ -172,7 +172,7 @@ private void testAuthorizationTokenSignatureAndEncryption(String sigAlgorithm, S TestOIDCEndpointsApplicationResource oidcClientEndpointsResource = testingClient.testApp().oidcClientEndpoints(); oidcClientEndpointsResource.generateKeys(algAlgorithm); - clientResource = ApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); clientRep = clientResource.toRepresentation(); // set authorization response signature algorithm and encryption algorithms OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setAuthorizationSignedResponseAlg(sigAlgorithm); @@ -216,7 +216,7 @@ private void testAuthorizationTokenSignatureAndEncryption(String sigAlgorithm, S } catch (JWEException e) { Assert.fail(); } finally { - clientResource = ApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); clientRep = clientResource.toRepresentation(); // revert id token signature algorithm and encryption algorithms OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setAuthorizationSignedResponseAlg(Algorithm.RS256); @@ -268,7 +268,7 @@ public void testAuthorizationEncryptionWithoutEncryptionKEK() throws MalformedUR TestOIDCEndpointsApplicationResource oidcClientEndpointsResource = testingClient.testApp().oidcClientEndpoints(); oidcClientEndpointsResource.generateKeys(Algorithm.RS256); - clientResource = ApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); clientRep = clientResource.toRepresentation(); // set id token signature algorithm and encryption algorithms OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setAuthorizationSignedResponseAlg(Algorithm.RS256); @@ -288,7 +288,7 @@ public void testAuthorizationEncryptionWithoutEncryptionKEK() throws MalformedUR } finally { // Revert - clientResource = ApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); clientRep = clientResource.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setAuthorizationSignedResponseAlg(Algorithm.RS256); OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setAuthorizationEncryptedResponseAlg(null); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/IdTokenEncryptionTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/IdTokenEncryptionTest.java index d52302c4883c..fd94ff7f0aae 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/IdTokenEncryptionTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/IdTokenEncryptionTest.java @@ -44,7 +44,7 @@ import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.arquillian.annotation.UncaughtServerErrorExpected; import org.keycloak.testsuite.client.resources.TestApplicationResourceUrls; import org.keycloak.testsuite.client.resources.TestOIDCEndpointsApplicationResource; @@ -199,7 +199,7 @@ private void testIdTokenSignatureAndEncryption(String sigAlgorithm, String algAl TestOIDCEndpointsApplicationResource oidcClientEndpointsResource = testingClient.testApp().oidcClientEndpoints(); oidcClientEndpointsResource.generateKeys(algAlgorithm); - clientResource = ApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); clientRep = clientResource.toRepresentation(); // set id token signature algorithm and encryption algorithms OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setIdTokenSignedResponseAlg(sigAlgorithm); @@ -244,7 +244,7 @@ private void testIdTokenSignatureAndEncryption(String sigAlgorithm, String algAl } catch (JWEException e) { Assert.fail(); } finally { - clientResource = ApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); clientRep = clientResource.toRepresentation(); // revert id token signature algorithm and encryption algorithms OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setIdTokenSignedResponseAlg(Algorithm.RS256); @@ -296,7 +296,7 @@ public void testIdTokenEncryptionWithoutEncryptionKEK() throws Exception{ TestOIDCEndpointsApplicationResource oidcClientEndpointsResource = testingClient.testApp().oidcClientEndpoints(); oidcClientEndpointsResource.generateKeys(Algorithm.RS256); - clientResource = ApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); clientRep = clientResource.toRepresentation(); // set id token signature algorithm and encryption algorithms OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setIdTokenSignedResponseAlg(Algorithm.RS256); @@ -321,7 +321,7 @@ public void testIdTokenEncryptionWithoutEncryptionKEK() throws Exception{ Assert.assertEquals("can not get encryption KEK", responseClientCredentials.getErrorDescription()); } finally { // Revert - clientResource = ApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); clientRep = clientResource.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setIdTokenSignedResponseAlg(Algorithm.RS256); OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setIdTokenEncryptedResponseAlg(null); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/LightWeightAccessTokenTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/LightWeightAccessTokenTest.java index cb2d4faeb8fd..e45e09521ca0 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/LightWeightAccessTokenTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/LightWeightAccessTokenTest.java @@ -58,7 +58,7 @@ import org.keycloak.services.clientpolicy.condition.AnyClientConditionFactory; import org.keycloak.services.clientpolicy.condition.ClientAccessTypeConditionFactory; import org.keycloak.services.clientpolicy.executor.UseLightweightAccessTokenExecutorFactory; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.client.policies.AbstractClientPoliciesTest; import org.keycloak.testsuite.updaters.ClientAttributeUpdater; @@ -756,7 +756,7 @@ public void addDefaultBasicClientScope() { .filter(scope-> scope.getName().equals(OIDCLoginProtocolFactory.BASIC_SCOPE)) .findFirst() .ifPresent(scope-> { - ApiUtil.findClientResourceByClientId(adminClient.realm(REALM_NAME), TEST_CLIENT).addDefaultClientScope(scope.getId()); + AdminApiUtil.findClientResourceByClientId(adminClient.realm(REALM_NAME), TEST_CLIENT).addDefaultClientScope(scope.getId()); }); } @@ -766,7 +766,7 @@ public void removeDefaultBasicClientScope() { .filter(scope-> scope.getName().equals(OIDCLoginProtocolFactory.BASIC_SCOPE)) .findFirst() .ifPresent(scope-> { - ApiUtil.findClientResourceByClientId(adminClient.realm(REALM_NAME), TEST_CLIENT).removeDefaultClientScope(scope.getId()); + AdminApiUtil.findClientResourceByClientId(adminClient.realm(REALM_NAME), TEST_CLIENT).removeDefaultClientScope(scope.getId()); }); } @@ -786,8 +786,8 @@ private void setScopeProtocolMappers(boolean isIncludeAccessToken, boolean isInc } private void setScopeProtocolMapper(String realmName, String scopeName, String mapperName, boolean isIncludeAccessToken, boolean isIncludeIntrospection, boolean isIncludeLightweightAccessToken) { - ClientScopeResource scope = ApiUtil.findClientScopeByName(realmsResouce().realm(realmName), scopeName); - ProtocolMapperRepresentation protocolMapper = ApiUtil.findProtocolMapperByName(scope, mapperName); + ClientScopeResource scope = AdminApiUtil.findClientScopeByName(realmsResouce().realm(realmName), scopeName); + ProtocolMapperRepresentation protocolMapper = AdminApiUtil.findProtocolMapperByName(scope, mapperName); Map config = protocolMapper.getConfig(); if (isIncludeAccessToken) { config.put(INCLUDE_IN_ACCESS_TOKEN, "true"); @@ -815,7 +815,7 @@ private ProtocolMappersResource setProtocolMappers(boolean isIncludeAccessToken, setScopeProtocolMappers(isIncludeAccessToken, isIncludeIntrospection, false); List protocolMapperList = new ArrayList<>(); setExistingProtocolMappers(protocolMapperList, isIncludeAccessToken, isIncludeIntrospection, false, setPairWise); - ProtocolMappersResource protocolMappers = ApiUtil.findClientResourceByClientId(adminClient.realm(REALM_NAME), TEST_CLIENT).getProtocolMappers(); + ProtocolMappersResource protocolMappers = AdminApiUtil.findClientResourceByClientId(adminClient.realm(REALM_NAME), TEST_CLIENT).getProtocolMappers(); protocolMappers.createMapper(protocolMapperList); return protocolMappers; } @@ -824,7 +824,7 @@ private ProtocolMappersResource setProtocolMappers(boolean isIncludeAccessToken, setScopeProtocolMappers(isIncludeAccessToken, isIncludeIntrospection, isIncludeLightweightAccessToken); List protocolMapperList = new ArrayList<>(); setExistingProtocolMappers(protocolMapperList, isIncludeAccessToken, isIncludeIntrospection, isIncludeLightweightAccessToken, setPairWise); - ProtocolMappersResource protocolMappers = ApiUtil.findClientResourceByClientId(adminClient.realm(REALM_NAME), TEST_CLIENT).getProtocolMappers(); + ProtocolMappersResource protocolMappers = AdminApiUtil.findClientResourceByClientId(adminClient.realm(REALM_NAME), TEST_CLIENT).getProtocolMappers(); protocolMappers.createMapper(protocolMapperList); return protocolMappers; } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/NonceBackwardsCompatibleMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/NonceBackwardsCompatibleMapperTest.java index d3c1aa701100..47aa347407da 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/NonceBackwardsCompatibleMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/NonceBackwardsCompatibleMapperTest.java @@ -40,6 +40,7 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.AssertEvents; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.updaters.ClientAttributeUpdater; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; @@ -71,7 +72,7 @@ public void testNonceWithoutMapper() throws IOException { @Test public void testNonceWithMapper() throws IOException { - ClientResource testApp = ApiUtil.findClientByClientId(testRealm(), "test-app"); + ClientResource testApp = AdminApiUtil.findClientByClientId(testRealm(), "test-app"); String mapperId = createNonceMapper(testApp); try { testNonce(true, false); @@ -82,7 +83,7 @@ public void testNonceWithMapper() throws IOException { @Test public void testOfflineSessionNonceWithMapper() throws IOException { - ClientResource testApp = ApiUtil.findClientByClientId(testRealm(), "test-app"); + ClientResource testApp = AdminApiUtil.findClientByClientId(testRealm(), "test-app"); String mapperId = createNonceMapper(testApp); try { testNonce(true, true); @@ -102,7 +103,7 @@ public void testImplicitFlowWithoutMapper() throws Exception { @Test public void testImplicitFlowWithMapper() throws Exception { - ClientResource testApp = ApiUtil.findClientByClientId(testRealm(), "test-app"); + ClientResource testApp = AdminApiUtil.findClientByClientId(testRealm(), "test-app"); String mapperId = createNonceMapper(testApp); try (ClientAttributeUpdater client = ClientAttributeUpdater.forClient(adminClient, TEST_REALM_NAME, "test-app") .setImplicitFlowEnabled(true) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCAdvancedRequestParamsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCAdvancedRequestParamsTest.java index 9fd3afc82cdf..c1520b620277 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCAdvancedRequestParamsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCAdvancedRequestParamsTest.java @@ -75,7 +75,7 @@ import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.broker.util.SimpleHttpDefault; import org.keycloak.testsuite.client.resources.TestApplicationResourceUrls; import org.keycloak.testsuite.client.resources.TestOIDCEndpointsApplicationResource; @@ -104,7 +104,7 @@ import static org.keycloak.jose.jwe.JWEConstants.RSA_OAEP; import static org.keycloak.jose.jwe.JWEConstants.RSA_OAEP_256; -import static org.keycloak.testsuite.admin.ApiUtil.findClientResourceByClientId; +import static org.keycloak.testsuite.admin.AdminApiUtil.findClientResourceByClientId; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; @@ -354,7 +354,7 @@ public void promptNoneConsentRequired() { } finally { // Revert consent - UserResource user = ApiUtil.findUserByUsernameId(adminClient.realm("test"), "test-user@localhost"); + UserResource user = AdminApiUtil.findUserByUsernameId(adminClient.realm("test"), "test-user@localhost"); user.revokeConsent("test-app"); // revert require consent @@ -487,7 +487,7 @@ public void promptConsent() { } finally { // Revert consent - UserResource user = ApiUtil.findUserByUsernameId(adminClient.realm("test"), "test-user@localhost"); + UserResource user = AdminApiUtil.findUserByUsernameId(adminClient.realm("test"), "test-user@localhost"); user.revokeConsent("test-app"); // revert require consent @@ -514,7 +514,7 @@ public void nonSupportedParams() { @Test public void requestObjectNotRequiredNotProvided() { // Set request object not required for client - ClientResource clientResource = ApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); + ClientResource clientResource = AdminApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); ClientRepresentation clientRep = clientResource.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setRequestObjectRequired(null); clientResource.update(clientRep); @@ -530,7 +530,7 @@ public void requestObjectNotRequiredNotProvided() { @Test public void requestObjectNotRequiredProvidedInRequestParam() { // Set request object not required for client - ClientResource clientResource = ApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); + ClientResource clientResource = AdminApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); ClientRepresentation clientRep = clientResource.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setRequestObjectRequired(null); clientResource.update(clientRep); @@ -549,7 +549,7 @@ public void requestObjectNotRequiredProvidedInRequestParam() { @Test public void requestObjectNotRequiredProvidedInRequestUriParam() { // Set request object not required for client - ClientResource clientResource = ApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); + ClientResource clientResource = AdminApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); ClientRepresentation clientRep = clientResource.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setRequestObjectRequired(null); clientResource.update(clientRep); @@ -568,7 +568,7 @@ public void requestObjectNotRequiredProvidedInRequestUriParam() { @Test public void requestObjectRequiredNotProvided() { // Set request object not required for client - ClientResource clientResource = ApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); + ClientResource clientResource = AdminApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); ClientRepresentation clientRep = clientResource.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setRequestObjectRequired(OIDCConfigAttributes.REQUEST_OBJECT_REQUIRED_REQUEST_OR_REQUEST_URI); clientResource.update(clientRep); @@ -587,7 +587,7 @@ public void requestObjectRequiredNotProvided() { @Test public void requestObjectRequiredProvidedInRequestParam() { // Set request object not required for client - ClientResource clientResource = ApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); + ClientResource clientResource = AdminApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); ClientRepresentation clientRep = clientResource.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setRequestObjectRequired(OIDCConfigAttributes.REQUEST_OBJECT_REQUIRED_REQUEST_OR_REQUEST_URI); clientResource.update(clientRep); @@ -613,7 +613,7 @@ public void requestObjectSupersedesQueryParameter() { String stateInQueryParameter = "stateInQueryParameter"; // Set request object not required for client - ClientResource clientResource = ApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); + ClientResource clientResource = AdminApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); ClientRepresentation clientRep = clientResource.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setRequestObjectRequired(OIDCConfigAttributes.REQUEST_OBJECT_REQUIRED_REQUEST_OR_REQUEST_URI); clientResource.update(clientRep); @@ -685,7 +685,7 @@ public void requestObjectClientIdAndResponseTypeTest() { @Test public void requestObjectRequiredProvidedInRequestUriParam() { // Set request object not required for client - ClientResource clientResource = ApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); + ClientResource clientResource = AdminApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); ClientRepresentation clientRep = clientResource.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setRequestObjectRequired(OIDCConfigAttributes.REQUEST_OBJECT_REQUIRED_REQUEST_OR_REQUEST_URI); clientResource.update(clientRep); @@ -708,7 +708,7 @@ public void requestObjectRequiredProvidedInRequestUriParam() { @Test public void requestObjectRequiredAsRequestParamNotProvided() { // Set request object not required for client - ClientResource clientResource = ApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); + ClientResource clientResource = AdminApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); ClientRepresentation clientRep = clientResource.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setRequestObjectRequired(OIDCConfigAttributes.REQUEST_OBJECT_REQUIRED_REQUEST); clientResource.update(clientRep); @@ -727,7 +727,7 @@ public void requestObjectRequiredAsRequestParamNotProvided() { @Test public void requestObjectRequiredAsRequestParamProvidedInRequestParam() { // Set request object not required for client - ClientResource clientResource = ApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); + ClientResource clientResource = AdminApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); ClientRepresentation clientRep = clientResource.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setRequestObjectRequired(OIDCConfigAttributes.REQUEST_OBJECT_REQUIRED_REQUEST); clientResource.update(clientRep); @@ -750,7 +750,7 @@ public void requestObjectRequiredAsRequestParamProvidedInRequestParam() { @Test public void requestObjectRequiredAsRequestParamProvidedInRequestUriParam() { // Set request object not required for client - ClientResource clientResource = ApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); + ClientResource clientResource = AdminApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); ClientRepresentation clientRep = clientResource.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setRequestObjectRequired(OIDCConfigAttributes.REQUEST_OBJECT_REQUIRED_REQUEST); clientResource.update(clientRep); @@ -772,7 +772,7 @@ public void requestObjectRequiredAsRequestParamProvidedInRequestUriParam() { @Test public void requestObjectRequiredAsRequestUriParamNotProvided() { // Set request object not required for client - ClientResource clientResource = ApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); + ClientResource clientResource = AdminApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); ClientRepresentation clientRep = clientResource.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setRequestObjectRequired(OIDCConfigAttributes.REQUEST_OBJECT_REQUIRED_REQUEST_URI); clientResource.update(clientRep); @@ -791,7 +791,7 @@ public void requestObjectRequiredAsRequestUriParamNotProvided() { @Test public void requestObjectRequiredAsRequestUriParamProvidedInRequestParam() { // Set request object not required for client - ClientResource clientResource = ApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); + ClientResource clientResource = AdminApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); ClientRepresentation clientRep = clientResource.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setRequestObjectRequired(OIDCConfigAttributes.REQUEST_OBJECT_REQUIRED_REQUEST_URI); clientResource.update(clientRep); @@ -813,7 +813,7 @@ public void requestObjectRequiredAsRequestUriParamProvidedInRequestParam() { @Test public void requestObjectRequiredAsRequestUriParamProvidedInRequestUriParam() { // Set request object not required for client - ClientResource clientResource = ApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); + ClientResource clientResource = AdminApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); ClientRepresentation clientRep = clientResource.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setRequestObjectRequired(OIDCConfigAttributes.REQUEST_OBJECT_REQUIRED_REQUEST_URI); clientResource.update(clientRep); @@ -951,7 +951,7 @@ public void requestUriParamSigned() { TestOIDCEndpointsApplicationResource oidcClientEndpointsResource = testingClient.testApp().oidcClientEndpoints(); // Set required signature for request_uri - ClientResource clientResource = ApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); + ClientResource clientResource = AdminApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); ClientRepresentation clientRep = clientResource.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setRequestObjectSignatureAlg(Algorithm.RS256); clientResource.update(clientRep); @@ -1007,7 +1007,7 @@ private void requestUriParamSignedIn(String expectedAlgorithm, String actualAlgo TestOIDCEndpointsApplicationResource oidcClientEndpointsResource = testingClient.testApp().oidcClientEndpoints(); // Set required signature for request_uri - clientResource = ApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); clientRep = clientResource.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setRequestObjectSignatureAlg(expectedAlgorithm); clientResource.update(clientRep); @@ -1019,7 +1019,7 @@ private void requestUriParamSignedIn(String expectedAlgorithm, String actualAlgo oidcClientEndpointsResource.setOIDCRequest("test", "test-app", validRedirectUri, "10", "mystate3", actualAlgorithm); // use and set jwks_url - clientResource = ApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); clientRep = clientResource.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setUseJwksUrl(true); String jwksUrl = TestApplicationResourceUrls.clientJwksUri(); @@ -1350,7 +1350,7 @@ public void testSignedRequestObject() throws IOException { @Test public void testWrongEncryptionAlgorithm() throws Exception { try { - ClientResource clientResource = ApiUtil.findClientByClientId(adminClient.realm(oauth.getRealm()), oauth.getClientId()); + ClientResource clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(oauth.getRealm()), oauth.getClientId()); ClientRepresentation clientRep = clientResource.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setRequestObjectEncryptionAlg(RSA_OAEP_256); clientResource.update(clientRep); @@ -1361,7 +1361,7 @@ public void testWrongEncryptionAlgorithm() throws Exception { oauth.loginForm().request(createEncryptedRequestObject(RSA_OAEP_256)).doLogin("test-user@localhost", "password"); assertTrue(appPage.isCurrent()); } finally { - ClientResource clientResource = ApiUtil.findClientByClientId(adminClient.realm(oauth.getRealm()), oauth.getClientId()); + ClientResource clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(oauth.getRealm()), oauth.getClientId()); ClientRepresentation clientRep = clientResource.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setRequestObjectEncryptionAlg(null); clientResource.update(clientRep); @@ -1376,7 +1376,7 @@ public void testWrongEncryptionAlgorithm() throws Exception { @Test public void testWrongContentEncryptionAlgorithm() throws Exception { - ClientResource clientResource = ApiUtil.findClientByClientId(adminClient.realm(oauth.getRealm()), oauth.getClientId()); + ClientResource clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(oauth.getRealm()), oauth.getClientId()); ClientRepresentation clientRep = clientResource.toRepresentation(); try { OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setRequestObjectEncryptionAlg(RSA_OAEP_256); @@ -1396,7 +1396,7 @@ public void testWrongContentEncryptionAlgorithm() throws Exception { oauth.loginForm().request(createEncryptedRequestObject(RSA_OAEP_256)).doLogin("test-user@localhost", "password"); assertTrue(appPage.isCurrent()); } finally { - clientResource = ApiUtil.findClientByClientId(adminClient.realm(oauth.getRealm()), oauth.getClientId()); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(oauth.getRealm()), oauth.getClientId()); clientRep = clientResource.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setRequestObjectEncryptionAlg(null); OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setRequestObjectEncryptionEnc(null); @@ -1483,7 +1483,7 @@ private String createAndSignRequestObject() throws IOException { TestOIDCEndpointsApplicationResource client = testingClient.testApp().oidcClientEndpoints(); // use and set jwks_url - ClientResource clientResource = ApiUtil.findClientByClientId(adminClient.realm(oauth.getRealm()), oauth.getClientId()); + ClientResource clientResource = AdminApiUtil.findClientByClientId(adminClient.realm(oauth.getRealm()), oauth.getClientId()); ClientRepresentation clientRep = clientResource.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setUseJwksUrl(true); OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setJwksUrl(TestApplicationResourceUrls.clientJwksUri()); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCBackwardsCompatibilityTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCBackwardsCompatibilityTest.java index 14d6155d9699..87ecc6b02ff7 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCBackwardsCompatibilityTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCBackwardsCompatibilityTest.java @@ -30,7 +30,7 @@ import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.ErrorPage; import org.keycloak.testsuite.pages.LoginPage; @@ -94,7 +94,7 @@ public void testExcludeSessionStateParameter() { Assert.assertNotNull(authzResponse.getSessionState()); // Switch "exclude session_state" to on - ClientResource client = ApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); + ClientResource client = AdminApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); ClientRepresentation clientRep = client.toRepresentation(); OIDCAdvancedConfigWrapper config = OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep); config.setExcludeSessionStateFromAuthResponse(true); @@ -122,7 +122,7 @@ public void testExcludeIssuerParameter() { Assert.assertEquals(oauth.AUTH_SERVER_ROOT + "/realms/test", authzResponse.getIssuer()); // Switch "exclude iss" to on - ClientResource client = ApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); + ClientResource client = AdminApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); ClientRepresentation clientRep = client.toRepresentation(); OIDCAdvancedConfigWrapper config = OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep); config.setExcludeIssuerFromAuthResponse(true); @@ -155,7 +155,7 @@ public void testExcludeIssuerParameterOnError() throws IOException { events.expectLogin().error(Errors.INVALID_REQUEST).user((String) null).session((String) null).clearDetails().detail(Details.RESPONSE_TYPE, "tokenn").assertEvent(); // Switch "exclude iss" to on - ClientResource client = ApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); + ClientResource client = AdminApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); ClientRepresentation clientRep = client.toRepresentation(); OIDCAdvancedConfigWrapper config = OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep); config.setExcludeIssuerFromAuthResponse(true); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCDynamicScopeTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCDynamicScopeTest.java index 103195e51c35..125bce89f695 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCDynamicScopeTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCDynamicScopeTest.java @@ -37,6 +37,7 @@ import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.ProfileAssume; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.util.UserBuilder; @@ -145,7 +146,7 @@ public void testGetAccessTokenWithDynamicScope() { getCleanup().addClientScopeId(scopeId); response.close(); - ClientResource testApp = ApiUtil.findClientByClientId(testRealm(), "test-app"); + ClientResource testApp = AdminApiUtil.findClientByClientId(testRealm(), "test-app"); ClientRepresentation testAppRep = testApp.toRepresentation(); testApp.update(testAppRep); testApp.addOptionalClientScope(scopeId); @@ -170,7 +171,7 @@ public void testGetAccessTokenWithDynamicScopeWithPermittedRoleScope() { testRealm().clientScopes().get(scopeId).getScopeMappings().realmLevel().add(dynamicScopeRoleList); - ClientResource testApp = ApiUtil.findClientByClientId(testRealm(), "test-app"); + ClientResource testApp = AdminApiUtil.findClientByClientId(testRealm(), "test-app"); ClientRepresentation testAppRep = testApp.toRepresentation(); testApp.update(testAppRep); testApp.addOptionalClientScope(scopeId); @@ -195,7 +196,7 @@ public void testGetAccessTokenMissingRoleScopedDynamicScope() { testRealm().clientScopes().get(scopeId).getScopeMappings().realmLevel().add(dynamicScopeRoleList); - ClientResource testApp = ApiUtil.findClientByClientId(testRealm(), "test-app"); + ClientResource testApp = AdminApiUtil.findClientByClientId(testRealm(), "test-app"); ClientRepresentation testAppRep = testApp.toRepresentation(); testApp.update(testAppRep); testApp.addOptionalClientScope(scopeId); @@ -228,7 +229,7 @@ private Response createDynamicScope(String scopeName) { * @param expectedRoles */ private void testLoginAndClientScopesPermissions(String username, String expectedRoleScopes, String... expectedRoles) { - String userId = ApiUtil.findUserByUsername(testRealm(), username).getId(); + String userId = AdminApiUtil.findUserByUsername(testRealm(), username).getId(); oauth.openLoginForm(); oauth.doLogin(username, "password"); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCPublicClientTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCPublicClientTest.java index aa41cecba18b..24c9b8854644 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCPublicClientTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCPublicClientTest.java @@ -28,7 +28,7 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.util.ClientManager; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; @@ -79,7 +79,7 @@ public void addTestRealms(List testRealms) { @Test public void accessTokenRequest() throws Exception { // Update client to use custom client authenticator - ClientResource clientResource = ApiUtil.findClientByClientId(adminClient.realms().realm("test"), "test-app"); + ClientResource clientResource = AdminApiUtil.findClientByClientId(adminClient.realms().realm("test"), "test-app"); ClientRepresentation clientRep = clientResource.toRepresentation(); clientRep.setClientAuthenticatorType(JWTClientAuthenticator.PROVIDER_ID); clientResource.update(clientRep); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCScopeTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCScopeTest.java index 6ae042d466e9..10427aee1ae9 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCScopeTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCScopeTest.java @@ -46,6 +46,7 @@ import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.Assert; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.pages.OAuthGrantPage; import org.keycloak.testsuite.util.AccountHelper; @@ -287,10 +288,10 @@ private void assertMicroprofile(IDToken idToken, boolean claimsIn) { @Test public void testRemoveScopes() throws Exception { // Add 'profile' as optional scope. Remove 'email' scope entirely - String profileScopeId = ApiUtil.findClientScopeByName(testRealm(), "profile").toRepresentation().getId(); - String emailScopeId = ApiUtil.findClientScopeByName(testRealm(), "email").toRepresentation().getId(); + String profileScopeId = AdminApiUtil.findClientScopeByName(testRealm(), "profile").toRepresentation().getId(); + String emailScopeId = AdminApiUtil.findClientScopeByName(testRealm(), "email").toRepresentation().getId(); - ClientResource testApp = ApiUtil.findClientByClientId(testRealm(), "test-app"); + ClientResource testApp = AdminApiUtil.findClientByClientId(testRealm(), "test-app"); testApp.removeDefaultClientScope(profileScopeId); testApp.removeDefaultClientScope(emailScopeId); testApp.addOptionalClientScope(profileScopeId); @@ -340,7 +341,7 @@ public void testRemoveScopes() throws Exception { @Test public void testOptionalScopesWithConsentRequired() throws Exception { // Remove "displayOnConsentScreen" from address - ClientScopeResource addressScope = ApiUtil.findClientScopeByName(testRealm(), "address"); + ClientScopeResource addressScope = AdminApiUtil.findClientScopeByName(testRealm(), "address"); ClientScopeRepresentation addressScopeRep = addressScope.toRepresentation(); addressScopeRep.getAttributes().put(ClientScopeModel.DISPLAY_ON_CONSENT_SCREEN, "false"); addressScope.update(addressScopeRep); @@ -403,7 +404,7 @@ public void testOptionalScopesWithConsentRequired() throws Exception { @Test public void testClientDisplayedOnConsentScreen() throws Exception { // Add "displayOnConsentScreen" to client - ClientResource thirdParty = ApiUtil.findClientByClientId(testRealm(), "third-party"); + ClientResource thirdParty = AdminApiUtil.findClientByClientId(testRealm(), "third-party"); ClientRepresentation thirdPartyRep = thirdParty.toRepresentation(); thirdPartyRep.getAttributes().put(ClientScopeModel.DISPLAY_ON_CONSENT_SCREEN, "true"); thirdPartyRep.getAttributes().put(ClientScopeModel.CONSENT_SCREEN_TEXT, "ThirdParty permissions"); @@ -441,14 +442,14 @@ public void testClientDisplayedOnConsentScreen() throws Exception { @Test public void testClientDisplayedOnConsentScreenWithEmptyConsentText() throws Exception { // Add "displayOnConsentScreen" to client - ClientResource thirdParty = ApiUtil.findClientByClientId(testRealm(), "third-party"); + ClientResource thirdParty = AdminApiUtil.findClientByClientId(testRealm(), "third-party"); ClientRepresentation thirdPartyRep = thirdParty.toRepresentation(); thirdPartyRep.getAttributes().put(ClientScopeModel.DISPLAY_ON_CONSENT_SCREEN, "true"); thirdPartyRep.getAttributes().put(ClientScopeModel.CONSENT_SCREEN_TEXT, ""); thirdParty.update(thirdPartyRep); // Change consent text on profile scope - ClientScopeResource profileScope = ApiUtil.findClientScopeByName(testRealm(), OAuth2Constants.SCOPE_PROFILE); + ClientScopeResource profileScope = AdminApiUtil.findClientScopeByName(testRealm(), OAuth2Constants.SCOPE_PROFILE); ClientScopeRepresentation profileScopeRep = profileScope.toRepresentation(); profileScopeRep.getAttributes().put(ClientScopeModel.CONSENT_SCREEN_TEXT, " "); profileScope.update(profileScopeRep); @@ -556,7 +557,7 @@ public void testTwoRefreshTokensWithDifferentScopes() { testRealm().clientScopes().get(scope2Id).getScopeMappings().realmLevel().add(Arrays.asList(role2)); // Add client scopes to our client. Disable fullScopeAllowed - ClientResource testApp = ApiUtil.findClientByClientId(testRealm(), "test-app"); + ClientResource testApp = AdminApiUtil.findClientByClientId(testRealm(), "test-app"); ClientRepresentation testAppRep = testApp.toRepresentation(); testAppRep.setFullScopeAllowed(false); testApp.update(testAppRep); @@ -632,7 +633,7 @@ public void testClientScopesPermissions() { testRealm().clientScopes().get(scopeParentId).getScopeMappings().realmLevel().add(Arrays.asList(roleParent)); // Add client scopes to our client - ClientResource testApp = ApiUtil.findClientByClientId(testRealm(), "test-app"); + ClientResource testApp = AdminApiUtil.findClientByClientId(testRealm(), "test-app"); ClientRepresentation testAppRep = testApp.toRepresentation(); testApp.update(testAppRep); testApp.addDefaultClientScope(scope1Id); @@ -686,7 +687,7 @@ private String getLongScopeParameter(int scopesCount) { } private void testLoginAndClientScopesPermissions(String username, String expectedRoleScopes, String... expectedRoles) { - String userId = ApiUtil.findUserByUsername(testRealm(), username).getId(); + String userId = AdminApiUtil.findUserByUsername(testRealm(), username).getId(); oauth.openLoginForm(); oauth.doLogin(username, "password"); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/UserInfoTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/UserInfoTest.java index dfd736a86a89..aea8d78c4d7e 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/UserInfoTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/UserInfoTest.java @@ -79,6 +79,7 @@ import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AssertEvents; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.client.resources.TestApplicationResourceUrls; import org.keycloak.testsuite.client.resources.TestOIDCEndpointsApplicationResource; @@ -261,7 +262,7 @@ public void testSuccess_dotsInClientId() throws Exception { // Assign role to the user RoleRepresentation fooRole = realm.clients().get(clientUUID).roles().get("my.foo.role").toRepresentation(); - UserResource userResource = ApiUtil.findUserByUsernameId(realm, "test-user@localhost"); + UserResource userResource = AdminApiUtil.findUserByUsernameId(realm, "test-user@localhost"); userResource.roles().clientLevel(clientUUID).add(Collections.singletonList(fooRole)); // Login to the new client @@ -355,7 +356,7 @@ private void testUserInfoSignatureAndEncryption(String sigAlgorithm, String curv TestOIDCEndpointsApplicationResource oidcClientEndpointsResource = testingClient.testApp().oidcClientEndpoints(); oidcClientEndpointsResource.generateKeys(algAlgorithm, curve); - clientResource = ApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); clientRep = clientResource.toRepresentation(); // set UserInfo response signature algorithm and encryption algorithms if(sigAlgorithm != null) { @@ -426,7 +427,7 @@ private void testUserInfoSignatureAndEncryption(String sigAlgorithm, String curv } catch (JWSInputException | JWEException | IOException e) { Assert.fail(); } finally { - clientResource = ApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); + clientResource = AdminApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); clientRep = clientResource.toRepresentation(); // revert User Info response signature algorithm and encryption algorithms OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setUserInfoSignedResponseAlg(null); @@ -471,7 +472,7 @@ private JOSEHeader getHeader(String base64Header) { @Test public void testSuccessSignedResponse() throws Exception { // Require signed userInfo request - ClientResource clientResource = ApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); + ClientResource clientResource = AdminApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); ClientRepresentation clientRep = clientResource.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setUserInfoSignedResponseAlg(Algorithm.RS256); clientResource.update(clientRep); @@ -871,7 +872,7 @@ public void testUnsuccessfulUserInfoRequestWithoutOpenIDScope() { public void testUnsuccessfulUserInfoRequestWithDisabledUser() { Client client = AdminClientUtil.createResteasyClient(); RealmResource realm = adminClient.realm("test"); - UserResource userResource = ApiUtil.findUserByUsernameId(realm, "test-user@localhost"); + UserResource userResource = AdminApiUtil.findUserByUsernameId(realm, "test-user@localhost"); UserRepresentation user = userResource.toRepresentation(); try { @@ -1015,7 +1016,7 @@ private void testSuccessSignedResponse(String sigAlg, String acceptHeader) throw try { // Require signed userInfo request - ClientResource clientResource = ApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); + ClientResource clientResource = AdminApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"); ClientRepresentation clientRep = clientResource.toRepresentation(); OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setUserInfoSignedResponseAlg(sigAlg); clientResource.update(clientRep); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/AbstractOIDCResponseTypeTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/AbstractOIDCResponseTypeTest.java index d11581c518c7..88339367e2f0 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/AbstractOIDCResponseTypeTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/AbstractOIDCResponseTypeTest.java @@ -34,7 +34,7 @@ import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.util.ClientManager; @@ -280,12 +280,12 @@ private void oidcFlowRequest(String expectedAccessAlg, String expectedIdTokenAlg setIdTokenSignatureAlgorithm(expectedIdTokenAlg); // Realm setting is used for access token signature algorithm TokenSignatureUtil.changeRealmTokenSignatureProvider(adminClient, expectedAccessAlg); - TokenSignatureUtil.changeClientIdTokenSignatureProvider(ApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"), expectedIdTokenAlg); + TokenSignatureUtil.changeClientIdTokenSignatureProvider(AdminApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"), expectedIdTokenAlg); oidcFlow(expectedAccessAlg, expectedIdTokenAlg); } finally { setIdTokenSignatureAlgorithm(Algorithm.RS256); TokenSignatureUtil.changeRealmTokenSignatureProvider(adminClient, Algorithm.RS256); - TokenSignatureUtil.changeClientIdTokenSignatureProvider(ApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"), Algorithm.RS256); + TokenSignatureUtil.changeClientIdTokenSignatureProvider(AdminApiUtil.findClientByClientId(adminClient.realm("test"), "test-app"), Algorithm.RS256); } } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/account/OrganizationAccountTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/account/OrganizationAccountTest.java index 3f6f3c3e09e5..527b219439da 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/account/OrganizationAccountTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/account/OrganizationAccountTest.java @@ -30,7 +30,7 @@ import org.keycloak.representations.idm.ErrorRepresentation; import org.keycloak.representations.idm.OrganizationDomainRepresentation; import org.keycloak.representations.idm.UserRepresentation; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.broker.util.SimpleHttpDefault; import org.keycloak.testsuite.organization.admin.AbstractOrganizationTest; import org.keycloak.testsuite.util.TokenUtil; @@ -73,7 +73,7 @@ public void testFailUnlinkIdentityProvider() throws IOException { assertBrokerRegistration(organization, bc.getUserLogin(), bc.getUserEmail()); // reset password to obtain a token and access the account api UserRepresentation user = testRealm().users().searchByEmail(bc.getUserEmail(), true).get(0); - ApiUtil.resetUserPassword(realmsResouce().realm(bc.consumerRealmName()).users().get(user.getId()), bc.getUserPassword(), false); + AdminApiUtil.resetUserPassword(realmsResouce().realm(bc.consumerRealmName()).users().get(user.getId()), bc.getUserPassword(), false); LinkedAccountRepresentation link = findLinkedAccount(bc.getIDPAlias()); Assert.assertNotNull(link); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/authentication/OrganizationAuthenticationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/authentication/OrganizationAuthenticationTest.java index b0d5d7a72f69..f45c75033cef 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/authentication/OrganizationAuthenticationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/authentication/OrganizationAuthenticationTest.java @@ -33,6 +33,7 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.Assert; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.organization.admin.AbstractOrganizationTest; import org.keycloak.testsuite.runonserver.RunOnServer; @@ -373,7 +374,7 @@ public void testUsernameExposureWhenEnteringEmail() { .password(memberPassword) .build(); - String memberId = ApiUtil.createUserAndResetPasswordWithAdminClient(testRealm(), member, memberPassword); + String memberId = AdminApiUtil.createUserAndResetPasswordWithAdminClient(testRealm(), member, memberPassword); organization.members().addMember(memberId).close(); // Enter the email address in the login form diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/broker/AbstractBrokerSelfRegistrationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/broker/AbstractBrokerSelfRegistrationTest.java index 703b2b350116..bc2baa41cc63 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/broker/AbstractBrokerSelfRegistrationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/broker/AbstractBrokerSelfRegistrationTest.java @@ -40,6 +40,7 @@ import org.keycloak.representations.idm.OrganizationRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.Assert; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.organization.admin.AbstractOrganizationTest; import org.keycloak.testsuite.pages.AppPage; @@ -567,7 +568,7 @@ public void testNoIDPRedirectWhenUserHasCredentialsSet() { // set the user's credentials UserRepresentation user = testRealm().users().searchByEmail(bc.getUserEmail(), true).get(0); - ApiUtil.resetUserPassword(realmsResouce().realm(bc.consumerRealmName()).users().get(user.getId()), "updated-password", false); + AdminApiUtil.resetUserPassword(realmsResouce().realm(bc.consumerRealmName()).users().get(user.getId()), "updated-password", false); // logout to force the user to authenticate again UserRepresentation account = getUserRepresentation(bc.getUserEmail()); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/policy/PasswordAgePolicyTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/policy/PasswordAgePolicyTest.java index d5f5dbcb18d1..94fbb23added 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/policy/PasswordAgePolicyTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/policy/PasswordAgePolicyTest.java @@ -29,7 +29,7 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.AbstractAuthTest; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.auth.page.AuthRealm; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.AppPage.RequestType; @@ -323,7 +323,7 @@ public void testRegistration() throws IOException { Assert.assertNull(response.getError()); Assert.assertNotNull(response.getCode()); - ApiUtil.findUserByUsernameId(testRealmResource(), "registration-user").remove(); + AdminApiUtil.findUserByUsernameId(testRealmResource(), "registration-user").remove(); } } } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/script/DeployedScriptMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/script/DeployedScriptMapperTest.java index 37d49d196e70..7980cfae7208 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/script/DeployedScriptMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/script/DeployedScriptMapperTest.java @@ -42,7 +42,7 @@ import org.junit.Test; import static org.keycloak.common.Profile.Feature.SCRIPTS; -import static org.keycloak.testsuite.admin.ApiUtil.findClientResourceByClientId; +import static org.keycloak.testsuite.admin.AdminApiUtil.findClientResourceByClientId; import static org.keycloak.testsuite.arquillian.DeploymentTargetModifier.AUTH_SERVER_CURRENT; import static org.keycloak.testsuite.util.ProtocolMapperUtil.createScriptMapper; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/script/UndeployedScriptMapperNotAvailableTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/script/UndeployedScriptMapperNotAvailableTest.java index 459cd4d14edb..99d59370e6a7 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/script/UndeployedScriptMapperNotAvailableTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/script/UndeployedScriptMapperNotAvailableTest.java @@ -40,7 +40,7 @@ import org.junit.Test; import static org.keycloak.common.Profile.Feature.SCRIPTS; -import static org.keycloak.testsuite.admin.ApiUtil.findClientResourceByClientId; +import static org.keycloak.testsuite.admin.AdminApiUtil.findClientResourceByClientId; import static org.keycloak.testsuite.arquillian.DeploymentTargetModifier.AUTH_SERVER_CURRENT; import static org.keycloak.testsuite.util.ProtocolMapperUtil.createScriptMapper; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/sessionlimits/UserSessionLimitsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/sessionlimits/UserSessionLimitsTest.java index b26aefe0fd7f..156f154c170b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/sessionlimits/UserSessionLimitsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/sessionlimits/UserSessionLimitsTest.java @@ -34,7 +34,7 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.forms.BrowserFlowTest; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.ErrorPage; @@ -443,7 +443,7 @@ public void testClientSessionCountExceededAndNewSessionDeniedResetPasswordFlow() events.expect(EventType.RESET_PASSWORD_ERROR).client("account").error(Errors.GENERIC_AUTHENTICATION_ERROR).assertEvent(); } finally { testRealm().clients().findByClientId(Constants.ACCOUNT_MANAGEMENT_CLIENT_ID).get(0).setDirectAccessGrantsEnabled(false); - ApiUtil.resetUserPassword(testRealm().users().get(findUser("test-user@localhost").getId()), "password", false); + AdminApiUtil.resetUserPassword(testRealm().users().get(findUser("test-user@localhost").getId()), "password", false); } } @@ -487,7 +487,7 @@ public void testClientSessionCountExceededAndOldestSessionRemovedResetPasswordFl testingClient.server(realmName).run(assertSessionCount(realmName, username, 1)); } finally { - ApiUtil.resetUserPassword(testRealm().users().get(findUser("test-user@localhost").getId()), "password", false); + AdminApiUtil.resetUserPassword(testRealm().users().get(findUser("test-user@localhost").getId()), "password", false); setAuthenticatorConfigItem(DefaultAuthenticationFlows.RESET_CREDENTIALS_FLOW, UserSessionLimitsAuthenticatorFactory.BEHAVIOR, UserSessionLimitsAuthenticatorFactory.DENY_NEW_SESSION); } } @@ -574,7 +574,7 @@ public void testRealmSessionCountExceededAndOldestSessionRemovedResetPasswordFlo testingClient.server(realmName).run(assertSessionCount(realmName, username, 1)); } finally { - ApiUtil.resetUserPassword(testRealm().users().get(findUser("test-user@localhost").getId()), "password", false); + AdminApiUtil.resetUserPassword(testRealm().users().get(findUser("test-user@localhost").getId()), "password", false); setAuthenticatorConfigItem(DefaultAuthenticationFlows.RESET_CREDENTIALS_FLOW, UserSessionLimitsAuthenticatorFactory.BEHAVIOR, UserSessionLimitsAuthenticatorFactory.DENY_NEW_SESSION); setAuthenticatorConfigItem(DefaultAuthenticationFlows.RESET_CREDENTIALS_FLOW, UserSessionLimitsAuthenticatorFactory.USER_REALM_LIMIT, "0"); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/ssl/TrustStoreEmailTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/ssl/TrustStoreEmailTest.java index 79cb0f6feb11..1a8ef6295cf9 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/ssl/TrustStoreEmailTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/ssl/TrustStoreEmailTest.java @@ -27,7 +27,7 @@ import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.auth.page.AuthRealm; import org.keycloak.testsuite.auth.page.login.OIDCLogin; import org.keycloak.testsuite.auth.page.login.VerifyEmail; @@ -94,7 +94,7 @@ public void afterTrustStoreEmailTest() { } public void verifyEmailWithSslEnabled(Boolean opportunistic) { - UserResource userResource = ApiUtil.findUserByUsernameId(testRealm(), "test-user@localhost"); + UserResource userResource = AdminApiUtil.findUserByUsernameId(testRealm(), "test-user@localhost"); UserRepresentation user = userResource.toRepresentation(); user.setEmailVerified(false); userResource.update(user); @@ -155,7 +155,7 @@ public void verifyEmailWithSslEnabled(Boolean opportunistic) { @Test public void test01VerifyEmailWithSslWrongCertificate() throws Exception { - UserRepresentation user = ApiUtil.findUserByUsername(testRealm(), "test-user@localhost"); + UserRepresentation user = AdminApiUtil.findUserByUsername(testRealm(), "test-user@localhost"); SslMailServer.startWithSsl(this.getClass().getClassLoader().getResource(SslMailServer.INVALID_KEY).getFile()); oauth.openLoginForm(); @@ -190,7 +190,7 @@ public void test02VerifyEmailWithSslWrongCertificateAndAnyHostnamePolicy() throw @Test public void test03erifyEmailWithSslWrongHostname() throws Exception { - UserRepresentation user = ApiUtil.findUserByUsername(testRealm(), "test-user@localhost"); + UserRepresentation user = AdminApiUtil.findUserByUsername(testRealm(), "test-user@localhost"); try (RealmAttributeUpdater updater = new RealmAttributeUpdater(testRealm()) .setSmtpServer("host", "localhost.localdomain") diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/user/profile/UserProfileTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/user/profile/UserProfileTest.java index ac8bd3007774..e6d1f1892bac 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/user/profile/UserProfileTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/user/profile/UserProfileTest.java @@ -58,6 +58,7 @@ import org.keycloak.representations.userprofile.config.UPConfig.UnmanagedAttributePolicy; import org.keycloak.representations.userprofile.config.UPGroup; import org.keycloak.services.messages.Messages; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.arquillian.annotation.ModelTest; import org.keycloak.testsuite.runonserver.RunOnServer; @@ -2308,11 +2309,11 @@ private static void testAttributeNormalization(KeycloakSession session) { @Test public void testEmailAttributeInUpdateEmailContext() { - ApiUtil.enableRequiredAction(testRealm(), RequiredAction.UPDATE_EMAIL, true); + AdminApiUtil.enableRequiredAction(testRealm(), RequiredAction.UPDATE_EMAIL, true); try { getTestingClient().server(TEST_REALM_NAME).run((RunOnServer) UserProfileTest::testEmailAttributeInUpdateEmailContext); } finally { - ApiUtil.enableRequiredAction(testRealm(), RequiredAction.UPDATE_EMAIL, false); + AdminApiUtil.enableRequiredAction(testRealm(), RequiredAction.UPDATE_EMAIL, false); } } @@ -2398,11 +2399,11 @@ private static void testEmailAttributeInUpdateEmailContext(KeycloakSession sessi @Test public void testEmailAnnotationsInAccountContext() { - ApiUtil.enableRequiredAction(testRealm(), RequiredAction.UPDATE_EMAIL, true); + AdminApiUtil.enableRequiredAction(testRealm(), RequiredAction.UPDATE_EMAIL, true); try { getTestingClient().server(TEST_REALM_NAME).run((RunOnServer) UserProfileTest::testEmailAnnotationsInAccountContext); } finally { - ApiUtil.enableRequiredAction(testRealm(), RequiredAction.UPDATE_EMAIL, false); + AdminApiUtil.enableRequiredAction(testRealm(), RequiredAction.UPDATE_EMAIL, false); } } @@ -2473,11 +2474,11 @@ private static void testEmailAnnotationsInAccountContext(KeycloakSession session @Test public void testEmailFieldHiddenWhenEmptyAndReadOnlyWithUpdateEmailEnabled() { - ApiUtil.enableRequiredAction(testRealm(), RequiredAction.UPDATE_EMAIL, true); + AdminApiUtil.enableRequiredAction(testRealm(), RequiredAction.UPDATE_EMAIL, true); try { getTestingClient().server(TEST_REALM_NAME).run((RunOnServer) UserProfileTest::testEmailFieldHiddenWhenEmptyAndReadOnlyWithUpdateEmailEnabled); } finally { - ApiUtil.enableRequiredAction(testRealm(), RequiredAction.UPDATE_EMAIL, false); + AdminApiUtil.enableRequiredAction(testRealm(), RequiredAction.UPDATE_EMAIL, false); } } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/ClientManager.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/ClientManager.java index ca5f5516c540..b875a0ded0f3 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/ClientManager.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/ClientManager.java @@ -15,8 +15,8 @@ import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.representations.idm.UserRepresentation; -import static org.keycloak.testsuite.admin.ApiUtil.findClientByClientId; -import static org.keycloak.testsuite.admin.ApiUtil.findProtocolMapperByName; +import static org.keycloak.testsuite.admin.AdminApiUtil.findClientByClientId; +import static org.keycloak.testsuite.admin.AdminApiUtil.findProtocolMapperByName; /** * @author Bruno Oliveira. @@ -207,4 +207,4 @@ public UserRepresentation getServiceAccountUser() { return clientResource.getServiceAccountUser(); } } -} \ No newline at end of file +} diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/UserManager.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/UserManager.java index e6134db06db4..93ae5fe840c3 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/UserManager.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/UserManager.java @@ -7,7 +7,7 @@ import org.keycloak.admin.client.resource.UserResource; import org.keycloak.representations.idm.UserRepresentation; -import static org.keycloak.testsuite.admin.ApiUtil.findUserByUsernameId; +import static org.keycloak.testsuite.admin.AdminApiUtil.findUserByUsernameId; /** * @author Bruno Oliveira. @@ -77,4 +77,4 @@ private UserRepresentation initializeRequiredActions() { } } -} \ No newline at end of file +} diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/AbstractWebAuthnVirtualTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/AbstractWebAuthnVirtualTest.java index 389e5450c5f9..22185b96619b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/AbstractWebAuthnVirtualTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/AbstractWebAuthnVirtualTest.java @@ -43,7 +43,7 @@ import org.keycloak.testsuite.AbstractAdminTest; import org.keycloak.testsuite.AbstractChangeImportedUserPasswordsTest; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.ErrorPage; import org.keycloak.testsuite.pages.InfoPage; @@ -175,7 +175,7 @@ protected void postAfterAbstractKeycloak() { } public UserResource userResource() { - return ApiUtil.findUserByUsernameId(testRealm(), USERNAME); + return AdminApiUtil.findUserByUsernameId(testRealm(), USERNAME); } public VirtualAuthenticatorOptions getDefaultAuthenticatorOptions() { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/AppInitiatedActionWebAuthnSkipIfExistsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/AppInitiatedActionWebAuthnSkipIfExistsTest.java index 74adf2c5a319..e003e22f67da 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/AppInitiatedActionWebAuthnSkipIfExistsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/AppInitiatedActionWebAuthnSkipIfExistsTest.java @@ -20,7 +20,7 @@ import org.keycloak.models.Constants; import org.keycloak.models.credential.WebAuthnCredentialModel; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.arquillian.annotation.IgnoreBrowserDriver; import org.junit.Test; @@ -49,7 +49,7 @@ public String getCredentialType() { @IgnoreBrowserDriver(FirefoxDriver.class) // See https://github.com/keycloak/keycloak/issues/10368 public void processSetupTwice() throws IOException { testWebAuthnLogoutOtherSessions(false); - final long credentialsCount = ApiUtil.findUserByUsernameId(testRealm(), DEFAULT_USERNAME) + final long credentialsCount = AdminApiUtil.findUserByUsernameId(testRealm(), DEFAULT_USERNAME) .credentials() .stream() .filter(c -> c.getType().equals(getCredentialType())) @@ -60,7 +60,7 @@ public void processSetupTwice() throws IOException { doAIA(); assertKcActionStatus(SUCCESS); - assertThat(ApiUtil.findUserByUsernameId(testRealm(), DEFAULT_USERNAME) + assertThat(AdminApiUtil.findUserByUsernameId(testRealm(), DEFAULT_USERNAME) .credentials() .stream() .filter(c -> c.getType().equals(getCredentialType())) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/AppInitiatedActionWebAuthnTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/AppInitiatedActionWebAuthnTest.java index 896ef1ecf5f4..9de0670549cf 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/AppInitiatedActionWebAuthnTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/AppInitiatedActionWebAuthnTest.java @@ -36,7 +36,7 @@ import org.keycloak.representations.idm.RequiredActionProviderRepresentation; import org.keycloak.representations.idm.UserSessionRepresentation; import org.keycloak.testsuite.actions.AbstractAppInitiatedActionTest; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.arquillian.annotation.IgnoreBrowserDriver; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.LoginUsernameOnlyPage; @@ -201,7 +201,7 @@ protected void testWebAuthnLogoutOtherSessions(boolean logoutOtherSessions) thro doAIA(); - final Supplier getCredentialCount = () -> Optional.ofNullable(ApiUtil.findUserByUsernameId(testRealm(), DEFAULT_USERNAME)) + final Supplier getCredentialCount = () -> Optional.ofNullable(AdminApiUtil.findUserByUsernameId(testRealm(), DEFAULT_USERNAME)) .map(UserResource::credentials) .map(List::size) .orElse(0); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/WebAuthnIdlessTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/WebAuthnIdlessTest.java index 2bac590cc76e..d5c7cb4b3c20 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/WebAuthnIdlessTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/WebAuthnIdlessTest.java @@ -41,7 +41,7 @@ import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.AbstractAdminTest; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.arquillian.annotation.IgnoreBrowserDriver; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.AppPage.RequestType; @@ -455,7 +455,7 @@ protected void initializeAuthenticator(boolean hasRK, boolean hasUV, boolean isV protected UserRepresentation getUserRepresentation(String username) { if (username != null) - return ApiUtil.findUserByUsername(testRealm(), username); + return AdminApiUtil.findUserByUsername(testRealm(), username); else return null; } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/passwordless/PasskeysKcOidcFirstBrokerLoginTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/passwordless/PasskeysKcOidcFirstBrokerLoginTest.java index a191c2c97a54..3286db646b33 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/passwordless/PasskeysKcOidcFirstBrokerLoginTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/passwordless/PasskeysKcOidcFirstBrokerLoginTest.java @@ -26,7 +26,7 @@ import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.RequiredActionProviderRepresentation; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.arquillian.annotation.IgnoreBrowserDriver; import org.keycloak.testsuite.broker.AbstractBrokerTest; import org.keycloak.testsuite.broker.AbstractInitializedBaseBrokerTest; @@ -156,7 +156,7 @@ public void testLinkAccountByReauthenticationWithPassword() { loginPage.login(bc.getUserPassword()); Assert.assertTrue(appPage.isCurrent()); - assertNumFederatedIdentities(ApiUtil.findUserByUsername(adminClient.realm(bc.consumerRealmName()), "consumer").getId(), 1); + assertNumFederatedIdentities(AdminApiUtil.findUserByUsername(adminClient.realm(bc.consumerRealmName()), "consumer").getId(), 1); } @Test @@ -187,7 +187,7 @@ public void testLinkAccountByReauthenticationWithExternalPasskey() { webAuthnLoginPage.clickAuthenticate(); Assert.assertTrue(appPage.isCurrent()); - assertNumFederatedIdentities(ApiUtil.findUserByUsername(adminClient.realm(bc.consumerRealmName()), "consumer").getId(), 1); + assertNumFederatedIdentities(AdminApiUtil.findUserByUsername(adminClient.realm(bc.consumerRealmName()), "consumer").getId(), 1); } @Test @@ -215,7 +215,7 @@ public void testLinkAccountByReauthenticationWithDiscoverablePasskey() throws IO // login is automatically now via discoverable passkey Assert.assertTrue(appPage.isCurrent()); - assertNumFederatedIdentities(ApiUtil.findUserByUsername(adminClient.realm(bc.consumerRealmName()), "consumer").getId(), 1); + assertNumFederatedIdentities(AdminApiUtil.findUserByUsername(adminClient.realm(bc.consumerRealmName()), "consumer").getId(), 1); } protected void registerUser(String username, String password, String email, String authenticatorLabel) { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/passwordless/PasskeysUsernameFormTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/passwordless/PasskeysUsernameFormTest.java index ba2ce5634340..43b164966def 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/passwordless/PasskeysUsernameFormTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/passwordless/PasskeysUsernameFormTest.java @@ -39,7 +39,7 @@ import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.AbstractAdminTest; import org.keycloak.testsuite.Assert; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.arquillian.annotation.IgnoreBrowserDriver; import org.keycloak.testsuite.util.WaitUtils; import org.keycloak.testsuite.webauthn.AbstractWebAuthnVirtualTest; @@ -382,7 +382,7 @@ public void passwordLogin_reauthenticationOfUserWithoutPasskey() throws Exceptio loginPage.login(getPassword("test-user@localhost")); appPage.assertCurrent(); - UserRepresentation testUser = ApiUtil.findUserByUsernameId(testRealm(), "test-user@localhost").toRepresentation(); + UserRepresentation testUser = AdminApiUtil.findUserByUsernameId(testRealm(), "test-user@localhost").toRepresentation(); events.expectLogin() .user(testUser.getId()) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/passwordless/PasskeysUsernamePasswordFormTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/passwordless/PasskeysUsernamePasswordFormTest.java index b5f8f221c16b..bbed3b410f30 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/passwordless/PasskeysUsernamePasswordFormTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/passwordless/PasskeysUsernamePasswordFormTest.java @@ -32,7 +32,7 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.AbstractAdminTest; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.arquillian.annotation.IgnoreBrowserDriver; import org.keycloak.testsuite.pages.SelectOrganizationPage; import org.keycloak.testsuite.util.WaitUtils; @@ -308,7 +308,7 @@ public void reauthenticationOfUserWithoutPasskey() throws Exception { loginPage.login(getPassword("test-user@localhost")); appPage.assertCurrent(); - UserRepresentation testUser = ApiUtil.findUserByUsernameId(testRealm(), "test-user@localhost").toRepresentation(); + UserRepresentation testUser = AdminApiUtil.findUserByUsernameId(testRealm(), "test-user@localhost").toRepresentation(); events.expectLogin() .user(testUser.getId()) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/registration/ResidentKeyRegisterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/registration/ResidentKeyRegisterTest.java index 8cf2389ff440..523bea5849fb 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/registration/ResidentKeyRegisterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/registration/ResidentKeyRegisterTest.java @@ -21,7 +21,7 @@ import java.io.IOException; import java.util.List; -import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.admin.AdminApiUtil; import org.keycloak.testsuite.arquillian.annotation.IgnoreBrowserDriver; import org.keycloak.testsuite.webauthn.AbstractWebAuthnVirtualTest; import org.keycloak.testsuite.webauthn.utils.PropertyRequirement; @@ -104,7 +104,7 @@ private void assertResidentKey(boolean shouldSuccess, PropertyRequirement requir assertThat(credentials, not(Matchers.empty())); if (PropertyRequirement.YES.equals(requirement)) { - final String userId = ApiUtil.findUserByUsername(testRealm(), USERNAME).getId(); + final String userId = AdminApiUtil.findUserByUsername(testRealm(), USERNAME).getId(); final Credential credential = credentials.get(0); assertThat(credential.isResidentCredential(), is(hasResidentKey)); assertThat(new String(credential.getUserHandle()), is(userId));