From 246c300951bb2e17aff1e9ce0132820bab072438 Mon Sep 17 00:00:00 2001 From: stianst Date: Mon, 20 Apr 2026 08:44:09 +0200 Subject: [PATCH] Remove deprecated method OAuthClient#clientId Closes #48239 Signed-off-by: stianst --- .../util/oauth/OAuthClientConfig.java | 5 -- .../testsuite/util/oauth/OAuthClient.java | 10 --- .../account/AccountRestServiceTest.java | 4 +- .../account/SessionRestServiceTest.java | 2 +- ...ctionUpdateProfileWithUserProfileTest.java | 10 +-- .../testsuite/authz/EntitlementAPITest.java | 10 +-- .../broker/AbstractAdvancedBrokerTest.java | 26 +++---- .../broker/AbstractBaseBrokerTest.java | 4 +- .../testsuite/broker/AbstractBrokerTest.java | 2 +- .../broker/AbstractDefaultIdpTest.java | 6 +- .../broker/AbstractFirstBrokerLoginTest.java | 74 +++++++++---------- .../broker/AbstractNestedBrokerTest.java | 2 +- .../broker/AbstractSamlLoginHintTest.java | 4 +- .../broker/KcCustomOidcBrokerTest.java | 2 +- .../broker/KcOidcBrokerAcrParameterTest.java | 2 +- .../broker/KcOidcBrokerEventTest.java | 6 +- .../broker/KcOidcBrokerFrontendUrlTest.java | 2 +- .../broker/KcOidcBrokerHiddenIdpHintTest.java | 2 +- .../broker/KcOidcBrokerIdpHintTest.java | 10 +-- .../broker/KcOidcBrokerIdpLinkActionTest.java | 2 +- .../broker/KcOidcBrokerLdapReadOnlyTest.java | 4 +- .../broker/KcOidcBrokerLdapTest.java | 2 +- .../broker/KcOidcBrokerLoginHintTest.java | 4 +- .../KcOidcBrokerLogoutFrontChannelTest.java | 2 +- .../broker/KcOidcBrokerLogoutTest.java | 16 ++-- .../broker/KcOidcBrokerNoLoginHintTest.java | 2 +- .../KcOidcBrokerNonceParameterTest.java | 4 +- .../KcOidcBrokerParameterForwardTest.java | 2 +- .../broker/KcOidcBrokerPassMaxAgeTest.java | 4 +- .../KcOidcBrokerPromptNoneRedirectTest.java | 10 +-- .../KcOidcBrokerPromptParameterTest.java | 2 +- .../KcOidcBrokerStateParameterTest.java | 2 +- ...KcOidcBrokerSubMatchIntrospectionTest.java | 4 +- .../testsuite/broker/KcOidcBrokerTest.java | 30 ++++---- .../KcOidcBrokerTransientSessionsTest.java | 8 +- .../KcOidcBrokerUiLocalesDisabledTest.java | 2 +- .../KcOidcBrokerUiLocalesEnabledTest.java | 2 +- .../KcOidcBrokerUiLocalesWithIdpHintTest.java | 2 +- .../broker/KcOidcBrokerWithConsentTest.java | 6 +- ...irstBrokerLoginDetectExistingUserTest.java | 4 +- .../KcOidcFirstBrokerLoginNewAuthTest.java | 4 +- .../broker/KcOidcFirstBrokerLoginTest.java | 54 +++++++------- .../broker/KcOidcMultipleTabsBrokerTest.java | 8 +- .../broker/KcOidcPostBrokerLoginTest.java | 16 ++-- .../KcSamlBrokerArtifactBindingTest.java | 2 +- .../broker/KcSamlBrokerFrontendUrlTest.java | 2 +- ...lBrokerLoginHintWithOptionEnabledTest.java | 2 +- .../testsuite/broker/KcSamlBrokerTest.java | 8 +- .../broker/KcSamlMultipleTabsBrokerTest.java | 4 +- .../testsuite/broker/OAuth2BrokerTest.java | 4 +- .../client/ClientRegistrationTest.java | 2 +- .../client/ClientSecretRotationTest.java | 2 +- .../testsuite/client/MutualTLSClientTest.java | 2 +- .../cluster/AbstractFailoverClusterTest.java | 2 +- .../testsuite/cookies/CookieTest.java | 4 +- .../error/UncaughtErrorPageTest.java | 2 +- .../kerberos/AbstractKerberosTest.java | 2 +- .../ldap/LDAPProvidersIntegrationTest.java | 4 +- .../federation/storage/ClientStorageTest.java | 4 +- .../storage/UserStorageFailureTest.java | 2 +- .../forms/AllowDenyAuthenticatorTest.java | 2 +- .../testsuite/forms/BrowserButtonsTest.java | 4 +- .../testsuite/forms/DirectGrantFlowTest.java | 2 +- .../testsuite/forms/FlowOverrideTest.java | 4 +- .../keycloak/testsuite/forms/LoginTest.java | 12 +-- .../forms/MultipleTabsLoginTest.java | 10 +-- .../forms/RegisterWithUserProfileTest.java | 12 +-- .../testsuite/forms/VerifyProfileTest.java | 16 ++-- .../AbstractClientAuthSignedJWTTest.java | 12 +-- .../oauth/AccessTokenDuplicateEmailsTest.java | 2 +- .../oauth/AccessTokenNoEmailLoginTest.java | 2 +- .../oauth/AccessTokenResponseTest.java | 2 +- .../oauth/BackchannelLogoutTest.java | 4 +- .../oauth/ClientAuthSecretSignedJWTTest.java | 18 ++--- .../oauth/ClientAuthSignedJWTTest.java | 10 +-- .../testsuite/oauth/OAuthGrantTest.java | 18 ++--- .../oauth/OAuthRedirectUriStateTest.java | 2 +- .../oauth/RPInitiatedLogoutTest.java | 2 +- .../oauth/TokenEndpointCorsTest.java | 2 +- .../testsuite/oauth/par/ParWithDPoPTest.java | 4 +- .../oauth/rar/AbstractRARParserTest.java | 2 +- .../OID4VCIssuerEndpointEncryptionTest.java | 2 +- .../oidc/AbstractWellKnownProviderTest.java | 2 +- .../testsuite/oidc/AcrAuthFlowTest.java | 2 +- .../AuthenticationMethodReferenceTest.java | 2 +- .../oidc/OIDCAdvancedRequestParamsTest.java | 12 +-- .../oidc/OIDCBackwardsCompatibilityTest.java | 2 +- .../testsuite/oidc/OIDCPublicClientTest.java | 2 +- .../testsuite/oidc/OIDCScopeTest.java | 10 +-- .../flows/OIDCBasicResponseTypeCodeTest.java | 2 +- .../flows/OIDCBasicResponseTypeNoneTest.java | 2 +- ...ponseTypeCodeIDTokenAsDetachedSigTest.java | 2 +- ...TypeCodeIDTokenAsDetachedSigTokenTest.java | 2 +- ...OIDCHybridResponseTypeCodeIDTokenTest.java | 2 +- ...ybridResponseTypeCodeIDTokenTokenTest.java | 2 +- .../OIDCHybridResponseTypeCodeTokenTest.java | 2 +- .../OIDCImplicitResponseTypeIDTokenTest.java | 2 +- ...CImplicitResponseTypeIDTokenTokenTest.java | 2 +- .../admin/AbstractOrganizationTest.java | 2 +- .../admin/OrganizationInvitationLinkTest.java | 2 +- .../admin/OrganizationThemeTest.java | 2 +- .../OrganizationAuthenticationTest.java | 18 ++--- .../AbstractBrokerSelfRegistrationTest.java | 16 ++-- .../OrganizationPostBrokerLoginTest.java | 4 +- .../OrganizationGroupOidcIdpMapperTest.java | 2 +- .../OrganizationOIDCProtocolMapperTest.java | 4 +- .../member/OrganizationMemberTest.java | 2 +- .../sessionlimits/UserSessionLimitsTest.java | 4 +- .../testsuite/util/TestAppHelper.java | 2 +- 109 files changed, 332 insertions(+), 347 deletions(-) diff --git a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/OAuthClientConfig.java b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/OAuthClientConfig.java index dd36983042a3..cdc9b298acf3 100644 --- a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/OAuthClientConfig.java +++ b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/OAuthClientConfig.java @@ -41,11 +41,6 @@ public String getClientSecret() { return clientSecret; } - public OAuthClientConfig clientId(String clientId) { - this.clientId = clientId; - return this; - } - public OAuthClientConfig client(String clientId) { this.clientId = clientId; this.clientSecret = null; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/oauth/OAuthClient.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/oauth/OAuthClient.java index 6eec89dff029..da1b678d0397 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/oauth/OAuthClient.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/oauth/OAuthClient.java @@ -88,16 +88,6 @@ public void fillLoginForm(String username, String password) { loginPage.login(username, password); } - /** - * @deprecated This method is deprecated, use {@link OAuthClient#client(String)} for public clients, - * or {@link OAuthClient#client(String, String)} for confidential clients - */ - @Deprecated - public OAuthClient clientId(String clientId) { - config.clientId(clientId); - return this; - } - public WebDriver getDriver() { return driver; } 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 98d2ad836cf4..b190b44e744a 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 @@ -1475,7 +1475,7 @@ public void listApplicationsThirdParty(String clientScopeName, boolean expectCon @Test public void listApplicationsWithRootUrl() throws Exception { - oauth.clientId("root-url-client"); + oauth.client("root-url-client", "password"); AccessTokenResponse tokenResponse = oauth.doPasswordGrantRequest("view-applications-access", "password"); assertNull(tokenResponse.getErrorDescription()); @@ -1973,7 +1973,7 @@ public void testInvalidApiVersion() throws IOException { @Test public void testAudience() throws Exception { - oauth.clientId("custom-audience"); + oauth.client("custom-audience", "password"); AccessTokenResponse tokenResponse = oauth.doPasswordGrantRequest("test-user@localhost", "password"); assertNull(tokenResponse.getErrorDescription()); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/SessionRestServiceTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/SessionRestServiceTest.java index b429f452a21e..f59928c6b292 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/SessionRestServiceTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/SessionRestServiceTest.java @@ -442,7 +442,7 @@ private AccessTokenResponse codeGrant(String clientId) { } private void joinSsoSession(String clientId) { - oauth.clientId(clientId); + oauth.client(clientId); oauth.redirectUri(OAuthClient.APP_ROOT + "/auth"); oauth.openLoginForm(); } 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 a5fb73f1ab69..d16fdac22ec6 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 @@ -456,7 +456,7 @@ public void testAttributeRequiredForScope() { + "{\"name\": \"department\"," + PERMISSIONS_ALL + ", \"required\":{\"scopes\":[\"" + SCOPE_DEPARTMENT + "\"]}}" + "]}"); - oauth.scope(SCOPE_DEPARTMENT).clientId(client_scope_optional.getClientId()).openLoginForm(); + oauth.scope(SCOPE_DEPARTMENT).client(client_scope_optional.getClientId()).openLoginForm(); loginPage.assertCurrent(); loginPage.login(USERNAME1, PASSWORD); @@ -496,7 +496,7 @@ public void testAttributeRequiredForDefaultScope() { + "{\"name\": \"department\"," + PERMISSIONS_ALL + ", \"required\":{\"scopes\":[\"" + SCOPE_DEPARTMENT + "\"]}}" + "]}"); - oauth.clientId(client_scope_default.getClientId()).openLoginForm(); + oauth.client(client_scope_default.getClientId()).openLoginForm(); loginPage.assertCurrent(); loginPage.login(USERNAME1, PASSWORD); @@ -530,7 +530,7 @@ public void testAttributeRequiredAndSelectedByScope() { + "{\"name\": \"department\"," + PERMISSIONS_ALL + ", \"required\":{}, \"selector\":{\"scopes\":[\"" + SCOPE_DEPARTMENT + "\"]}}" + "]}"); - oauth.scope(SCOPE_DEPARTMENT).clientId(client_scope_optional.getClientId()).openLoginForm(); + oauth.scope(SCOPE_DEPARTMENT).client(client_scope_optional.getClientId()).openLoginForm(); loginPage.assertCurrent(); loginPage.login(USERNAME1, PASSWORD); @@ -564,7 +564,7 @@ public void testAttributeNotRequiredAndSelectedByScopeCanBeUpdated() { + "{\"name\": \"department\"," + PERMISSIONS_ALL + ", \"selector\":{\"scopes\":[\"" + SCOPE_DEPARTMENT + "\"]}}" + "]}"); - oauth.scope(SCOPE_DEPARTMENT).clientId(client_scope_optional.getClientId()).openLoginForm(); + oauth.scope(SCOPE_DEPARTMENT).client(client_scope_optional.getClientId()).openLoginForm(); loginPage.assertCurrent(); loginPage.login(USERNAME1, PASSWORD); @@ -593,7 +593,7 @@ public void testAttributeRequiredButNotSelectedByScopeIsNotRendered() { + "{\"name\": \"department\"," + PERMISSIONS_ALL + ", \"required\":{}, \"selector\":{\"scopes\":[\"" + SCOPE_DEPARTMENT + "\"]}}" + "]}"); - oauth.clientId(client_scope_optional.getClientId()).openLoginForm(); + oauth.client(client_scope_optional.getClientId()).openLoginForm(); loginPage.assertCurrent(); loginPage.login(USERNAME1, PASSWORD); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/EntitlementAPITest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/EntitlementAPITest.java index dd6a5a577724..35086bd78c8f 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/EntitlementAPITest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/EntitlementAPITest.java @@ -241,7 +241,7 @@ public void testInvalidRequestWithClaimsFromConfidentialClient() throws IOExcept @Test public void testInvalidRequestWithClaimsFromPublicClient() throws IOException { oauth.realm("authz-test"); - oauth.clientId(PUBLIC_TEST_CLIENT); + oauth.client(PUBLIC_TEST_CLIENT); oauth.doLogin("marta", "password"); @@ -268,7 +268,7 @@ public void testInvalidRequestWithClaimsFromPublicClient() throws IOException { @Test public void testRequestWithoutClaimsFromPublicClient() { oauth.realm("authz-test"); - oauth.clientId(PUBLIC_TEST_CLIENT); + oauth.client(PUBLIC_TEST_CLIENT); oauth.doLogin("marta", "password"); @@ -2006,7 +2006,7 @@ public void testProcessMappersForTargetAudience() throws Exception { authorization.permissions().resource().create(permission).close(); oauth.realm("authz-test"); - oauth.clientId(PUBLIC_TEST_CLIENT); + oauth.client(PUBLIC_TEST_CLIENT); oauth.doLogin("marta", "password"); // Token request @@ -2074,7 +2074,7 @@ public void testIntrospectRPTCreatedFromOfflineTokenDifferentClient() throws Exc oauth.realm("authz-test"); oauth.scope(OAuth2Constants.OFFLINE_ACCESS); - oauth.clientId(PUBLIC_TEST_CLIENT); + oauth.client(PUBLIC_TEST_CLIENT); oauth.doLogin("offlineuser", "password"); // Token request @@ -2121,7 +2121,7 @@ public void testRefreshTokenFromClientOtherThanAudience() throws Exception { @Test public void testTokenExpirationRenewalWhenIssuingTokens() { oauth.realm("authz-test"); - oauth.clientId(PUBLIC_TEST_CLIENT); + oauth.client(PUBLIC_TEST_CLIENT); oauth.doLogin("marta", "password"); String code = oauth.parseLoginResponse().getCode(); org.keycloak.testsuite.util.oauth.AccessTokenResponse accessTokenResponse = oauth.doAccessTokenRequest(code); 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 ec47d5d45c89..811d805b286d 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 @@ -178,7 +178,7 @@ public void loginWithExistingUserWithBruteForceEnabled() { logoutFromConsumerRealm(); AccountHelper.logout(adminClient.realm(bc.providerRealmName()), bc.getUserLogin()); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); try { @@ -233,7 +233,7 @@ public void loginWithExistingUserWithErrorFromProviderIdP() { .get(client.getId()) .update(ClientBuilder.edit(client).consentRequired(true).build()); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -273,7 +273,7 @@ public void testDisabledUser() { user.update(userRep); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -387,7 +387,7 @@ public void differentMappersCanHaveDifferentSyncModes() { userResource.roles().realmLevel().add(Arrays.asList(userRole, friendlyManagerRole)); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInAsUserInIDP(); @@ -405,7 +405,7 @@ public void differentMappersCanHaveDifferentSyncModes() { // KEYCLOAK-4016 @Test public void testExpiredCode() { - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); log.debug("Expire all browser cookies"); @@ -430,7 +430,7 @@ public void testPostBrokerLoginFlowWithOTP() { updateExecutions(AbstractBrokerTest::disableUpdateProfileOnFirstLogin); testingClient.server(bc.consumerRealmName()).run(configurePostBrokerLoginWithOTP(bc.getIDPAlias())); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -446,7 +446,7 @@ public void testPostBrokerLoginFlowWithOTP() { setOtpTimeOffset(TimeBasedOTP.DEFAULT_INTERVAL_SECONDS, totp); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -459,7 +459,7 @@ public void testPostBrokerLoginFlowWithOTP() { testingClient.server(bc.consumerRealmName()).run(disablePostBrokerLoginFlow(bc.getIDPAlias())); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -481,7 +481,7 @@ public void testLogoutWorksWithTokenTimeout() { adminClient.realm(bc.consumerRealmName()).identityProviders().get(bc.getIDPAlias()).update(idp); Time.setOffset(10); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -491,7 +491,7 @@ public void testLogoutWorksWithTokenTimeout() { logoutFromConsumerRealm(); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); waitForPage(driver, "sign in to", true); @@ -519,7 +519,7 @@ public void testWithLinkedFederationProvider() { createUser(bc.providerRealmName(), "test-user", "password", "FirstName", "LastName", "test-user@localhost.com"); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); loginPage.clickSocial(bc.getIDPAlias()); @@ -537,7 +537,7 @@ public void testWithLinkedFederationProvider() { createUser(bc.providerRealmName(), "test-user-noemail", "password", "FirstName", "LastName", "test-user-noemail@localhost.com"); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); loginPage.clickSocial(bc.getIDPAlias()); @@ -557,7 +557,7 @@ public void testDisabledBroker() { logoutFromConsumerRealm(); AccountHelper.logout(adminClient.realm(bc.providerRealmName()), bc.getUserLogin()); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); RealmResource realm = adminClient.realm(bc.consumerRealmName()); 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 dda4ebeab8d3..81e1ac296b23 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 @@ -228,14 +228,14 @@ protected void logInAsUserInIDP() { } protected void logInAsUserInIDP(String clientId) { - oauth.clientId(clientId); + oauth.client(clientId); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); } // We are re-authenticating to the IDP. Hence it is assumed that "username" field is not visible on the login form on the IDP side protected void logInAsUserInIDPWithReAuthenticate() { - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); waitForPage(driver, "sign in to", true); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractBrokerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractBrokerTest.java index 9599c09eb6e1..1c1f4541328d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractBrokerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractBrokerTest.java @@ -150,7 +150,7 @@ public void loginWithExistingUser() { Integer userCount = adminClient.realm(bc.consumerRealmName()).users().count(); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); if (isUsingTransientSessions()) { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractDefaultIdpTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractDefaultIdpTest.java index 0f422ea3d0ee..53c2cc6f5685 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractDefaultIdpTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractDefaultIdpTest.java @@ -67,7 +67,7 @@ public void testDefaultIdpNotSet() { configureFlow(null); // Navigate to the auth page - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); waitForPage(driver, "sign in to", true); @@ -85,7 +85,7 @@ public void testDefaultIdpSet() { createUser(bc.providerRealmName(), username, "password", "FirstName"); // Navigate to the auth page - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.providerRealmName()); waitForPage(driver, "sign in to", true); @@ -103,7 +103,7 @@ protected void testDefaultIdpSetTriedAndReturnedError(String expectedErrorMessag createUser(bc.providerRealmName(), username, "password", "FirstName"); // Navigate to the auth page - oauth.clientId("broker-app"); + oauth.client("broker-app"); oauth.realm(bc.consumerRealmName()); oauth.openLoginForm(); 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 c1124476e1e9..18a908645b4d 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 @@ -89,7 +89,7 @@ public abstract class AbstractFirstBrokerLoginTest extends AbstractInitializedBa public void testErrorExistingUserWithUpdateProfile() { createUser("consumer"); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -115,7 +115,7 @@ public void testLinkAccountByReauthenticationWithPassword() { updateExecutions(AbstractBrokerTest::disableUpdateProfileOnFirstLogin); String existingUser = createUser("consumer"); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -154,7 +154,7 @@ public void testLinkAccountByReauthenticationWithUsernameAndPassword() { String existingUser = createUser("consumer"); String anotherUser = createUser("foobar", "foo@bar.baz"); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -194,7 +194,7 @@ public void testLinkAccountByReauthenticationNoExistingUser() { updateExecutions(AbstractBrokerTest::disableExistingUser); String existingUser = createUser("consumer"); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -228,7 +228,7 @@ public void testLinkAccountByReauthenticationWithWrongPassword() { try { String existingUser = createUser("consumer"); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -272,7 +272,7 @@ public void testLinkAccountByReauthenticationResetPassword() { updateExecutions(AbstractBrokerTest::disableUpdateProfileOnFirstLogin); String existingUser = createUser("consumer"); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -310,7 +310,7 @@ public void testLinkAccountByReauthenticationResetPasswordNoExistingUser() { updateExecutions(AbstractBrokerTest::disableExistingUser); String existingUser = createUser("consumer"); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -350,7 +350,7 @@ public void testLinkAccountByLogInAsUserUsingBrowserButtons() { providerUser.update(userResource); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); log.debug("Clicking social " + bc.getIDPAlias()); @@ -424,7 +424,7 @@ public void testUpdateEmailReviewProfileLinkingAccount() { providerUser.update(userResource); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); log.debug("Clicking social " + bc.getIDPAlias()); @@ -478,7 +478,7 @@ public void testLinkAccountByLogInAsUserAfterResettingPassword() throws Interrup providerUser.update(userResource); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -530,7 +530,7 @@ public void testResetPasswordDuringFirstBrokerFlowWithoutExistingUserAuthenticat updateExecutions(AbstractBrokerTest::disableExistingUser); String existingUser = createUser("consumer"); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -594,7 +594,7 @@ public void testLinkAccountByLogInAsUserAfterResettingPasswordUsingDifferentBrow providerUser.update(userResource); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -655,7 +655,7 @@ public void testUserExistsFirstBrokerLoginFlowUpdateProfileOff() { updateExecutions(AbstractBrokerTest::disableUpdateProfileOnFirstLogin); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -674,7 +674,7 @@ public void testUserExistsFirstBrokerLoginFlowUpdateProfileOn() { updateExecutions(AbstractBrokerTest::enableUpdateProfileOnFirstLogin); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -698,7 +698,7 @@ public void testUserExistsFirstBrokerLoginFlowUpdateProfileOn() { public void testRequiredUpdatedPassword() { updateExecutions(AbstractBrokerTest::enableRequirePassword); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -730,7 +730,7 @@ public void testFixDuplicationsByReviewProfile() { consumerUser.setEmail(bc.getUserEmail()); userResource.update(consumerUser); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -789,7 +789,7 @@ public void testHardcodedUserSessionNoteIsSetAfterFirstBrokerLogin() { Response response = idpResource.addMapper(hardCodedSessionNoteMapper); response.close(); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -815,7 +815,7 @@ public void testRequiredRegistrationEmailAsUserName() { realmRep.setRegistrationEmailAsUsername(true); realm.update(realmRep); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -848,7 +848,7 @@ public void testLinkAccountWithEmailVerified() { String linkedUserId = createUser("consumer"); //test - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -893,7 +893,7 @@ public void testLinkAccountModifyingEmailLinkingByEmailNotAllowed() { final String linkedUserId = createUser(bc.getUserLogin()); //test - oauth.config().clientId("broker-app"); + oauth.config().client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -937,7 +937,7 @@ public void testLinkAccountReviewDisabled() throws Exception { final String linkedUserId = createUser(bc.getUserLogin()); //test - oauth.config().clientId("broker-app"); + oauth.config().client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -978,7 +978,7 @@ public void testLinkAccountWithUntrustedEmailVerified() { configureSMTPServer(); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -1011,7 +1011,7 @@ public void testSuccessfulAuthenticationWithoutUpdateProfile_emailNotProvided_em updateExecutions(AbstractBrokerTest::disableUpdateProfileOnFirstLogin); createUser(bc.providerRealmName(), "no-email", "password", "FirstName", "LastName", null); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); log.debug("Clicking social " + bc.getIDPAlias()); @@ -1046,7 +1046,7 @@ public void testVerifyEmailNotRequiredActionWhenEmailIsTrustedByProvider() { identityProviderResource.update(idpRep); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -1082,7 +1082,7 @@ public void testVerifyEmailRequiredActionWhenChangingEmailDuringFirstLogin() { configureSMTPServer(); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -1119,7 +1119,7 @@ public void testLinkAccountByEmailVerificationTwice() { userResource.update(consumerUser); configureSMTPServer(); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -1164,7 +1164,7 @@ public void testLinkAccountByEmailVerificationInAnotherBrowser() { userResource.update(consumerUser); configureSMTPServer(); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -1214,7 +1214,7 @@ public void testLinkAccountByEmailVerificationToEmailVerifiedUser() { configureSMTPServer(); // begin login with idp - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -1253,7 +1253,7 @@ public void testLinkAccountByEmailVerificationResendEmail() { userResource.update(consumerUser); configureSMTPServer(); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -1329,7 +1329,7 @@ public void testEventsOnUpdateProfileNoEmailChange() { createUser(bc.providerRealmName(), "no-first-name", "password", null, "LastName", "no-first-name@localhost.com"); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); log.debug("Clicking social " + bc.getIDPAlias()); @@ -1383,7 +1383,7 @@ public void testEventsOnUpdateProfileWithEmailChange() { createUser(bc.providerRealmName(), "no-first-name", "password", null, "LastName", "no-first-name@localhost.com"); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); log.debug("Clicking social " + bc.getIDPAlias()); @@ -1458,7 +1458,7 @@ public void testUpdateProfileIfMissingInformation() { createUser(bc.providerRealmName(), "no-first-name", "password", null, "LastName", "no-first-name@localhost.com"); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); log.debug("Clicking social " + bc.getIDPAlias()); @@ -1484,7 +1484,7 @@ public void testUpdateProfileIfMissingInformation() { AccountHelper.logout(adminClient.realm(bc.consumerRealmName()), "no-first-name"); createUser(bc.providerRealmName(), "no-last-name", "password", "FirstName", null, "no-last-name@localhost.com"); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); log.debug("Clicking social " + bc.getIDPAlias()); @@ -1510,7 +1510,7 @@ public void testUpdateProfileIfMissingInformation() { createUser(bc.providerRealmName(), "no-email", "password", "FirstName", "LastName", null); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); log.debug("Clicking social " + bc.getIDPAlias()); @@ -1540,7 +1540,7 @@ public void testUpdateProfileIfNotMissingInformation() { updateExecutions(AbstractBrokerTest::setUpMissingUpdateProfileOnFirstLogin); createUser(bc.providerRealmName(), "all-info-set", "password", "FirstName", "LastName", "all-info-set@localhost.com"); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); log.debug("Clicking social " + bc.getIDPAlias()); @@ -1566,7 +1566,7 @@ public void testUpdateProfileIfNotMissingInformation() { public void testWithoutUpdateProfile() { updateExecutions(AbstractBrokerTest::disableUpdateProfileOnFirstLogin); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -1587,7 +1587,7 @@ public void testWithoutUpdateProfile() { public void testAutoLinkAccountWithBroker() { testingClient.server(bc.consumerRealmName()).run(configureAutoLinkFlow(bc.getIDPAlias())); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractNestedBrokerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractNestedBrokerTest.java index 5ef6a3cc25d6..339400441585 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractNestedBrokerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractNestedBrokerTest.java @@ -29,7 +29,7 @@ public void removeSubConsumerRealm() { /** Logs in subconsumer realm via consumer IDP via provider IDP and updates account information */ protected void logInAsUserInNestedIDPForFirstTime() { String redirectUri = getAuthServerRoot() + "realms/" + nbc.subConsumerRealmName() + "/account"; - oauth.clientId("account").redirectUri(redirectUri); + oauth.client("account").redirectUri(redirectUri); loginPage.open(nbc.subConsumerRealmName()); waitForPage(driver, "sign in to", true); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractSamlLoginHintTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractSamlLoginHintTest.java index 97f04fa6733c..c17373a1cbd5 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractSamlLoginHintTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractSamlLoginHintTest.java @@ -22,7 +22,7 @@ public void testPassLoginHintShouldSendSubjectAndPrefillUsername() { String username = "all-info-set@localhost.com"; createUser(bc.providerRealmName(), username, "password"); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); log.debug("Clicking social " + bc.getIDPAlias()); @@ -46,7 +46,7 @@ public void testPassEmptyLoginHintShouldNotSendSubjectAndShouldNotPrefillUsernam String username = "all-info-set@localhost.com"; createUser(bc.providerRealmName(), username, "password", "FirstName"); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); log.debug("Clicking social " + bc.getIDPAlias()); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcCustomOidcBrokerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcCustomOidcBrokerTest.java index e50d1ec2d4d9..2d196a1cd42b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcCustomOidcBrokerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcCustomOidcBrokerTest.java @@ -52,7 +52,7 @@ public IdentityProviderRepresentation setUpIdentityProvider(IdentityProviderSync @Test public void testCustomDisplayIcon() { - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); assertThat(driver.getPageSource(), containsString("my-custom-idp-icon")); } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerAcrParameterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerAcrParameterTest.java index 7c2f360f7d11..28161c50b7d2 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerAcrParameterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerAcrParameterTest.java @@ -20,7 +20,7 @@ protected BrokerConfiguration getBrokerConfiguration() { @Override protected void loginUser() { - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); driver.navigate().to(driver.getCurrentUrl() + "&" + ACR_VALUES + "=" + ACR_3); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerEventTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerEventTest.java index bc0a802bb3b6..2ffce85b5069 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerEventTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerEventTest.java @@ -152,7 +152,7 @@ private void doALoginError(RealmResource consumerRealm) { events.clear(); // navigate to the account url of the consumer realm - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); // Do a wrong login with a user that does not exist @@ -176,7 +176,7 @@ protected void loginUser() { RealmResource consumerRealm = adminClient.realm(bc.consumerRealmName()); UserRepresentation providerUser = providerRealm.users().search(bc.getUserLogin()).iterator().next(); events.clear(); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); super.loginUser(); @@ -233,7 +233,7 @@ public void loginWithExistingUser() { Integer userCount = adminClient.realm(bc.consumerRealmName()).users().count(); // now do the second login - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerFrontendUrlTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerFrontendUrlTest.java index 7df514670691..44e53170009c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerFrontendUrlTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerFrontendUrlTest.java @@ -63,7 +63,7 @@ public void testLogInAsUserInIDP() { updateExecutions(AbstractBrokerTest::disableUpdateProfileOnFirstLogin); createUser(bc.consumerRealmName(), "consumer", "password", "FirstName", "LastName", "consumer@localhost.com"); - oauth.clientId("broker-app"); + oauth.client("broker-app"); oauth.realm(bc.consumerRealmName()); oauth.baseUrl(proxy.getUrl()); oauth.openLoginForm(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerHiddenIdpHintTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerHiddenIdpHintTest.java index e46bb0250f6a..ef539a871f51 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerHiddenIdpHintTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerHiddenIdpHintTest.java @@ -57,7 +57,7 @@ public IdentityProviderRepresentation setUpIdentityProvider(IdentityProviderSync @Test public void testSuccessfulRedirectToProviderHiddenOnLoginPage() { - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); waitForPage(driver, "sign in to", true); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerIdpHintTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerIdpHintTest.java index 7959ac124e6f..10bb16927389 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerIdpHintTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerIdpHintTest.java @@ -41,7 +41,7 @@ protected BrokerConfiguration getBrokerConfiguration() { @Test public void testSuccessfulRedirect() { - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); waitForPage(driver, "sign in to", true); String url = driver.getCurrentUrl() + "&kc_idp_hint=" + bc.getIDPAlias(); @@ -60,7 +60,7 @@ public void testSuccessfulRedirect() { // KEYCLOAK-5260 @Test public void testSuccessfulRedirectToProviderAfterLoginPageShown() { - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); waitForPage(driver, "sign in to", true); @@ -77,7 +77,7 @@ public void testSuccessfulRedirectToProviderAfterLoginPageShown() { driver.getCurrentUrl().contains("/auth/realms/" + bc.providerRealmName() + "/")); // redirect shouldn't happen - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); waitForPage(driver, "sign in to", true); @@ -87,7 +87,7 @@ public void testSuccessfulRedirectToProviderAfterLoginPageShown() { @Test public void testInvalidIdentityProviderHint() { - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); waitForPage(driver, "sign in to", true); String url = driver.getCurrentUrl() + "&kc_idp_hint=bogus-idp"; @@ -109,7 +109,7 @@ public void testIdpHintWithErrorResponseReturnsToLoginPage() { providerRealm.clients().get(brokerClient.getId()).update(brokerClient); try { - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); waitForPage(driver, "sign in to", true); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerIdpLinkActionTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerIdpLinkActionTest.java index 429f8ba23764..1ce99fd73d16 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerIdpLinkActionTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerIdpLinkActionTest.java @@ -443,7 +443,7 @@ public void testConsumerReauthentication() throws Exception { private String loginToConsumer() { // Login to "consumer" realm with password - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); loginPage.login("user1", "password"); appPage.assertCurrent(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerLdapReadOnlyTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerLdapReadOnlyTest.java index a5eef6750805..5694f0201013 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerLdapReadOnlyTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerLdapReadOnlyTest.java @@ -69,7 +69,7 @@ public void testDoNotUpdateEmail() { userProfile.update(upConfig); // federate user and link account - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); updateAccountInformationPage.updateAccountInformation(bc.getUserLogin(), bc.getUserEmail(), "f", "l"); @@ -85,7 +85,7 @@ public void testDoNotUpdateEmail() { // logout user on the consumer realm and login again user = adminClient.realm(bc.consumerRealmName()).users().search(bc.getUserLogin()).get(0); adminClient.realm(bc.consumerRealmName()).users().get(user.getId()).logout(); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); appPage.assertCurrent(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerLdapTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerLdapTest.java index c119b71a5575..1b2c94ab102d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerLdapTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerLdapTest.java @@ -57,7 +57,7 @@ public void onBefore() { @Test public void testUpdateProfileOnFirstLogin() { updateExecutions(AbstractBrokerTest::enableUpdateProfileOnFirstLogin); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); updateAccountInformationPage.updateAccountInformation(bc.getUserLogin(), bc.getUserEmail(), "f", "l"); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerLoginHintTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerLoginHintTest.java index dee6117322f5..7fa7a4e8efeb 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerLoginHintTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerLoginHintTest.java @@ -46,7 +46,7 @@ public IdentityProviderRepresentation setUpIdentityProvider(IdentityProviderSync @Override protected void loginUser() { - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); driver.navigate().to(driver.getCurrentUrl() + "&login_hint=" + USER_EMAIL); @@ -103,7 +103,7 @@ public void loginHintWithExistingUser() { .enabled(true) .build() )) { - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); waitForPageToLoad(); driver.navigate().to(driver.getCurrentUrl() + "&login_hint=" + USER_EMAIL + "&kc_idp_hint=" + IDP_OIDC_ALIAS); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerLogoutFrontChannelTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerLogoutFrontChannelTest.java index 794529c307c5..5b33cc57fc37 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerLogoutFrontChannelTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerLogoutFrontChannelTest.java @@ -75,7 +75,7 @@ public void logoutAfterIdpTokenExpired() throws VerificationException { "broker-app", getConsumerRoot() + "/auth/realms/" + REALM_CONS_NAME + "/app"); - oauth.clientId("account"); + oauth.client("account"); oauth.redirectUri(getConsumerRoot() + "/auth/realms/" + REALM_PROV_NAME + "/account"); loginPage.open(REALM_PROV_NAME); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerLogoutTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerLogoutTest.java index 756b7f7a09ac..d059d13541c7 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerLogoutTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerLogoutTest.java @@ -46,7 +46,7 @@ public void logoutWithoutInitiatingIdpLogsOutOfIdp() { AccountHelper.logout(adminClient.realm(bc.consumerRealmName()), bc.getUserLogin()); AccountHelper.logout(adminClient.realm(bc.providerRealmName()), bc.getUserLogin()); - oauth.clientId("account"); + oauth.client("account"); oauth.redirectUri(getConsumerRoot() + "/auth/realms/" + REALM_PROV_NAME + "/account"); loginPage.open(REALM_PROV_NAME); @@ -61,7 +61,7 @@ public void logoutWithActualIdpAsInitiatingIdpDoesNotLogOutOfIdp() { AccountHelper.logout(adminClient.realm(bc.consumerRealmName()), bc.getUserLogin()); AccountHelper.logout(adminClient.realm(bc.providerRealmName()), bc.getUserLogin()); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.providerRealmName()); waitForPage(driver, "sign in to provider", true); } @@ -74,7 +74,7 @@ public void logoutWithOtherIdpAsInitiatinIdpLogsOutOfIdp() { AccountHelper.logout(adminClient.realm(bc.consumerRealmName()), bc.getUserLogin()); AccountHelper.logout(adminClient.realm(bc.providerRealmName()), bc.getUserLogin()); - oauth.clientId("account"); + oauth.client("account"); oauth.redirectUri(getConsumerRoot() + "/auth/realms/" + REALM_PROV_NAME + "/account"); loginPage.open(REALM_PROV_NAME); @@ -104,7 +104,7 @@ public void logoutAfterBrowserRestart() { AccountHelper.logout(adminClient.realm(bc.consumerRealmName()), bc.getUserLogin()); AccountHelper.logout(adminClient.realm(bc.providerRealmName()), bc.getUserLogin()); - oauth.clientId("account"); + oauth.client("account"); oauth.redirectUri(getConsumerRoot() + "/auth/realms/" + REALM_PROV_NAME + "/account"); loginPage.open(REALM_PROV_NAME); @@ -142,7 +142,7 @@ public void logoutAfterIdpTokenExpired() throws VerificationException { ); // user should be logged out successfully from the IDP even though the id_token_hint is expired - oauth.clientId("account"); + oauth.client("account"); oauth.redirectUri(getConsumerRoot() + "/auth/realms/" + REALM_PROV_NAME + "/account"); loginPage.open(REALM_PROV_NAME); @@ -177,7 +177,7 @@ public void testFrontChannelLogoutRequestsSendingOnlyClientId() { logoutConfirmPage.confirmLogout(); // confirm logout at provider logoutConfirmPage.confirmLogout(); - oauth.clientId("account"); + oauth.client("account"); oauth.redirectUri(getConsumerRoot() + "/auth/realms/" + REALM_PROV_NAME + "/account"); loginPage.open(REALM_PROV_NAME); waitForPage(driver, "sign in to provider", true); @@ -223,7 +223,7 @@ public void testFrontChannelLogoutRequestsSendingOnlyIdTokenHint() throws Verifi ); // user should be logged out successfully from the IDP - oauth.clientId(bc.getIDPClientIdInProviderRealm()); + oauth.client(bc.getIDPClientIdInProviderRealm()); oauth.redirectUri(BrokerTestTools.getConsumerRoot() + "/auth/realms/" + REALM_CONS_NAME + "/broker/" + bc.getIDPAlias() + "/endpoint/*"); loginPage.open(REALM_PROV_NAME); waitForPage(driver, "sign in to provider", true); @@ -274,7 +274,7 @@ public void testFrontChannelLogoutRequestsSendingOnlyClientIdWithFrontChannelLog Assert.assertTrue(driver.getPageSource().contains("You are logging out from following apps")); Assert.assertTrue(driver.getPageSource().contains("broker-app")); - oauth.clientId("account"); + oauth.client("account"); oauth.redirectUri(getConsumerRoot() + "/auth/realms/" + REALM_PROV_NAME + "/account"); loginPage.open(REALM_PROV_NAME); waitForPage(driver, "sign in to provider", true); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerNoLoginHintTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerNoLoginHintTest.java index 9635054abc04..ff1e97c4db0e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerNoLoginHintTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerNoLoginHintTest.java @@ -40,7 +40,7 @@ public IdentityProviderRepresentation setUpIdentityProvider(IdentityProviderSync @Override protected void loginUser() { - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); driver.navigate().to(driver.getCurrentUrl() + "&login_hint=" + USER_EMAIL); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerNonceParameterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerNonceParameterTest.java index 0a2ec1f43cbc..811c59691f6f 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerNonceParameterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerNonceParameterTest.java @@ -63,7 +63,7 @@ protected void loginUser() { updateExecutions(AbstractBrokerTest::disableUpdateProfileOnFirstLogin); oauth.realm(bc.consumerRealmName()); - oauth.clientId("consumer-client"); + oauth.client("consumer-client"); AuthorizationEndpointResponse authzResponse = doLoginSocial(oauth, bc.getIDPAlias(), bc.getUserLogin(), bc.getUserPassword(), "123456"); String code = authzResponse.getCode(); @@ -89,7 +89,7 @@ public void testNonceNotSet() { idpRes.update(idpRep); oauth.realm(bc.consumerRealmName()); - oauth.clientId("consumer-client"); + oauth.client("consumer-client"); AuthorizationEndpointResponse authzResponse = doLoginSocial(oauth, bc.getIDPAlias(), bc.getUserLogin(), bc.getUserPassword(), null); String code = authzResponse.getCode(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerParameterForwardTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerParameterForwardTest.java index cc40410014d6..cc0494efb1dd 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerParameterForwardTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerParameterForwardTest.java @@ -48,7 +48,7 @@ public IdentityProviderRepresentation setUpIdentityProvider(IdentityProviderSync @Override protected void loginUser() { - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); String claimsValue = "{\"userinfo\":{\"http://itsme.services/v2/claim/BENationalNumber\":null,\"spaced_value\":\"with space\"}}"; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPassMaxAgeTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPassMaxAgeTest.java index aee4c12d3c90..e27f73212894 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPassMaxAgeTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPassMaxAgeTest.java @@ -60,7 +60,7 @@ public void loginWithExistingUser() { loginUser(); testSingleLogout(); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); loginPage.clickSocial(bc.getIDPAlias()); @@ -102,7 +102,7 @@ public void testEnforceReAuthenticationWhenMaxAgeIsSet() { loginUser(); testSingleLogout(); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); loginPage.clickSocial(bc.getIDPAlias()); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPromptNoneRedirectTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPromptNoneRedirectTest.java index 846726f51180..fe241646427a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPromptNoneRedirectTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPromptNoneRedirectTest.java @@ -71,7 +71,7 @@ public void testSuccessfulRedirectToProviderWithPromptNone() { /* now send an auth request to the consumer realm including both the kc_idp_hint (to identify the default provider) and prompt=none. The presence of the default provider should cause the request with prompt=none to be propagated to the idp instead of resulting in a login required error because the user is not yet authenticated in the consumer realm. */ - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); waitForPage(driver, "sign in to", true); @@ -88,7 +88,7 @@ public void testSuccessfulRedirectToProviderWithPromptNone() { AccountHelper.logout(adminClient.realm(bc.consumerRealmName()), bc.getUserLogin()); AccountHelper.logout(adminClient.realm(bc.providerRealmName()), bc.getUserLogin()); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); waitForPage(driver, "sign in to", true); url = driver.getCurrentUrl() + "&prompt=none"; @@ -107,7 +107,7 @@ public void testUnauthenticatedUserReturnsLoginRequired() throws Exception { /* try sending an auth request to the consumer realm with prompt=none. As we have no user authenticated in both the consumer realm and the IDP, the IDP should return an error=login_required to the broker and the broker must in turn return the same error to the client. */ - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); waitForPage(driver, "sign in to", true); String url = driver.getCurrentUrl() + "&prompt=none&kc_idp_hint=" + bc.getIDPAlias(); @@ -210,7 +210,7 @@ protected void checkAuthWithPromptNoneReturnsInteractionRequired() { authenticateDirectlyInIDP(); /* send an auth request to the consumer realm with prompt=none and a default provider. */ - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); waitForPage(driver, "sign in to", true); @@ -223,7 +223,7 @@ protected void checkAuthWithPromptNoneReturnsInteractionRequired() { * Authenticates the broker user directly in the IDP to establish a valid authenticated session there. */ protected void authenticateDirectlyInIDP() { - oauth.clientId("account"); + oauth.client("account"); oauth.redirectUri(getAccountUrl(getProviderRoot(), bc.providerRealmName())); loginPage.open(bc.providerRealmName()); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPromptParameterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPromptParameterTest.java index 591c7998f06d..5d812148d07c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPromptParameterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPromptParameterTest.java @@ -24,7 +24,7 @@ protected BrokerConfiguration getBrokerConfiguration() { @Override protected void loginUser() { - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); driver.navigate().to(driver.getCurrentUrl() + "&" + OIDCLoginProtocol.PROMPT_PARAM + "=" + PROMPT_CONSENT); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerStateParameterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerStateParameterTest.java index 8a86738a94b3..e9f1c3d0fe6a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerStateParameterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerStateParameterTest.java @@ -113,7 +113,7 @@ public void testIncorrectStateParameter() throws Exception { @Test public void testCorrectStateParameterButIncorrectCode() { - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); waitForPage(driver, "sign in to", true); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerSubMatchIntrospectionTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerSubMatchIntrospectionTest.java index f324819fb1f0..4c47769c3475 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerSubMatchIntrospectionTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerSubMatchIntrospectionTest.java @@ -52,11 +52,11 @@ public List createProviderClients() { @Override public void testLogInAsUserInIDP() { - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); oauth.realm(bc.consumerRealmName()); - oauth.clientId("consumer-client"); + oauth.client("consumer-client"); log.debug("Clicking social " + bc.getIDPAlias()); loginPage.clickSocial(bc.getIDPAlias()); 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 acc77588950d..4157f805e184 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 @@ -147,7 +147,7 @@ public void mapperDoesNothingForLegacyMode() { UserResource userResource = adminClient.realm(bc.providerRealmName()).users().get(userId); userResource.roles().realmLevel().add(Collections.singletonList(managerRole)); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInAsUserInIDPForFirstTime(); @@ -165,7 +165,7 @@ public void mapperDoesNothingForLegacyMode() { userResource.roles().realmLevel().add(Collections.singletonList(userRole)); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInAsUserInIDP(); @@ -201,7 +201,7 @@ private void loginFetchingUserFromUserEndpoint(boolean loginIsDenied) { brokerApp.getAttributes().put("validateSignature", Boolean.TRUE.toString()); clients.get(brokerApp.getId()).update(brokerApp); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -267,7 +267,7 @@ public void loginFetchingUserFromUserEndpointWithClaimMapper() { identityProviderResource.addMapper(hardCodedSessionNoteMapper).close(); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); loginFetchingUserFromUserEndpoint(); @@ -285,7 +285,7 @@ public void testInvalidIssuedFor() { AccountHelper.logout(adminClient.realm(bc.consumerRealmName()), bc.getUserLogin()); AccountHelper.logout(adminClient.realm(bc.providerRealmName()), bc.getUserLogin()); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); log.debug("Clicking social " + bc.getIDPAlias()); @@ -309,7 +309,7 @@ public void testIdpRemovedAfterLoginInvalidatesUserSession() { AccountHelper.logout(adminClient.realm(bc.consumerRealmName()), bc.getUserLogin()); AccountHelper.logout(adminClient.realm(bc.providerRealmName()), bc.getUserLogin()); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); assertThat(loginPage.isSocialButtonPresent(bc.getIDPAlias()), is(true)); logInWithBroker(bc); @@ -348,7 +348,7 @@ public void testInvalidAudience() { AccountHelper.logout(adminClient.realm(bc.consumerRealmName()), bc.getUserLogin()); AccountHelper.logout(adminClient.realm(bc.providerRealmName()), bc.getUserLogin()); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); log.debug("Clicking social " + bc.getIDPAlias()); @@ -427,7 +427,7 @@ public void testTrustEmailBasedOnEmailVerifiedClaimSyncModeForce() { idpRep.setTrustEmail(true); idpRep.getConfig().put(IdentityProviderModel.SYNC_MODE, IdentityProviderSyncMode.FORCE.name()); identityProviderResource.update(idpRep); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); waitForPage(driver, "update account information", false); @@ -480,7 +480,7 @@ public void testVerifyEmailWhenUpdateProfileAndEmailVerifiedAtIdP() { idpRep.setTrustEmail(true); idpRep.getConfig().put(IdentityProviderModel.SYNC_MODE, IdentityProviderSyncMode.FORCE.name()); identityProviderResource.update(idpRep); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); waitForPage(driver, "update account information", false); @@ -510,7 +510,7 @@ public void testVerifyEmailWhenUpdateProfileSameEmailAndEmailVerifiedAtIdP() { idpRep.setTrustEmail(true); idpRep.getConfig().put(IdentityProviderModel.SYNC_MODE, IdentityProviderSyncMode.FORCE.name()); identityProviderResource.update(idpRep); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); waitForPage(driver, "update account information", false); @@ -540,7 +540,7 @@ public void testTrustEmailBasedOnEmailVerifiedClaimSyncModeImport() { idpRep.setTrustEmail(true); idpRep.getConfig().put(IdentityProviderModel.SYNC_MODE, IdentityProviderSyncMode.IMPORT.name()); identityProviderResource.update(idpRep); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); waitForPage(driver, "update account information", false); @@ -676,7 +676,7 @@ private void checkUpdatedUserAttributesIdP(boolean isForceSync, boolean isTrustE isForceSync ? IdentityProviderSyncMode.FORCE : IdentityProviderSyncMode.IMPORT, isTrustEmail); // login to create the user in the consumer realm - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); WaitUtils.waitForPageToLoad(); @@ -722,7 +722,7 @@ private void checkUpdatedUserAttributesIdP(boolean isForceSync, boolean isTrustE providerUserResource.update(providerUser); // login again to force sync if force mode - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); WaitUtils.waitForPageToLoad(); @@ -773,7 +773,7 @@ public void checkUpdatedEmailAttributeIdPSameValueDifferentCase() throws Excepti updateIdPSyncMode(idProvider, consumerIdentityResource, IdentityProviderSyncMode.FORCE, false); // login to create the user in the consumer realm - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); WaitUtils.waitForPageToLoad(); @@ -825,7 +825,7 @@ public void checkUpdatedEmailAttributeIdPSameValueDifferentCase() throws Excepti emailClientScope.getProtocolMappers().createMapper(hardcodedEmail).close(); // login again to force sync - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); WaitUtils.waitForPageToLoad(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerTransientSessionsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerTransientSessionsTest.java index bdb0a8feadc5..bf019fd2d206 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerTransientSessionsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerTransientSessionsTest.java @@ -477,7 +477,7 @@ private IdentityProviderResource getIdentityProviderResource() { public void testSingleSignOn() { loginWithBrokerUsingOAuthClient(CustomKcOidcBrokerConfiguration.CONSUMER_ADDITIONAL_BROKER_APP_CLIENT_ID); - oauth.clientId(CONSUMER_BROKER_APP_CLIENT_ID); + oauth.client(CONSUMER_BROKER_APP_CLIENT_ID); oauth.openLoginForm(); Assert.assertTrue("Should be logged in", driver.getTitle().endsWith("AUTH_RESPONSE")); @@ -487,7 +487,7 @@ public void testSingleSignOn() { @Test public void testConsents() throws Exception { try (var c = ClientAttributeUpdater.forClient(adminClient, bc.consumerRealmName(), CONSUMER_BROKER_APP_CLIENT_ID).setConsentRequired(true).update()) { - oauth.clientId(CONSUMER_BROKER_APP_CLIENT_ID); + oauth.client(CONSUMER_BROKER_APP_CLIENT_ID); oauth.realm(bc.consumerRealmName()); doLoginSocial(oauth, bc.getIDPAlias(), bc.getUserLogin(), bc.getUserPassword()); @@ -519,7 +519,7 @@ public void testConsents() throws Exception { assertThat("There should be one client in user session", sessions.get(0).getClients(), aMapWithSize(1)); // Try SSO relogging into the app before revoking consent. - oauth.clientId(CONSUMER_BROKER_APP_CLIENT_ID); + oauth.client(CONSUMER_BROKER_APP_CLIENT_ID); oauth.openLoginForm(); assertThat("Should be logged in", driver.getTitle(), containsString("AUTH_RESPONSE")); @@ -536,7 +536,7 @@ public void testConsents() throws Exception { assertThat("There should be no client in user session", sessions.get(0).getClients(), aMapWithSize(0)); // Try relogging into the app after consent was revoked. - oauth.clientId(CONSUMER_BROKER_APP_CLIENT_ID); + oauth.client(CONSUMER_BROKER_APP_CLIENT_ID); oauth.openLoginForm(); WaitUtils.waitForPageToLoad(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerUiLocalesDisabledTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerUiLocalesDisabledTest.java index 2863bdca507f..a99bab1115d8 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerUiLocalesDisabledTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerUiLocalesDisabledTest.java @@ -42,7 +42,7 @@ public IdentityProviderRepresentation setUpIdentityProvider(IdentityProviderSync @Override protected void loginUser() { - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); driver.navigate().to(driver.getCurrentUrl()); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerUiLocalesEnabledTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerUiLocalesEnabledTest.java index fcf8c67860f5..e44c0eeb459f 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerUiLocalesEnabledTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerUiLocalesEnabledTest.java @@ -41,7 +41,7 @@ public IdentityProviderRepresentation setUpIdentityProvider(IdentityProviderSync @Override protected void loginUser() { - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); driver.navigate().to(driver.getCurrentUrl()); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerUiLocalesWithIdpHintTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerUiLocalesWithIdpHintTest.java index d1d0b2430383..7deebafb6d73 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerUiLocalesWithIdpHintTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerUiLocalesWithIdpHintTest.java @@ -42,7 +42,7 @@ public IdentityProviderRepresentation setUpIdentityProvider(IdentityProviderSync @Override protected void loginUser() { - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); driver.navigate().to(driver.getCurrentUrl() + "&ui_locales=hu&kc_idp_hint=kc-oidc-idp"); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerWithConsentTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerWithConsentTest.java index c92e4709815c..14a82012f0c7 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerWithConsentTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerWithConsentTest.java @@ -52,7 +52,7 @@ public void beforeBrokerTest() { */ @Test public void testConsentDeniedWithExpiredClientSession() { - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); log.debug("Clicking social " + bc.getIDPAlias()); @@ -81,7 +81,7 @@ public void testConsentDeniedWithExpiredClientSession() { */ @Test public void testConsentDeniedWithExpiredAndClearedClientSession() { - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -109,7 +109,7 @@ public void testConsentDeniedWithExpiredAndClearedClientSession() { public void testLoginCancelConsent() { updateExecutions(AbstractBrokerTest::disableUpdateProfileOnFirstLogin); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcFirstBrokerLoginDetectExistingUserTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcFirstBrokerLoginDetectExistingUserTest.java index d4e961d149c3..1e0391a1e7e9 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcFirstBrokerLoginDetectExistingUserTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcFirstBrokerLoginDetectExistingUserTest.java @@ -101,7 +101,7 @@ public void loginWhenUserDoesNotExistOnConsumer() { String username = "firstandlastname"; createUser(bc.providerRealmName(), username, BrokerTestConstants.USER_PASSWORD, firstname, lastname, "firstnamelastname@example.org"); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithIdp(bc.getIDPAlias(), username, BrokerTestConstants.USER_PASSWORD); @@ -122,7 +122,7 @@ public void loginWhenUserExistsOnConsumer() { createUser(bc.providerRealmName(), username, BrokerTestConstants.USER_PASSWORD, firstname, lastname, email); createUser(bc.consumerRealmName(), username, "THIS PASSWORD IS USELESS", null, null, email); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithIdp(bc.getIDPAlias(), username, BrokerTestConstants.USER_PASSWORD); 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 0a2d91286b09..18e123883105 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 @@ -201,7 +201,7 @@ private String addTOTPToUser(String username) { user.update(userRep); // Login. TOTP will be required at login time. - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); loginPage.login(username, "password"); @@ -219,7 +219,7 @@ private String addTOTPToUser(String username) { // Login with broker and click "Link account" private void loginWithBrokerAndConfirmLinkAccount() { - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); 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 741c83ff166b..00d537f84717 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 @@ -102,7 +102,7 @@ public void testRefreshTokenSentOnlyOnFirstLogin() throws Exception { // create a test user in the provider realm. createUser(bc.providerRealmName(), "brucewayne", BrokerTestConstants.USER_PASSWORD, "Bruce", "Wayne", "brucewayne@gotham.com"); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithIdp(bc.getIDPAlias(), "brucewayne", BrokerTestConstants.USER_PASSWORD); @@ -159,7 +159,7 @@ public void loginWithFirstnameLastnamePopulatedFromClaims() { String username = "firstandlastname"; createUser(bc.providerRealmName(), username, BrokerTestConstants.USER_PASSWORD, firstname, lastname, "firstnamelastname@example.org"); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithIdp(bc.getIDPAlias(), username, BrokerTestConstants.USER_PASSWORD); @@ -187,7 +187,7 @@ public void testLinkAccountByReauthenticationWithDifferentBroker() { adminClient.realm(bc.providerRealmName()).clients().create(samlClient); consumerRealm.identityProviders().create(samlBroker); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(samlBrokerConfig); @@ -195,7 +195,7 @@ public void testLinkAccountByReauthenticationWithDifferentBroker() { AccountHelper.logout(adminClient.realm(bc.consumerRealmName()), bc.getUserLogin()); AccountHelper.logout(adminClient.realm(bc.providerRealmName()), bc.getUserLogin()); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -244,7 +244,7 @@ public void testFilterMultipleBrokerWhenReauthenticating() { consumerRealm.identityProviders().create(samlBroker); consumerRealm.identityProviders().create(oidcBroker); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(samlBrokerConfig); @@ -252,7 +252,7 @@ public void testFilterMultipleBrokerWhenReauthenticating() { AccountHelper.logout(adminClient.realm(bc.consumerRealmName()), bc.getUserLogin()); AccountHelper.logout(adminClient.realm(bc.providerRealmName()), bc.getUserLogin()); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -301,7 +301,7 @@ public void testNestedFirstBrokerFlow() { adminClient.realm(bc.providerRealmName()).clients().create(samlClient); consumerRealm.identityProviders().create(samlBroker); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); createUser(bc.getUserLogin()); @@ -347,7 +347,7 @@ public void testLoginWithDifferentBrokerWhenUpdatingProfile() { adminClient.realm(bc.providerRealmName()).clients().create(samlClient); consumerRealm.identityProviders().create(samlBroker); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(samlBrokerConfig); @@ -356,7 +356,7 @@ public void testLoginWithDifferentBrokerWhenUpdatingProfile() { AccountHelper.logout(adminClient.realm(bc.consumerRealmName()), bc.getUserLogin()); AccountHelper.logout(adminClient.realm(bc.providerRealmName()), bc.getUserLogin()); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -383,7 +383,7 @@ public void testEditUsername() { createUser(bc.providerRealmName(), "no-first-name", "password", null, "LastName", "no-first-name@localhost.com"); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); log.debug("Clicking social " + bc.getIDPAlias()); @@ -421,7 +421,7 @@ public void shouldOfferOidcOptionOnLoginPageAfterUserTriedToLogInButDecidedNotTo createUser(bc.providerRealmName(), "idp-cancel-test", "password", "IDP", "Cancel", "idp-cancel@localhost.com"); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); loginPage.clickRegister(); @@ -462,7 +462,7 @@ public void testDisplayName() { + "{\"name\": \"department\", \"displayName\" : \"Department\", " + PERMISSIONS_ALL + ", \"required\":{}}" + "]}"); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -495,7 +495,7 @@ public void testAttributeGrouping() { + "{\"name\": \"contact\" }" + "]}"); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -536,7 +536,7 @@ public void testAttributeGuiOrder() { + "{\"name\": \"email\", " + UserProfileUtil.PERMISSIONS_ALL + "}" + "]}"); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -562,7 +562,7 @@ public void testAttributeInputTypes() { + RegisterWithUserProfileTest.UP_CONFIG_PART_INPUT_TYPES + "]}"); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -584,7 +584,7 @@ public void testDynamicUserProfileReviewWhenMissing_requiredReadOnlyAttributeDoe + "{\"name\": \"department\", " + PERMISSIONS_ADMIN_EDITABLE + ", \"required\":{}}" + "]}"); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -603,7 +603,7 @@ public void testDynamicUserProfileReviewWhenMissing_requiredButNotSelectedByScop + "{\"name\": \"department\", " + PERMISSIONS_ALL + ", \"required\":{}, \"selector\":{\"scopes\":[\"department\"]}}" + "]}"); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -621,7 +621,7 @@ public void testDynamicUserProfileReviewWhenMissing_requiredAndSelectedByScopeAt + "{\"name\": \"department\", " + PERMISSIONS_ALL + ", \"required\":{}, \"selector\":{\"scopes\":[\"profile\"]}}" + "]}"); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -641,7 +641,7 @@ public void testDynamicUserProfileReview_requiredReadOnlyAttributeNotRenderedAnd + "{\"name\": \"department\", " + PERMISSIONS_ADMIN_EDITABLE + ", \"required\":{}}" + "]}"); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -665,7 +665,7 @@ public void testDynamicUserProfileReview_attributeRequiredAndSelectedByScopeMust + "{\"name\": \"department\"," + PERMISSIONS_ALL + ", \"required\":{}, \"selector\":{\"scopes\":[\"profile\"]}}" + "]}"); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -697,7 +697,7 @@ public void testDynamicUserProfileReview_attributeNotRequiredAndSelectedByScopeC + "{\"name\": \"department\"," + PERMISSIONS_ALL + ", \"selector\":{\"scopes\":[\"profile\"]}}" + "]}"); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -726,7 +726,7 @@ public void testDynamicUserProfileReview_attributeNotRequiredAndSelectedByScopeC + "{\"name\": \"department\"," + PERMISSIONS_ALL + ", \"selector\":{\"scopes\":[\"profile\"]}}" + "]}"); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -756,7 +756,7 @@ public void testDynamicUserProfileReview_attributeRequiredButNotSelectedByScopeI + "{\"name\": \"department\"," + PERMISSIONS_ALL + ", \"required\":{}, \"selector\":{\"scopes\":[\"department\"]}}" + "]}"); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -783,7 +783,7 @@ public void testFederatedIdentityCaseSensitiveOriginalUsername() { idp.update(representation); createUser(bc.providerRealmName(), expectedBrokeredUserName, BrokerTestConstants.USER_PASSWORD, "f", "l", "fl@example.org"); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); // the username is stored as lower-case in the provider realm local database logInWithIdp(bc.getIDPAlias(), expectedBrokeredUserName.toLowerCase(), BrokerTestConstants.USER_PASSWORD); @@ -809,7 +809,7 @@ public void testFederatedIdentityCaseInsensitiveOriginalUsername() { idp.update(representation); createUser(bc.providerRealmName(), expectedBrokeredUserName, BrokerTestConstants.USER_PASSWORD, "f", "l", "fl@example.org"); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); // the username is stored as lower-case in the provider realm local database logInWithIdp(bc.getIDPAlias(), expectedBrokeredUserName.toLowerCase(), BrokerTestConstants.USER_PASSWORD); @@ -854,7 +854,7 @@ public void testLinkAccountAndVerifyEmailUsingDifferentBrowser() { realm.users().create(brokerUser).close(); // link the account - oauth.clientId("broker-app"); + oauth.client("broker-app"); oauth.realm(bc.consumerRealmName()); oauth.openLoginForm(); logInWithBroker(bc); @@ -902,7 +902,7 @@ public void testSsoLoginWithCustomAttributeWithDefaultValue() { + "]}"; setUserProfileConfiguration(userProfileConfig); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcMultipleTabsBrokerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcMultipleTabsBrokerTest.java index e00a657fb9fe..5f8794e3394c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcMultipleTabsBrokerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcMultipleTabsBrokerTest.java @@ -74,7 +74,7 @@ protected BrokerConfiguration getBrokerConfiguration() { public void testAuthenticationExpiredWithMoreBrowserTabs_clickIdpLoginInTab1AfterExpiration() { assumeTrue("Since the JS engine in real browser does check the expiration regularly in all tabs, this test only works with HtmlUnit", driver instanceof HtmlUnitDriver); try (BrowserTabUtil tabUtil = BrowserTabUtil.getInstanceAndSetEnv(driver)) { - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); getLogger().infof("URL in tab 1: %s", driver.getCurrentUrl()); @@ -114,7 +114,7 @@ public void testAuthenticationExpiredWithMoreBrowserTabs_loginExpiredInBothConsu assumeTrue("Since the JS engine in real browser does check the expiration regularly in all tabs, this test only works with HtmlUnit", driver instanceof HtmlUnitDriver); try (BrowserTabUtil tabUtil = BrowserTabUtil.getInstanceAndSetEnv(driver)) { // Open login page in tab1 and click "login with IDP" - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); loginPage.clickSocial(bc.getIDPAlias()); @@ -191,7 +191,7 @@ public void testAuthenticationExpiredWithMoreBrowserTabs_loginExpiredInBothConsu try (BrowserTabUtil tabUtil = BrowserTabUtil.getInstanceAndSetEnv(driver)) { // Open login page in tab1 and click "login with IDP" - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); loginPage.clickSocial(bc.getIDPAlias()); @@ -268,7 +268,7 @@ public void testAuthenticationExpiredWithMoreBrowserTabs_loginExpiredInProvider( .update() ) { // Open login page in tab1 and click "login with IDP" - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); loginPage.clickSocial(bc.getIDPAlias()); 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 f736d291acbb..969d9490751c 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 @@ -83,7 +83,7 @@ public void testReauthenticationSamlBrokerWithOTPRequired() throws Exception { adminClient.realm(bc.providerRealmName()).clients().create(samlClient); consumerRealm.identityProviders().create(samlBroker); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); testingClient.server(bc.consumerRealmName()).run(configurePostBrokerLoginWithOTP(samlBrokerConfig.getIDPAlias())); @@ -98,7 +98,7 @@ public void testReauthenticationSamlBrokerWithOTPRequired() throws Exception { setOtpTimeOffset(DEFAULT_INTERVAL_SECONDS, totp); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -132,7 +132,7 @@ public void testReauthenticationOIDCBrokerWithOTPRequired() throws Exception { adminClient.realm(bc.providerRealmName()).clients().create(samlClient); consumerRealm.identityProviders().create(samlBroker); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(samlBrokerConfig); @@ -141,7 +141,7 @@ public void testReauthenticationOIDCBrokerWithOTPRequired() throws Exception { testingClient.server(bc.consumerRealmName()).run(configurePostBrokerLoginWithOTP(bc.getIDPAlias())); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -181,7 +181,7 @@ public void testReauthenticationBothBrokersWithOTPRequired() throws Exception { providerRealm.clients().create(samlClient); consumerRealm.identityProviders().create(samlBroker); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); testingClient.server(bc.consumerRealmName()).run(configurePostBrokerLoginWithOTP(samlBrokerConfig.getIDPAlias())); @@ -193,7 +193,7 @@ public void testReauthenticationBothBrokersWithOTPRequired() throws Exception { AccountHelper.logout(adminClient.realm(bc.providerRealmName()), bc.getUserLogin()); testingClient.server(bc.consumerRealmName()).run(configurePostBrokerLoginWithOTP(bc.getIDPAlias())); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -208,7 +208,7 @@ public void testReauthenticationBothBrokersWithOTPRequired() throws Exception { AccountHelper.logout(adminClient.realm(bc.consumerRealmName()), bc.getUserLogin()); AccountHelper.logout(adminClient.realm(bc.providerRealmName()), bc.getUserLogin()); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -232,7 +232,7 @@ public void testPostBrokerLoginFlowWithOTP() { // Setup with default client scope - OTP required configurePostBrokerLoginWithClientScopeConditionAndOTP(testingClient, bc.consumerRealmName(), bc.getIDPAlias(), OAuth2Constants.SCOPE_PROFILE, false); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerArtifactBindingTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerArtifactBindingTest.java index 2e61ab68743b..4255b3cf188d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerArtifactBindingTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerArtifactBindingTest.java @@ -156,7 +156,7 @@ private void performTest(boolean providerSignsResponse, boolean providerSignsAss private void login(boolean success) { // login using artifact binding - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerFrontendUrlTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerFrontendUrlTest.java index 6964719866db..c154fd02247e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerFrontendUrlTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerFrontendUrlTest.java @@ -125,7 +125,7 @@ public void testLogInAsUserInIDP() { updateExecutions(AbstractBrokerTest::disableUpdateProfileOnFirstLogin); createUser(bc.consumerRealmName(), "consumer", "password", "FirstName", "LastName", "consumer@localhost.com"); - oauth.clientId("broker-app"); + oauth.client("broker-app"); oauth.realm(bc.consumerRealmName()); oauth.baseUrl(proxy.getUrl()); oauth.openLoginForm(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerLoginHintWithOptionEnabledTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerLoginHintWithOptionEnabledTest.java index 116428da68f3..b340f03a93a9 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerLoginHintWithOptionEnabledTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerLoginHintWithOptionEnabledTest.java @@ -16,7 +16,7 @@ public void testPassLoginHintWithXmlCharShouldEncodeIt() { String username = "all-info-set@localhost.com"; createUser(bc.providerRealmName(), username, "password", "FirstName"); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); log.debug("Clicking social " + bc.getIDPAlias()); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerTest.java index 5a1739b6d410..841aa9982156 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerTest.java @@ -180,7 +180,7 @@ public void mapperUpdatesRolesOnEveryLogInForLegacyMode() { userResource.roles().realmLevel().add(Collections.singletonList(userRole)); userResource.roles().realmLevel().add(Collections.singletonList(friendlyManagerRole)); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInAsUserInIDP(); @@ -195,7 +195,7 @@ public void mapperUpdatesRolesOnEveryLogInForLegacyMode() { userResource.roles().realmLevel().remove(Collections.singletonList(friendlyManagerRole)); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInAsUserInIDP(); @@ -246,7 +246,7 @@ public void roleWithDots() { userResourceProv.roles().realmLevel().add(Collections.singletonList(userRole)); userResourceProv.roles().realmLevel().add(Collections.singletonList(userRoleDotGuide)); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInAsUserInIDP(); @@ -263,7 +263,7 @@ public void roleWithDots() { urp.setAttributes(new HashMap<>()); userResourceProv.update(urp); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInAsUserInIDP(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlMultipleTabsBrokerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlMultipleTabsBrokerTest.java index c89a304b2631..b1929b5d9d62 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlMultipleTabsBrokerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlMultipleTabsBrokerTest.java @@ -66,7 +66,7 @@ public void testAuthenticationExpiredWithMoreBrowserTabs_loginExpiredInBothConsu assumeTrue("Since the JS engine in real browser does check the expiration regularly in all tabs, this test only works with HtmlUnit", driver instanceof HtmlUnitDriver); try (BrowserTabUtil tabUtil = BrowserTabUtil.getInstanceAndSetEnv(driver)) { // Open login page in tab1 and click "login with IDP" - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); loginPage.clickSocial(bc.getIDPAlias()); @@ -135,7 +135,7 @@ public void testAuthenticationExpiredWithMoreBrowserTabs_loginExpiredInProvider( .update() ) { // Open login page in tab1 and click "login with IDP" - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); loginPage.clickSocial(bc.getIDPAlias()); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/OAuth2BrokerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/OAuth2BrokerTest.java index 8fddb39cb02c..bb6ac0424f75 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/OAuth2BrokerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/OAuth2BrokerTest.java @@ -65,7 +65,7 @@ public List createProviderClients() { @Test public void testLoginDefaultConfiguration() { - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -93,7 +93,7 @@ public void testFetchUserProfileClaims() { broker.getConfig().put("fullNameClaim", "name-claim"); brokerResource.update(broker); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientRegistrationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientRegistrationTest.java index 352c6e36d1d2..13c1cc4b075d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientRegistrationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientRegistrationTest.java @@ -246,7 +246,7 @@ public void registerClientUsingRevokedToken() throws Exception { reg.create(myclient); - oauth.clientId("myclient"); + oauth.client("myclient"); String bearerToken = getToken("myclient", "password", "manage-clients", "password"); assertTrue(oauth.tokenRevocationRequest(bearerToken).accessToken().send().isSuccess()); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientSecretRotationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientSecretRotationTest.java index 57285c18f863..2931f3508b0b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientSecretRotationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientSecretRotationTest.java @@ -471,7 +471,7 @@ public void authenticateWithInValidRotatedSecret() throws Exception { wrapper.getClientSecretExpirationTime()) + " | Time: " + Time.toDate(Time.currentTime())); - oauth.clientId(clientId); + oauth.client(clientId); setTimeOffset(7201); 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 a9cd0218ce55..bcde471f042a 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 @@ -246,7 +246,7 @@ private AccessTokenResponse getAccessTokenResponse(String clientId, CloseableHtt // Call protected endpoint with supplied client. try { oauth.httpClient().set(closeableHttpClient); - return oauth.clientId(clientId) + return oauth.client(clientId) .doAccessTokenRequest(code); } finally { oauth.httpClient().reset(); 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 7a92b3690b80..0aafe38a013b 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 @@ -103,7 +103,7 @@ public void setup() { String userId = AdminApiUtil.createUserWithAdminClient(adminClient.realm("test"), user); getCleanup().addUserId(userId); - oauth.clientId("test-app"); + oauth.client("test-app", "password"); } @After diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cookies/CookieTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cookies/CookieTest.java index e10f6f50034c..574313ad4fb4 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cookies/CookieTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cookies/CookieTest.java @@ -119,7 +119,7 @@ private void testCookieValue(String cookieName) throws Exception { HttpContext localContext = new BasicHttpContext(); localContext.setAttribute(HttpClientContext.COOKIE_STORE, cookieStore); - HttpGet get = new HttpGet(oauth.clientId("test-app").redirectUri(oauth.APP_AUTH_ROOT).loginForm().build()); + HttpGet get = new HttpGet(oauth.client("test-app", "password").redirectUri(oauth.APP_AUTH_ROOT).loginForm().build()); try (CloseableHttpResponse resp = hc.execute(get, localContext)) { final String pageContent = EntityUtils.toString(resp.getEntity()); @@ -157,7 +157,7 @@ public void testCookieValueLoggedOut() throws Exception { HttpContext localContext = new BasicHttpContext(); localContext.setAttribute(HttpClientContext.COOKIE_STORE, cookieStore); - HttpGet get = new HttpGet(oauth.clientId("test-app").redirectUri(oauth.APP_AUTH_ROOT).loginForm().build()); + HttpGet get = new HttpGet(oauth.client("test-app", "password").redirectUri(oauth.APP_AUTH_ROOT).loginForm().build()); try (CloseableHttpResponse resp = hc.execute(get, localContext)) { final String pageContent = EntityUtils.toString(resp.getEntity()); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/error/UncaughtErrorPageTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/error/UncaughtErrorPageTest.java index ca0ff8a752aa..d56a632efeab 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/error/UncaughtErrorPageTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/error/UncaughtErrorPageTest.java @@ -188,7 +188,7 @@ public void uncaughtErrorHeaders() throws IOException { @Test public void errorPageException() { oauth.realm("master"); - oauth.clientId("nosuch"); + oauth.client("nosuch"); oauth.openLoginForm(); assertTrue(errorPage.isCurrent()); 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 7b6220a0644b..4e133c52e7f5 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 @@ -196,7 +196,7 @@ protected AccessTokenResponse assertSuccessfulSpnegoLogin(String loginUsername, protected AccessTokenResponse assertSuccessfulSpnegoLogin(String clientId, String loginUsername, String expectedUsername, String password) throws Exception { events.clear(); - oauth.clientId(clientId); + oauth.client(clientId, "password"); Response spnegoResponse = spnegoLogin(loginUsername, password); Assert.assertEquals(302, spnegoResponse.getStatus()); 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 4e0e9a9e50bb..22a34f338d22 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 @@ -502,7 +502,7 @@ public void testUsernameAndEmailCaseInSensitiveIfImportEnabled() { @Test public void deleteFederationLink() throws Exception { // KEYCLOAK-4789: Login in client, which requires consent - oauth.clientId("third-party"); + oauth.client("third-party"); oauth.openLoginForm(); loginPage.login("johnkeycloak", "Password1"); @@ -532,7 +532,7 @@ public void deleteFederationLink() throws Exception { LDAPTestUtils.addZipCodeLDAPMapper(ctx.getRealm(), ctx.getLdapModel()); }); - oauth.clientId("test-app"); + oauth.client("test-app", "password"); loginLdap(); 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 cd2e041c7f75..126caa2b1f57 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 @@ -133,7 +133,7 @@ public void addProvidersBeforeTest() throws URISyntaxException, IOException { @Before public void clientConfiguration() { userId = findUserByUsername(adminClient.realm("test"), "test-user@localhost").getId(); - oauth.clientId("hardcoded-client"); + oauth.client("hardcoded-client"); } @Test @@ -481,7 +481,7 @@ public void offlineTokenDirectGrantFlow() throws Exception { } public void offlineTokenDirectGrantFlowNoRefresh(String clientId) throws Exception { oauth.scope(OAuth2Constants.OFFLINE_ACCESS); - oauth.clientId(clientId); + oauth.client(clientId, "password"); AccessTokenResponse tokenResponse = oauth.doPasswordGrantRequest("test-user@localhost", "password"); Assert.assertNull(tokenResponse.getErrorDescription()); AccessToken token = oauth.verifyToken(tokenResponse.getAccessToken()); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageFailureTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageFailureTest.java index 96c251500395..b0a90e6cb16c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageFailureTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageFailureTest.java @@ -252,7 +252,7 @@ private void loginSuccessAndLogout(String username, String password) { @Test public void testKeycloak5926() { - oauth.clientId("test-app"); + oauth.client("test-app", "password"); oauth.redirectUri(OAuthClient.APP_AUTH_ROOT); // make sure local copy is deleted diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AllowDenyAuthenticatorTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AllowDenyAuthenticatorTest.java index c30e2f9b2d48..1fbe0fb6bbe8 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AllowDenyAuthenticatorTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AllowDenyAuthenticatorTest.java @@ -340,7 +340,7 @@ public void testDenyAccessInDirectGrantFlow() throws Exception { configureDirectGrantFlowWithDenyAccess(flowAlias, new HashMap<>()); try { - oauth.clientId(clientId); + oauth.client(clientId, "password"); AccessTokenResponse response = oauth.doPasswordGrantRequest(user, getPassword("test-user@localhost")); assertEquals(401, response.getStatusCode()); assertEquals("Access denied", response.getError()); 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 6de7c3c24cce..23e26a50a815 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 @@ -74,7 +74,7 @@ public void setup() { expectedMessagesCount = 0; getCleanup().addUserId(userId); - oauth.clientId("test-app"); + oauth.client("test-app", "password"); } @Rule @@ -223,7 +223,7 @@ public void requiredActionsBackAndRefreshTest() throws IOException, MessagingExc // KEYCLOAK-4670 - Flow 4 @Test public void consentRefresh() { - oauth.clientId("third-party"); + oauth.client("third-party"); // Login and go through required actions oauth.openLoginForm(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/DirectGrantFlowTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/DirectGrantFlowTest.java index 87636dc9260d..6565594e8194 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/DirectGrantFlowTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/DirectGrantFlowTest.java @@ -85,7 +85,7 @@ public void testDirectGrantLoginWithOTPFormShouldFail() throws Exception { String login = "test-user@localhost"; // User should not be able to login as there was required action added to authenticationSession by OTPFormAuthenticator - oauth.clientId(clientId); + oauth.client(clientId, "password"); AccessTokenResponse response = oauth.doPasswordGrantRequest(login, "password"); assertEquals(400, response.getStatusCode()); 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 49d873794862..56d3f2d3fb51 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 @@ -201,7 +201,7 @@ public void testRunConsole() throws Exception { @Test public void testWithClientBrowserOverride() throws Exception { - oauth.clientId(TEST_APP_FLOW); + oauth.client(TEST_APP_FLOW); oauth.openLoginForm(); Assert.assertEquals("PushTheButton", driver.getTitle()); @@ -239,7 +239,7 @@ public void testNoOverrideBrowser() throws Exception { } private void testNoOverrideBrowser(String clientId) { - oauth.clientId(clientId); + oauth.client(clientId); oauth.openLoginForm(); loginPage.assertCurrent(); 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 f48a96a48970..ec61b24b0b34 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 @@ -893,7 +893,7 @@ public void loginExpiredCodeAndExpiredCookies() { @Test public void loginWithDisabledCookies() { String userId = adminClient.realm("test").users().search("test-user@localhost").get(0).getId(); - oauth.clientId("test-app"); + oauth.client("test-app", "password"); oauth.openLoginForm(); driver.manage().deleteAllCookies(); @@ -917,7 +917,7 @@ public void loginWithClientDisabledInActiveAuthenticationSession() { boolean wasEnabled = clientRepresentation.isEnabled(); try { - oauth.clientId("test-app"); + oauth.client("test-app", "password"); oauth.openLoginForm(); loginPage.assertCurrent(); @@ -942,12 +942,12 @@ public void loginWithClientDisabledInActiveAuthenticationSession() { @Test public void openLoginFormWithDifferentApplication() throws Exception { - oauth.clientId("root-url-client"); + oauth.client("root-url-client"); oauth.redirectUri(SERVER_ROOT + "/foo/bar/"); oauth.openLoginForm(); // Login form shown after redirect from app - oauth.clientId("test-app"); + oauth.client("test-app", "password"); oauth.redirectUri(OAuthClient.APP_ROOT + "/auth"); oauth.openLoginForm(); @@ -1005,7 +1005,7 @@ public void loginRememberMeExpiredIdle() throws Exception { .setRememberMe(true) .update()) { // login form shown after redirect from app - oauth.clientId("test-app"); + oauth.client("test-app", "password"); oauth.redirectUri(OAuthClient.APP_ROOT + "/auth"); oauth.openLoginForm(); @@ -1033,7 +1033,7 @@ public void loginRememberMeExpiredMaxLifespan() throws Exception { .setRememberMe(true) .update()) { // login form shown after redirect from app - oauth.clientId("test-app"); + oauth.client("test-app", "password"); oauth.redirectUri(OAuthClient.APP_ROOT + "/auth"); oauth.openLoginForm(); 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 9882f02b03de..96d3fab03c99 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 @@ -120,7 +120,7 @@ public void setup() { userId = AdminApiUtil.createUserAndResetPasswordWithAdminClient(testRealm(), user, generatePassword("login-test"), true); getCleanup().addUserId(userId); - oauth.clientId("test-app"); + oauth.client("test-app", "password"); } @Rule @@ -593,7 +593,7 @@ public void loginWithDifferentClients() throws Exception { String tab1Url = driver.getCurrentUrl(); // Go to tab2 and start login with different client "root-url-client" - oauth.clientId("root-url-client"); + oauth.client("root-url-client", "password"); oauth.redirectUri(redirectUri); oauth.openLoginForm(); loginPage.assertCurrent(); @@ -685,7 +685,7 @@ public void testEmptyBaseUrl() throws Exception { testRealm().clients().create(emptyBaseclient); getCleanup().addClientUuid(clientUuid); - oauth.clientId("empty-baseurl-client"); + oauth.client("empty-baseurl-client", "password"); oauth.openLoginForm(); loginPage.assertCurrent(); @@ -814,7 +814,7 @@ public void testRestartFailureWithDifferentClientAfterAuthSessionExpiration() { getLogger().info("URL in tab1: " + driver.getCurrentUrl()); //open tab 2 with redirect uri 2 and different client - oauth.client("root-url-client"); + oauth.client("root-url-client", "password"); oauth.redirectUri(redirectUri2); tabUtil.newTab(oauth.loginForm().build()); assertThat(tabUtil.getCountOfTabs(), Matchers.equalTo(2)); @@ -909,7 +909,7 @@ public void testInjectRedirectUriInClientDataAfterAuthSessionExpiration() throws public void testLogoutDifferentBrowserWithAuthenticationSessionStillPresent() throws Exception { try (BrowserTabUtil tabUtil = BrowserTabUtil.getInstanceAndSetEnv(driver)) { // start login with the test-app - oauth.client("test-app").openLoginForm(); + oauth.client("test-app", "password").openLoginForm(); String tab1WindowHandle = tabUtil.getActualWindowHandle(); loginPage.assertCurrent(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/RegisterWithUserProfileTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/RegisterWithUserProfileTest.java index f9e4c3f59e24..aba356368502 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/RegisterWithUserProfileTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/RegisterWithUserProfileTest.java @@ -167,7 +167,7 @@ public void testRegisterUserSuccess_lastNameRequiredForScope_requested() { + "{\"name\": \"lastName\"," + PERMISSIONS_ALL + ", \"required\":{\"scopes\":[\""+SCOPE_LAST_NAME+"\"]}}" + "]}"); - oauth.scope(SCOPE_LAST_NAME).clientId(client_scope_optional.getClientId()).openLoginForm(); + oauth.scope(SCOPE_LAST_NAME).client(client_scope_optional.getClientId()).openLoginForm(); loginPage.clickRegister(); registerPage.assertCurrent(); @@ -193,7 +193,7 @@ public void testRegisterUserSuccess_lastNameRequiredForScope_clientDefault() { + "{\"name\": \"lastName\"," + PERMISSIONS_ALL + ", \"required\":{\"scopes\":[\""+SCOPE_LAST_NAME+"\"]}}" + "]}"); - oauth.clientId(client_scope_default.getClientId()).openLoginForm(); + oauth.client(client_scope_default.getClientId()).openLoginForm(); loginPage.clickRegister(); registerPage.assertCurrent(); @@ -468,7 +468,7 @@ public void testRegisterUserSuccess_attributeRequiredAndSelectedByScopeMustBeSet + "{\"name\": \"department\"," + PERMISSIONS_ALL + ", \"required\":{}, \"selector\":{\"scopes\":[\""+SCOPE_DEPARTMENT+"\"]}}" + "]}"); - oauth.scope(SCOPE_DEPARTMENT).clientId(client_scope_optional.getClientId()).openLoginForm(); + oauth.scope(SCOPE_DEPARTMENT).client(client_scope_optional.getClientId()).openLoginForm(); loginPage.clickRegister(); registerPage.assertCurrent(); @@ -497,7 +497,7 @@ public void testRegisterUserSuccess_attributeNotRequiredAndSelectedByScopeCanBeI + "{\"name\": \"department\"," + PERMISSIONS_ALL + ", \"selector\":{\"scopes\":[\""+SCOPE_DEPARTMENT+"\"]}}" + "]}"); - oauth.scope(SCOPE_DEPARTMENT).clientId(client_scope_optional.getClientId()).openLoginForm(); + oauth.scope(SCOPE_DEPARTMENT).client(client_scope_optional.getClientId()).openLoginForm(); loginPage.clickRegister(); registerPage.assertCurrent(); @@ -523,7 +523,7 @@ public void testRegisterUserSuccess_attributeNotRequiredAndSelectedByScopeCanBeS + "{\"name\": \"department\"," + PERMISSIONS_ALL + ", \"selector\":{\"scopes\":[\""+SCOPE_DEPARTMENT+"\"]}}" + "]}"); - oauth.clientId(client_scope_default.getClientId()).openLoginForm(); + oauth.client(client_scope_default.getClientId()).openLoginForm(); loginPage.clickRegister(); registerPage.assertCurrent(); @@ -550,7 +550,7 @@ public void testRegisterUserSuccess_attributeRequiredButNotSelectedByScopeIsNotR + "{\"name\": \"department\"," + PERMISSIONS_ALL + ", \"required\":{}, \"selector\":{\"scopes\":[\""+SCOPE_DEPARTMENT+"\"]}}" + "]}"); - oauth.clientId(client_scope_optional.getClientId()).openLoginForm(); + oauth.client(client_scope_optional.getClientId()).openLoginForm(); loginPage.clickRegister(); registerPage.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 2dd0494385f8..fc707230ae83 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 @@ -802,7 +802,7 @@ public void testAttributeNotRequiredWhenMissingScope() { updateUser(user5Id, "ExistingFirst", "ExistingLast", null); - oauth.clientId(client_scope_optional.getClientId()).openLoginForm(); + oauth.client(client_scope_optional.getClientId()).openLoginForm(); loginPage.login("login-test5", getPassword("login-test5")); @@ -825,7 +825,7 @@ public void testAttributeRequiredForScope() { updateUser(user5Id, "ExistingFirst", "ExistingLast", null); - oauth.scope(SCOPE_DEPARTMENT).clientId(client_scope_optional.getClientId()).openLoginForm(); + oauth.scope(SCOPE_DEPARTMENT).client(client_scope_optional.getClientId()).openLoginForm(); loginPage.assertCurrent(); loginPage.login("login-test5", getPassword("login-test5")); @@ -854,7 +854,7 @@ public void testAttributeRequiredForDefaultScope() { updateUser(user5Id, "ExistingFirst", "ExistingLast", null); - oauth.clientId(client_scope_default.getClientId()).openLoginForm(); + oauth.client(client_scope_default.getClientId()).openLoginForm(); loginPage.assertCurrent(); loginPage.login("login-test5", getPassword("login-test5")); @@ -888,7 +888,7 @@ public void testNoActionIfValidForScope() { updateUser(user5Id, "ExistingFirst", "ExistingLast", "ExistingDepartment"); - oauth.clientId(client_scope_default.getClientId()).openLoginForm(); + oauth.client(client_scope_default.getClientId()).openLoginForm(); loginPage.assertCurrent(); loginPage.login("login-test5", getPassword("login-test5")); @@ -914,7 +914,7 @@ public void testAttributeRequiredButNotSelectedByScopeDoesntForceVerificationScr + "{\"name\": \"department\"," + PERMISSIONS_ALL + ", \"required\":{}, \"selector\":{\"scopes\":[\""+SCOPE_DEPARTMENT+"\"]}}" + "]}"); - oauth.clientId(client_scope_optional.getClientId()).openLoginForm(); + oauth.client(client_scope_optional.getClientId()).openLoginForm(); loginPage.assertCurrent(); loginPage.login("login-test5", getPassword("login-test5")); @@ -935,7 +935,7 @@ public void testAttributeRequiredAndSelectedByScope() { + "{\"name\": \"department\"," + PERMISSIONS_ALL + ", \"required\":{}, \"selector\":{\"scopes\":[\""+SCOPE_DEPARTMENT+"\"]}}" + "]}"); - oauth.scope(SCOPE_DEPARTMENT).clientId(client_scope_optional.getClientId()).openLoginForm(); + oauth.scope(SCOPE_DEPARTMENT).client(client_scope_optional.getClientId()).openLoginForm(); loginPage.assertCurrent(); loginPage.login("login-test5", getPassword("login-test5")); @@ -965,7 +965,7 @@ public void testAttributeNotRequiredAndSelectedByScopeCanBeUpdatedFromVerificati + "{\"name\": \"department\"," + PERMISSIONS_ALL + ", \"selector\":{\"scopes\":[\""+SCOPE_DEPARTMENT+"\"]}}" + "]}"); - oauth.scope(SCOPE_DEPARTMENT).clientId(client_scope_optional.getClientId()).openLoginForm(); + oauth.scope(SCOPE_DEPARTMENT).client(client_scope_optional.getClientId()).openLoginForm(); loginPage.assertCurrent(); loginPage.login("login-test5", getPassword("login-test5")); @@ -996,7 +996,7 @@ public void testAttributeRequiredButNotSelectedByScopeIsNotRenderedOnVerificatio + "{\"name\": \"department\"," + PERMISSIONS_ALL + ", \"required\":{}, \"selector\":{\"scopes\":[\""+SCOPE_DEPARTMENT+"\"]}}" + "]}"); - oauth.clientId(client_scope_optional.getClientId()).openLoginForm(); + oauth.client(client_scope_optional.getClientId()).openLoginForm(); loginPage.assertCurrent(); loginPage.login("login-test5", getPassword("login-test5")); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AbstractClientAuthSignedJWTTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AbstractClientAuthSignedJWTTest.java index 233c58c38e90..dfafa37661af 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AbstractClientAuthSignedJWTTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AbstractClientAuthSignedJWTTest.java @@ -266,7 +266,7 @@ protected String getClientSignedToken(String alg) throws Exception { PrivateKey privateKey = keyPair.getPrivate(); // test - oauth.clientId("client2"); + oauth.client("client2"); oauth.doLogin("test-user@localhost", "password"); String code = oauth.parseLoginResponse().getCode(); @@ -354,7 +354,7 @@ protected void testCodeToTokenRequestSuccess(String clientId, KeyPair keyPair, S PrivateKey privateKey = keyPair.getPrivate(); // test - oauth.realm("test").clientId(clientId); + oauth.realm("test").client(clientId); oauth.doLogin("test-user@localhost", "password"); EventRepresentation loginEvent = events.expectLogin() .client(clientId) @@ -384,7 +384,7 @@ protected void testDirectGrantRequestSuccess(String algorithm) throws Exception PrivateKey privateKey = keyPair.getPrivate(); // test - oauth.clientId("client2"); + oauth.client("client2"); AccessTokenResponse response = doGrantAccessTokenRequest("test-user@localhost", "password", createSignedRequestToken("client2", getRealmInfoUrl(), privateKey, publicKey, algorithm)); assertEquals(200, response.getStatusCode()); @@ -468,7 +468,7 @@ protected void testClientWithGeneratedKeys(String format, Integer keySize, Integ // Try to login with the new keys - oauth.clientId(client.getClientId()); + oauth.client(client.getClientId()); PrivateKey privateKey = (PrivateKey) keyStore.getKey(keyAlias, keyPassword.toCharArray()); KeyPair keyPair = new KeyPair(x509Cert.getPublicKey(), privateKey); @@ -679,7 +679,7 @@ protected void testCodeToTokenRequestFailure(String algorithm, String error, Str PrivateKey privateKey = keyPair.getPrivate(); // test - oauth.clientId("client2"); + oauth.client("client2"); oauth.doLogin("test-user@localhost", "password"); EventRepresentation loginEvent = events.expectLogin() .client("client2") @@ -713,7 +713,7 @@ protected void testDirectGrantRequestFailure(String algorithm) throws Exception setupJwksUrl(algorithm, clientRepresentation, clientResource); // test - oauth.clientId("client2"); + oauth.client("client2"); AccessTokenResponse response = doGrantAccessTokenRequest("test-user@localhost", "password", getClient2SignedJWT()); assertEquals(400, response.getStatusCode()); 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 057c633d4226..298502e0eaaf 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 @@ -51,7 +51,7 @@ public void beforeAbstractKeycloakTest() throws Exception { @Before public void clientConfiguration() { - oauth.clientId("test-app"); + oauth.client("test-app", "password"); oauth.realm("test-duplicate-emails"); } 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 d8893c9306bd..374430971736 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 @@ -44,7 +44,7 @@ public void beforeAbstractKeycloakTest() throws Exception { @Before public void clientConfiguration() { - oauth.clientId("test-app"); + oauth.client("test-app", "password"); } @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AccessTokenResponseTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AccessTokenResponseTest.java index df2d1e73c86e..8d02805a7068 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AccessTokenResponseTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AccessTokenResponseTest.java @@ -39,7 +39,7 @@ public void clientConfiguration() { * will fail and the clientID will always be "sample-public-client * @see AccessTokenTest#testAuthorizationNegotiateHeaderIgnored() */ - oauth.clientId("test-app"); + oauth.client("test-app", "password"); } @Override 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 0f5d5ad1c233..69f882eb15d9 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 @@ -247,7 +247,7 @@ public void postBackchannelLogoutWithSessionIdMultipleOpenSession() throws Excep OAuthClient oauth2 = oauth.newConfig().driver(driver2); oauth2.realm(nbc.consumerRealmName()) - .clientId(OidcBackchannelLogoutBrokerConfiguration.CONSUMER_CLIENT_ID) + .client(OidcBackchannelLogoutBrokerConfiguration.CONSUMER_CLIENT_ID) .redirectUri(getAuthServerRoot() + "realms/" + nbc.consumerRealmName() + "/app"); doLoginSocial(oauth2, nbc.getIDPAlias(), nbc.getUserLogin(), nbc.getUserPassword()); @@ -824,7 +824,7 @@ private void disableClient(String realmName, String clientUuid) { private OAuthClient loginWithSecondBrowser(String identityProviderDisplayName) { OAuthClient oauth2 = oauth.newConfig().driver(driver2); oauth2.realm(nbc.consumerRealmName()) - .clientId(OidcBackchannelLogoutBrokerConfiguration.CONSUMER_CLIENT_ID) + .client(OidcBackchannelLogoutBrokerConfiguration.CONSUMER_CLIENT_ID) .redirectUri(getAuthServerRoot() + "realms/" + nbc.consumerRealmName() + "/app"); doLoginSocial(oauth2, identityProviderDisplayName, nbc.getUserLogin(), nbc.getUserPassword()); return oauth2; 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 de36cc49ee57..40d42a99bdfe 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 @@ -156,7 +156,7 @@ public void testCodeToTokenRequestFailureWhenClientHasPrivateKeyJWT() throws Exc // Client should not be able to authenticate with "client_secret_jwt" try { - oauth.clientId("test-app"); + oauth.client("test-app", "password"); oauth.doLogin("test-user@localhost", "password"); events.expectLogin().client("test-app").assertEvent(); @@ -172,7 +172,7 @@ public void testCodeToTokenRequestFailureWhenClientHasPrivateKeyJWT() throws Exc @Test public void testInvalidIssuer() throws Exception { - oauth.clientId("test-app"); + oauth.client("test-app", "password"); oauth.doLogin("test-user@localhost", "password"); String code = oauth.parseLoginResponse().getCode(); @@ -231,7 +231,7 @@ public void testCodeToTokenRequestFailureHS512Enforced() throws Exception { OIDCAdvancedConfigWrapper.fromClientRepresentation(clientRep).setTokenEndpointAuthSigningAlg(Algorithm.HS512); clientResource.update(clientRep); - oauth.clientId(clientId); + oauth.client(clientId); oauth.doLogin("test-user@localhost", "password"); events.expectLogin().client(clientId).assertEvent(); @@ -250,7 +250,7 @@ public void testCodeToTokenRequestFailureHS512Enforced() throws Exception { } private void testCodeToTokenRequestSuccess(String algorithm) throws Exception { - oauth.clientId("test-app"); + oauth.client("test-app", "password"); oauth.doLogin("test-user@localhost", "password"); EventRepresentation loginEvent = events.expectLogin() .client("test-app") @@ -301,7 +301,7 @@ private void processAuthenticateWithAlgorithm(String algorithm, Integer secretLe assertThat(firstSecret, not(equalTo(newSecret))); assertThat(newSecret.length(), is(SecretGenerator.equivalentEntropySize(secretLength, SecretGenerator.ALPHANUM.length))); - oauth.clientId("jwt-client"); + oauth.client("jwt-client"); oauth.doLogin("test-user@localhost", "password"); events.expectLogin().client("jwt-client").assertEvent(); String code = oauth.parseLoginResponse().getCode(); @@ -313,7 +313,7 @@ private void processAuthenticateWithAlgorithm(String algorithm, Integer secretLe @Test public void testAssertionInvalidSignature() throws Exception { - oauth.clientId("test-app"); + oauth.client("test-app", "password"); oauth.doLogin("test-user@localhost", "password"); EventRepresentation loginEvent = events.expectLogin() .client("test-app") @@ -329,7 +329,7 @@ public void testAssertionInvalidSignature() throws Exception { @Test public void testAssertionWithNoneAlgorithm() throws Exception { - oauth.clientId("test-app"); + oauth.client("test-app", "password"); oauth.doLogin("test-user@localhost", "password"); EventRepresentation loginEvent = events.expectLogin() .client("test-app") @@ -350,7 +350,7 @@ public void testAssertionWithNoneAlgorithm() throws Exception { @Test public void testAssertionReuse() throws Exception { - oauth.clientId("test-app"); + oauth.client("test-app", "password"); oauth.doLogin("test-user@localhost", "password"); EventRepresentation loginEvent = events.expectLogin() .client("test-app") @@ -406,7 +406,7 @@ public void authenticateWithInvalidRotatedClientSecretPolicyIsEnable() throws Ex //force rotated secret expiration setTimeOffset(31); - oauth.clientId("jwt-client"); + oauth.client("jwt-client"); oauth.doLogin("test-user@localhost", "password"); EventRepresentation loginEvent = events.expectLogin().client("jwt-client").assertEvent(); String code = oauth.parseLoginResponse().getCode(); 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 0255fe841f79..d9d67e96188a 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 @@ -215,7 +215,7 @@ public void testCodeToTokenRequestSuccessES256Enforced() throws Exception { @Test public void testDirectGrantRequestSuccess() throws Exception { - oauth.clientId("client2"); + oauth.client("client2"); AccessTokenResponse response = doGrantAccessTokenRequest("test-user@localhost", "password", getClient2SignedJWT()); assertEquals(200, response.getStatusCode()); @@ -249,7 +249,7 @@ public void testSuccessWhenNoAlgSetInJWK() throws Exception { PrivateKey privateKey = keyPair.getPrivate(); // test - oauth.clientId("client2"); + oauth.client("client2"); AccessTokenResponse response = doGrantAccessTokenRequest("test-user@localhost", "password", createSignedRequestToken("client2", getRealmInfoUrl(), privateKey, publicKey, signingAlgorithm)); assertEquals(200, response.getStatusCode()); @@ -270,14 +270,14 @@ public void testSuccessDefaultAlgWhenNoAlgSetInJWK() throws Exception { KeyPair keyPair = setupJwksUrl(signingAlgorithm, false, false, null, clientRepresentation, clientResource); PublicKey publicKey = keyPair.getPublic(); PrivateKey privateKey = keyPair.getPrivate(); - oauth.clientId("client2"); + oauth.client("client2"); AccessTokenResponse response = doGrantAccessTokenRequest("test-user@localhost", "password", createSignedRequestToken("client2", getRealmInfoUrl(), privateKey, publicKey, signingAlgorithm)); assertEquals(200, response.getStatusCode()); // sending a JWS using another RSA based alg (PS256) should work as alg is not specified publicKey = keyPair.getPublic(); privateKey = keyPair.getPrivate(); - oauth.clientId("client2"); + oauth.client("client2"); response = doGrantAccessTokenRequest("test-user@localhost", "password", createSignedRequestToken("client2", getRealmInfoUrl(), privateKey, publicKey, Algorithm.PS256)); assertEquals(200, response.getStatusCode()); @@ -314,7 +314,7 @@ public void testSuccessWhenMultipleKeysWithSameKid() throws Exception { PrivateKey privateKey = keyPair.getPrivate(); // test - oauth.clientId("client2"); + oauth.client("client2"); JsonWebToken clientAuthJwt = createRequestToken("client2", getRealmInfoUrl()); AccessTokenResponse response = doGrantAccessTokenRequest("test-user@localhost", "password", createSignledRequestToken(privateKey, publicKey, signingAlgorithm, "my-kid", clientAuthJwt)); 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 ba9347492a5c..e643cfccfc82 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 @@ -144,7 +144,7 @@ public void oauthGrantAcceptTest() { @Test public void oauthGrantCancelTest() { - oauth.clientId(THIRD_PARTY_APP); + oauth.client(THIRD_PARTY_APP); oauth.doLogin(DEFAULT_USERNAME, DEFAULT_PASSWORD); grantPage.assertCurrent(); @@ -165,7 +165,7 @@ public void oauthGrantCancelTest() { @Test public void oauthGrantNotShownWhenAlreadyGranted() throws IOException { // Grant permissions on grant screen - oauth.clientId(THIRD_PARTY_APP); + oauth.client(THIRD_PARTY_APP, "password"); oauth.doLogin(DEFAULT_USERNAME, DEFAULT_PASSWORD); grantPage.assertCurrent(); @@ -206,7 +206,7 @@ public void oauthGrantNotShownWhenAlreadyGranted() throws IOException { @Test public void oauthGrantAddAnotherScope() throws IOException { // Grant permissions on grant screen - oauth.clientId(THIRD_PARTY_APP); + oauth.client(THIRD_PARTY_APP); oauth.doLogin(DEFAULT_USERNAME, DEFAULT_PASSWORD); // Create new clientScope and add to client @@ -278,7 +278,7 @@ public void oauthGrantScopeParamRequired() throws Exception { thirdParty.addOptionalClientScope(fooScopeId); // Assert clientScope not on grant screen when not requested - oauth.clientId(THIRD_PARTY_APP); + oauth.client(THIRD_PARTY_APP); oauth.doLogin(DEFAULT_USERNAME, DEFAULT_PASSWORD); grantPage.assertCurrent(); List grants = grantPage.getDisplayedGrants(); @@ -338,7 +338,7 @@ public void oauthGrantDynamicScopeParamRequired() throws IOException { thirdParty.addOptionalClientScope(dynamicFooScopeId); // Assert clientScope not on grant screen when not requested - oauth.clientId(THIRD_PARTY_APP); + oauth.client(THIRD_PARTY_APP, "password"); oauth.scope("foo-dynamic-scope:withparam"); oauth.doLogin(DEFAULT_USERNAME, DEFAULT_PASSWORD); grantPage.assertCurrent(); @@ -411,7 +411,7 @@ public void oauthGrantClientScopeMappers() throws Exception { getCleanup().addClientScopeId(fooScopeId); // Login - oauth.clientId(THIRD_PARTY_APP); + oauth.client(THIRD_PARTY_APP); oauth.doLogin(DEFAULT_USERNAME, DEFAULT_PASSWORD); grantPage.assertCurrent(); grantPage.assertGrants(OAuthGrantPage.EMAIL_CONSENT_TEXT, OAuthGrantPage.PROFILE_CONSENT_TEXT, OAuthGrantPage.ROLES_CONSENT_TEXT, "foo-addr"); @@ -454,7 +454,7 @@ public void oauthGrantClientScopeMappers() throws Exception { @Test public void oauthGrantExpiredAuthSession() throws Exception { - oauth.clientId(THIRD_PARTY_APP); + oauth.client(THIRD_PARTY_APP); oauth.doLogin(DEFAULT_USERNAME, DEFAULT_PASSWORD); grantPage.assertCurrent(); @@ -490,7 +490,7 @@ public void oauthGrantOrderedClientScopes() throws Exception { Assert.assertEquals("2", profileRep.getAttributes().get(ClientScopeModel.GUI_ORDER)); // Display consent screen --- assert email, then profile - oauth.clientId(THIRD_PARTY_APP); + oauth.client(THIRD_PARTY_APP); oauth.doLogin(DEFAULT_USERNAME, DEFAULT_PASSWORD); grantPage.assertCurrent(); @@ -520,7 +520,7 @@ public void oauthGrantOrderedClientScopes() throws Exception { @Test public void oauthGrantUserNotLoggedOutAfterConsentRevoke() throws Exception { // Login - oauth.clientId(THIRD_PARTY_APP); + oauth.client(THIRD_PARTY_APP); oauth.doLogin(DEFAULT_USERNAME, DEFAULT_PASSWORD); // Confirm consent screen diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthRedirectUriStateTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthRedirectUriStateTest.java index cec9010b9bda..14f670eb4df8 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthRedirectUriStateTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthRedirectUriStateTest.java @@ -37,7 +37,7 @@ public void configureTestRealm(RealmRepresentation testRealm) { @Before public void clientConfiguration() { - oauth.clientId("test-app"); + oauth.client("test-app", "password"); oauth.responseType(OIDCResponseType.CODE); } 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 e9d7f833f657..29f9fe81b81f 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 @@ -1071,7 +1071,7 @@ public void logoutWithIdTokenAndRemovedClient() throws Exception { .build(); try (Response response = testRealm().clients().create(clientRep)) { String uuid = ApiUtil.getCreatedId(response); - oauth.clientId("my-foo-client"); + oauth.client("my-foo-client", "password"); AccessTokenResponse tokenResponse = loginUser(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/TokenEndpointCorsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/TokenEndpointCorsTest.java index c9859b568004..679242e5f728 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/TokenEndpointCorsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/TokenEndpointCorsTest.java @@ -100,7 +100,7 @@ public void accessTokenCorsRequest() throws Exception { @Test public void accessTokenResourceOwnerCorsRequest() throws Exception { oauth.realm("test"); - oauth.clientId("test-app2"); + oauth.client("test-app2"); oauth.origin(VALID_CORS_URL); // Token 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 34fb2a27ac3f..d9c17ce4b5d2 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 @@ -1044,14 +1044,14 @@ private ParResponse sendPushedAuthorizationRequestWithDpopJkt(String clientId, S private AuthorizationEndpointResponse sendAuthorizationRequest(String clientId, String requestUri, String dpopJkt) { // Authorization Request with request_uri of PAR // remove parameters as query strings of uri - oauth.clientId(clientId); + oauth.client(clientId); oauth.responseType(null); oauth.redirectUri(null); oauth.scope(null); // ----- Authorization Request ----- AuthorizationEndpointResponse loginResponse = oauth.loginForm().requestUri(requestUri).dpopJkt(dpopJkt).doLogin(TEST_USER_NAME, TEST_USER_PASSWORD); // revert - oauth.clientId(null); + oauth.client(null); return loginResponse; } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/rar/AbstractRARParserTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/rar/AbstractRARParserTest.java index 04d7198bddc2..6f267aed6e85 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/rar/AbstractRARParserTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/rar/AbstractRARParserTest.java @@ -80,7 +80,7 @@ public void importTestRealms() { @Before public void clientConfiguration() { ClientManager.realm(adminClient.realm("test")).clientId("test-app").directAccessGrant(true); - oauth.clientId("test-app"); + oauth.client("test-app", "password"); oauth.scope(null); } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCIssuerEndpointEncryptionTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCIssuerEndpointEncryptionTest.java index 4388c6d462d7..09fa36541f2b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCIssuerEndpointEncryptionTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCIssuerEndpointEncryptionTest.java @@ -407,7 +407,7 @@ public void testCredentialIssuanceWithEncryption() throws Exception { authDetail.setCredentialConfigurationId(credConfigId); authDetail.setLocations(List.of(credentialIssuer.getCredentialIssuer())); - oauth.clientId(testClientId).openid(false).scope(scopeName); + oauth.client(testClientId).openid(false).scope(scopeName); String authCode = getAuthorizationCode(oauth, client, "john", scopeName); AccessTokenResponse tokenResponse = getBearerToken(oauth, authCode, authDetail); return tokenResponse.getAccessToken(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AbstractWellKnownProviderTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AbstractWellKnownProviderTest.java index bfbefdfe1f7c..1035580da296 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AbstractWellKnownProviderTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AbstractWellKnownProviderTest.java @@ -119,7 +119,7 @@ public void clientConfiguration() { * will faile and the clientID will always be "sample-public-client * @see AccessTokenTest#testAuthorizationNegotiateHeaderIgnored() */ - oauth.clientId("test-app"); + oauth.client("test-app", "password"); } abstract protected String getWellKnownProviderId(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AcrAuthFlowTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AcrAuthFlowTest.java index fd039e98f3bd..29627d741e2e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AcrAuthFlowTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AcrAuthFlowTest.java @@ -192,7 +192,7 @@ private ProtocolMapperRepresentation createMapper(){ */ @Before public void setupTest() { - oauth.clientId(CLIENT_ID); + oauth.client(CLIENT_ID); createPasswordFlow(); createOTPFlow(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AuthenticationMethodReferenceTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AuthenticationMethodReferenceTest.java index 96373c52452d..07fc9067b3d9 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AuthenticationMethodReferenceTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AuthenticationMethodReferenceTest.java @@ -184,7 +184,7 @@ private ProtocolMapperRepresentation createMapper(String mapper){ */ @Before public void configureClient() { - oauth.clientId(CLIENT_ID); + oauth.client(CLIENT_ID); } /** 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 c1520b620277..984de690844c 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 @@ -639,12 +639,12 @@ public void requestObjectClientIdAndResponseTypeTest() { TestOIDCEndpointsApplicationResource oidcClientEndpointsResource = testingClient.testApp().oidcClientEndpoints(); oidcClientEndpointsResource.setOIDCRequest("test", "test-app", oauth.getRedirectUri(), "10", "some-state", "none"); String request = oidcClientEndpointsResource.getOIDCRequest(); - oauth.clientId(null); + oauth.client(null); oauth.loginForm().request(request).state("some-state").open(); errorPage.assertCurrent(); // Test that "response_type" mandatory in the query even if set in the "request" object - oauth.clientId("test-app"); + oauth.client("test-app", "password"); oauth.responseType(null); oauth.loginForm().request(request).state("some-state").open(); appPage.assertCurrent(); @@ -653,13 +653,13 @@ public void requestObjectClientIdAndResponseTypeTest() { Assert.assertEquals("some-state", authorizationEndpointResponse.getState()); // Test that different "client_id" in the query and in the request object is disallowed - oauth.clientId("test-app-scope"); + oauth.client("test-app-scope"); oauth.responseType(OAuth2Constants.CODE); oauth.loginForm().request(request).state("some-state").open(); errorPage.assertCurrent(); // Test that different "response_type" in the query and in the request object is disallowed - oauth.clientId("test-app"); + oauth.client("test-app", "password"); oauth.responseType(OAuth2Constants.CODE + " " + OAuth2Constants.ID_TOKEN); oauth.loginForm().request(request).state("some-state").open(); appPage.assertCurrent(); @@ -675,7 +675,7 @@ public void requestObjectClientIdAndResponseTypeTest() { oidcRequest.put(OIDCLoginProtocol.STATE_PARAM, "request-state"); String requestObjectString = new JWSBuilder().jsonContent(oidcRequest).none(); - oauth.clientId("test-app"); + oauth.client("test-app", "password"); oauth.responseType(OAuth2Constants.CODE); AuthorizationEndpointResponse response1 = oauth.loginForm().request(requestObjectString).state("some-state").doLogin("test-user@localhost", "password"); Assert.assertNotNull(response1.getCode()); @@ -1030,7 +1030,7 @@ private void requestUriParamSignedIn(String expectedAlgorithm, String actualAlgo setTimeOffset(20); oauth.realm("test"); - oauth.clientId("test-app"); + oauth.client("test-app", "password"); String requestUri = TestApplicationResourceUrls.clientRequestUri(); if (expectedAlgorithm == null || expectedAlgorithm.equals(actualAlgorithm)) { // Check signed request_uri will pass 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 87ecc6b02ff7..124404d8f77c 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 @@ -80,7 +80,7 @@ public void clientConfiguration() { * will faile and the clientID will always be "sample-public-client * @see AccessTokenTest#testAuthorizationNegotiateHeaderIgnored() */ - oauth.clientId("test-app"); + oauth.client("test-app", "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 24c9b8854644..a04aa6a26d4a 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 @@ -65,7 +65,7 @@ public void clientConfiguration() { * will faile and the clientID will always be "sample-public-client * @see AccessTokenTest#testAuthorizationNegotiateHeaderIgnored() */ - oauth.clientId("test-app"); + oauth.client("test-app", "password"); } @Override 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 10427aee1ae9..9d481fe3c2e4 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 @@ -163,7 +163,7 @@ public void importTestRealms() { @Before public void clientConfiguration() { ClientManager.realm(adminClient.realm("test")).clientId("test-app").directAccessGrant(true); - oauth.clientId("test-app"); + oauth.client("test-app", "password"); oauth.scope(null); } @@ -346,7 +346,7 @@ public void testOptionalScopesWithConsentRequired() throws Exception { addressScopeRep.getAttributes().put(ClientScopeModel.DISPLAY_ON_CONSENT_SCREEN, "false"); addressScope.update(addressScopeRep); - oauth.clientId("third-party"); + oauth.client("third-party"); oauth.doLogin("john", "password"); grantPage.assertCurrent(); @@ -411,7 +411,7 @@ public void testClientDisplayedOnConsentScreen() throws Exception { thirdParty.update(thirdPartyRep); // Login. Client should be displayed on consent screen - oauth.clientId("third-party"); + oauth.client("third-party"); oauth.doLogin("john", "password"); grantPage.assertCurrent(); @@ -455,7 +455,7 @@ public void testClientDisplayedOnConsentScreenWithEmptyConsentText() throws Exce profileScope.update(profileScopeRep); // Login. ConsentTexts are empty for the client and for the "profile" scope, so it should fallback to name/clientId - oauth.clientId("third-party"); + oauth.client("third-party"); oauth.doLogin("john", "password"); grantPage.assertCurrent(); @@ -474,7 +474,7 @@ public void testClientDisplayedOnConsentScreenWithEmptyConsentText() throws Exce @Test public void testRefreshTokenWithConsentRequired() { // Login with consentRequired - oauth.clientId("third-party"); + oauth.client("third-party"); oauth.doLogin("john", "password"); grantPage.assertCurrent(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCBasicResponseTypeCodeTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCBasicResponseTypeCodeTest.java index 00066f0455ac..be16b06ad69b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCBasicResponseTypeCodeTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCBasicResponseTypeCodeTest.java @@ -42,7 +42,7 @@ public class OIDCBasicResponseTypeCodeTest extends AbstractOIDCResponseTypeTest public void clientConfiguration() { clientManagerBuilder().standardFlow(true).implicitFlow(false); - oauth.clientId("test-app"); + oauth.client("test-app", "password"); oauth.responseType(OIDCResponseType.CODE); } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCBasicResponseTypeNoneTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCBasicResponseTypeNoneTest.java index 94f9bb7c3903..394e42bc1ed0 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCBasicResponseTypeNoneTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCBasicResponseTypeNoneTest.java @@ -40,7 +40,7 @@ public class OIDCBasicResponseTypeNoneTest extends AbstractOIDCResponseTypeTest public void clientConfiguration() { clientManagerBuilder().standardFlow(true).implicitFlow(false); - oauth.clientId("test-app"); + oauth.client("test-app", "password"); oauth.responseType(OIDCResponseType.NONE); } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCHybridResponseTypeCodeIDTokenAsDetachedSigTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCHybridResponseTypeCodeIDTokenAsDetachedSigTest.java index b40943a666ab..3b72a68c3e60 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCHybridResponseTypeCodeIDTokenAsDetachedSigTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCHybridResponseTypeCodeIDTokenAsDetachedSigTest.java @@ -43,7 +43,7 @@ public class OIDCHybridResponseTypeCodeIDTokenAsDetachedSigTest extends Abstract public void clientConfiguration() { clientManagerBuilder().standardFlow(true).implicitFlow(true).updateAttribute(OIDCConfigAttributes.ID_TOKEN_AS_DETACHED_SIGNATURE, Boolean.TRUE.toString()); - oauth.clientId("test-app"); + oauth.client("test-app", "password"); oauth.responseType(OIDCResponseType.CODE + " " + OIDCResponseType.ID_TOKEN); } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCHybridResponseTypeCodeIDTokenAsDetachedSigTokenTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCHybridResponseTypeCodeIDTokenAsDetachedSigTokenTest.java index fa5be38deaef..c9a7c4a9995e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCHybridResponseTypeCodeIDTokenAsDetachedSigTokenTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCHybridResponseTypeCodeIDTokenAsDetachedSigTokenTest.java @@ -43,7 +43,7 @@ public class OIDCHybridResponseTypeCodeIDTokenAsDetachedSigTokenTest extends Abs public void clientConfiguration() { clientManagerBuilder().standardFlow(true).implicitFlow(true).updateAttribute(OIDCConfigAttributes.ID_TOKEN_AS_DETACHED_SIGNATURE, Boolean.TRUE.toString()); - oauth.clientId("test-app"); + oauth.client("test-app", "password"); oauth.responseType(OIDCResponseType.CODE + " " + OIDCResponseType.ID_TOKEN + " " + OIDCResponseType.TOKEN); } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCHybridResponseTypeCodeIDTokenTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCHybridResponseTypeCodeIDTokenTest.java index 93859298cd3f..e6ef3898464d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCHybridResponseTypeCodeIDTokenTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCHybridResponseTypeCodeIDTokenTest.java @@ -42,7 +42,7 @@ public class OIDCHybridResponseTypeCodeIDTokenTest extends AbstractOIDCResponseT public void clientConfiguration() { clientManagerBuilder().standardFlow(true).implicitFlow(true); - oauth.clientId("test-app"); + oauth.client("test-app", "password"); oauth.responseType(OIDCResponseType.CODE + " " + OIDCResponseType.ID_TOKEN); } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCHybridResponseTypeCodeIDTokenTokenTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCHybridResponseTypeCodeIDTokenTokenTest.java index de0c5ee7c38b..873ab4710397 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCHybridResponseTypeCodeIDTokenTokenTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCHybridResponseTypeCodeIDTokenTokenTest.java @@ -42,7 +42,7 @@ public class OIDCHybridResponseTypeCodeIDTokenTokenTest extends AbstractOIDCResp public void clientConfiguration() { clientManagerBuilder().standardFlow(true).implicitFlow(true); - oauth.clientId("test-app"); + oauth.client("test-app", "password"); oauth.responseType(OIDCResponseType.CODE + " " + OIDCResponseType.ID_TOKEN + " " + OIDCResponseType.TOKEN); } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCHybridResponseTypeCodeTokenTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCHybridResponseTypeCodeTokenTest.java index ff9d2e1eece0..d2cb83d07829 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCHybridResponseTypeCodeTokenTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCHybridResponseTypeCodeTokenTest.java @@ -42,7 +42,7 @@ public class OIDCHybridResponseTypeCodeTokenTest extends AbstractOIDCResponseTyp public void clientConfiguration() { clientManagerBuilder().standardFlow(true).implicitFlow(true); - oauth.clientId("test-app"); + oauth.client("test-app", "password"); oauth.responseType(OIDCResponseType.CODE + " " + OIDCResponseType.TOKEN); } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCImplicitResponseTypeIDTokenTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCImplicitResponseTypeIDTokenTest.java index 2626c375ac06..8fe47d8d594c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCImplicitResponseTypeIDTokenTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCImplicitResponseTypeIDTokenTest.java @@ -41,7 +41,7 @@ public class OIDCImplicitResponseTypeIDTokenTest extends AbstractOIDCResponseTyp public void clientConfiguration() { clientManagerBuilder().standardFlow(false).implicitFlow(true); - oauth.clientId("test-app"); + oauth.client("test-app", "password"); oauth.responseType(OIDCResponseType.ID_TOKEN); } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCImplicitResponseTypeIDTokenTokenTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCImplicitResponseTypeIDTokenTokenTest.java index 86e041f0a87b..43bf8b4fb7f5 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCImplicitResponseTypeIDTokenTokenTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCImplicitResponseTypeIDTokenTokenTest.java @@ -41,7 +41,7 @@ public class OIDCImplicitResponseTypeIDTokenTokenTest extends AbstractOIDCRespon public void clientConfiguration() { clientManagerBuilder().standardFlow(false).implicitFlow(true); - oauth.clientId("test-app"); + oauth.client("test-app", "password"); oauth.responseType(OIDCResponseType.ID_TOKEN + " " + OIDCResponseType.TOKEN); } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/admin/AbstractOrganizationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/admin/AbstractOrganizationTest.java index fb6af510a5a4..7c38002080a1 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/admin/AbstractOrganizationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/admin/AbstractOrganizationTest.java @@ -307,7 +307,7 @@ public RealmRepresentation createProviderRealm() { } protected void openIdentityFirstLoginPage(String username, boolean autoIDPRedirect, String idpAlias, boolean isVisible, boolean clickIdp) { - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); log.debug("Logging in"); assertTrue(loginPage.isUsernameInputPresent()); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/admin/OrganizationInvitationLinkTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/admin/OrganizationInvitationLinkTest.java index c211f3e5c60c..73c7b4fd7679 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/admin/OrganizationInvitationLinkTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/admin/OrganizationInvitationLinkTest.java @@ -292,7 +292,7 @@ public void testRegistrationUsingRegistrationEndpoint() throws Exception { RealmRepresentation realm = testRealm().toRepresentation(); realm.setRegistrationAllowed(true); testRealm().update(realm); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(realm.getRealm()); loginPage.clickRegister(); registerPage.assertCurrent(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/admin/OrganizationThemeTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/admin/OrganizationThemeTest.java index 9a6628e10424..c82ae9aa910e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/admin/OrganizationThemeTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/admin/OrganizationThemeTest.java @@ -151,7 +151,7 @@ public void testOrganizationOnUpdateProfile() { getCleanup(bc.consumerRealmName()).addUserId(userId); } createOrganization("myorg", "myorg.com", "myorg.org"); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); loginPage.loginUsername("tom"); Assert.assertTrue(driver.getPageSource().contains("Sign-in to myorg organization")); 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 f45c75033cef..e16dda79c80b 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 @@ -85,7 +85,7 @@ public void testTryLoginWithUsernameNotAnEmail() { public void testEmptyUserNameValidation() { createOrganization(); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); Assert.assertFalse(loginPage.isPasswordInputPresent()); loginPage.loginUsername(""); @@ -110,7 +110,7 @@ public void testAuthenticateUnmanagedMemberWhenProviderDisabled() throws IOExcep UserRepresentation member = addMember(organization, "contractor@contractor.org"); // first try to access login page - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); Assert.assertFalse(loginPage.isPasswordInputPresent()); Assert.assertFalse(loginPage.isSocialButtonPresent(bc.getIDPAlias())); @@ -141,7 +141,7 @@ public void testForceReAuthenticationBeforeRequiredAction() { OrganizationResource organization = testRealm().organizations().get(createOrganization().getId()); UserRepresentation member = addMember(organization); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); loginPage.loginUsername(member.getEmail()); loginPage.login(memberPassword); @@ -171,7 +171,7 @@ public void testRequiresUserMembership() { OrganizationResource organization = testRealm().organizations().get(org.getId()); UserRepresentation member = addMember(organization); organization.members().member(member.getId()).delete().close(); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); loginPage.loginUsername(member.getEmail()); // user is not a member of any organization @@ -179,7 +179,7 @@ public void testRequiresUserMembership() { organization.members().addMember(member.getId()).close(); OrganizationRepresentation orgB = createOrganization("org-b"); - oauth.clientId("broker-app"); + oauth.client("broker-app"); oauth.scope("organization:org-b"); loginPage.open(bc.consumerRealmName()); loginPage.loginUsername(member.getEmail()); @@ -188,7 +188,7 @@ public void testRequiresUserMembership() { errorPage.assertTryAnotherWayLinkAvailability(false); organization.members().member(member.getId()).delete().close(); - oauth.clientId("broker-app"); + oauth.client("broker-app"); oauth.scope("organization:*"); loginPage.open(bc.consumerRealmName()); loginPage.loginUsername(member.getEmail()); @@ -197,7 +197,7 @@ public void testRequiresUserMembership() { organization.members().addMember(member.getId()).close(); testRealm().organizations().get(orgB.getId()).members().addMember(member.getId()).close(); - oauth.clientId("broker-app"); + oauth.client("broker-app"); oauth.scope("organization"); loginPage.open(bc.consumerRealmName()); loginPage.loginUsername(member.getEmail()); @@ -218,7 +218,7 @@ public void testLoginHint() { UserRepresentation member = addMember(organizationResource); // login hint populates the username field - oauth.clientId("broker-app"); + oauth.client("broker-app"); String expectedUsername = URLEncoder.encode(member.getEmail(), StandardCharsets.UTF_8); oauth.realm(bc.consumerRealmName()); oauth.loginForm().loginHint(expectedUsername).open(); @@ -252,7 +252,7 @@ public void testDuplicateEmailsEnabled() { } // user with a unique username can authenticate to his account using a unique username - oauth.clientId("broker-app"); + oauth.client("broker-app"); oauth.realm(bc.consumerRealmName()); oauth.loginForm().open(); loginPage.loginUsername(member.getUsername()); 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 a5b65260d992..7cb4b7d570d6 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 @@ -460,7 +460,7 @@ public void testRedirectUnManagedMemberAllOrganizationsScope() { assertTrue(driver.getPageSource().contains("Sign in to provider")); oauth.scope("organization"); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); loginPage.loginUsername(orgAEmail); selectOrganizationPage.assertCurrent(); @@ -534,7 +534,7 @@ private void assertOrganizationBrokerVisibilityWhenUserIsLinkedElsewhere(boolean getCleanup().addCleanup(testRealm().identityProviders().get("second-idp")::remove); organization.identityProviders().addIdentityProvider(secondIdp.getAlias()).close(); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); String email = bc.getUserEmail(); loginPage.loginUsername(email); @@ -556,7 +556,7 @@ private void assertOrganizationBrokerVisibilityWhenUserIsLinkedElsewhere(boolean IdentityProviderRepresentation finalBrokerRep = brokerRep; getCleanup().addCleanup(() -> organization.identityProviders().addIdentityProvider(finalBrokerRep.getInternalId()).close()); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); log.debug("Logging in"); loginPage.loginUsername(email); @@ -610,7 +610,7 @@ public void testShowWhenLinkedElsewhereEdgeCases() { orgB.members().addMember(account.getId()).close(); realmsResouce().realm(bc.consumerRealmName()).users().get(account.getId()).logout(); realmsResouce().realm(bc.providerRealmName()).logoutAll(); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); loginPage.loginUsername(username); Assert.assertTrue(loginPage.isSocialButtonPresent(orgABroker.getAlias())); @@ -667,7 +667,7 @@ public void testNoIDPRedirectWhenUserHasCredentialsSet() { realmsResouce().realm(bc.consumerRealmName()).users().get(account.getId()).logout(); realmsResouce().realm(bc.providerRealmName()).logoutAll(); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); loginPage.loginUsername(bc.getUserEmail()); @@ -880,7 +880,7 @@ public void testOnlyShowBrokersAssociatedWithResolvedOrganization() { org1Broker.getConfig().remove(IdentityProviderRedirectMode.EMAIL_MATCH.getKey()); testRealm().identityProviders().get(org1Broker.getAlias()).update(org1Broker); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); loginPage.loginUsername("user@org-0.org"); Assert.assertTrue(driver.getPageSource().contains("Your email domain matches an organization but you don't have an account yet.")); @@ -905,7 +905,7 @@ public void testDoNotShowBrokersIfOrganizationNotResolved() { testRealm().identityProviders().get(org0Broker.getAlias()).update(org0Broker); // do not show if organization cannot be resolved - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); loginPage.loginUsername("user@unknowndomain.org"); Assert.assertFalse(loginPage.isSocialButtonPresent(org0Broker.getAlias())); @@ -1154,7 +1154,7 @@ public void testRememberOrganizationWhenReloadingLoginPage() { testRealm().identityProviders().create(realmIdp).close(); getCleanup().addCleanup(testRealm().identityProviders().get("second-idp")::remove); - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); loginPage.loginUsername("test@" + org1.getDomains().iterator().next().getName()); // only org idp diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/broker/OrganizationPostBrokerLoginTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/broker/OrganizationPostBrokerLoginTest.java index be12ddab64a9..cbd3d999454b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/broker/OrganizationPostBrokerLoginTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/broker/OrganizationPostBrokerLoginTest.java @@ -114,7 +114,7 @@ public void testAutoRedirectAfterPostBrokerOtpSetup() throws Exception { updateExecutions(AbstractBrokerTest::disableUpdateProfileOnFirstLogin); // 4) First login via broker, run post-broker OTP setup - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); logInWithBroker(bc); @@ -139,7 +139,7 @@ public void testAutoRedirectAfterPostBrokerOtpSetup() throws Exception { AccountHelper.logout(adminClient.realm(bc.consumerRealmName()), bc.getUserLogin()); // 5) Try re-login: user SHOULD be automatically redirected to the identity provider - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); // submit username/email to trigger organization resolution which should redirect to the provider loginPage.loginUsername(bc.getUserEmail()); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/mapper/OrganizationGroupOidcIdpMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/mapper/OrganizationGroupOidcIdpMapperTest.java index 7263fc12acc4..aaa1f9a9fd1a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/mapper/OrganizationGroupOidcIdpMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/mapper/OrganizationGroupOidcIdpMapperTest.java @@ -285,7 +285,7 @@ public void testUserNotAddedToGroupAfterIdpUnlinkedFromOrganization() { // Second login: bypass the org identity-first page (which hides the unlinked IdP) by // navigating directly with kc_idp_hint. The IdP still exists in the realm so login succeeds, // but the mapper cannot resolve the org group and the user is NOT re-added to it. - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); driver.navigate().to(driver.getCurrentUrl() + "&kc_idp_hint=" + bc.getIDPAlias()); loginOrgIdp(bc.getUserLogin(), bc.getUserEmail(), false, true); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/mapper/OrganizationOIDCProtocolMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/mapper/OrganizationOIDCProtocolMapperTest.java index d35a7cfc0851..9ddc2ecb5fb3 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/mapper/OrganizationOIDCProtocolMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/mapper/OrganizationOIDCProtocolMapperTest.java @@ -136,7 +136,7 @@ public void testMultipleOrganizationScopes() throws Exception { Assert.assertTrue(orga.members().list(-1, -1).stream().map(UserRepresentation::getId).anyMatch(member.getId()::equals)); Assert.assertTrue(orgb.members().list(-1, -1).stream().map(UserRepresentation::getId).anyMatch(member.getId()::equals)); - oauth.clientId("test-app"); + oauth.client("test-app", "password"); // Test multiple specific organization scopes - should return both organizations oauth.scope("openid organization:org-a organization:org-b"); @@ -1510,7 +1510,7 @@ public void testCustomOrganizationScopeNameMultipleSpecific() throws Exception { testRealm().clients().get(testApp.getId()).addDefaultClientScope(createdId); getCleanup().addCleanup(() -> testRealm().clientScopes().get(createdId).remove()); - oauth.clientId("test-app"); + oauth.client("test-app", "password"); // Test multiple specific organization scopes with custom scope name - should return both organizations oauth.scope("openid org:org-a org:org-b"); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/member/OrganizationMemberTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/member/OrganizationMemberTest.java index 7d714a9afe9b..b787cdd7e274 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/member/OrganizationMemberTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/member/OrganizationMemberTest.java @@ -742,7 +742,7 @@ public void testGetMemberOrganizationsForbiddenForNonAdminUser() throws Exceptio } private void loginViaNonOrgIdP(String idpAlias) { - oauth.clientId("broker-app"); + oauth.client("broker-app"); loginPage.open(bc.consumerRealmName()); assertTrue(loginPage.isPasswordInputPresent()); 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 f56bfaca55a5..67691f56ac0e 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 @@ -445,7 +445,7 @@ public void testClientSessionCountExceededAndNewSessionDeniedResetPasswordFlow() try { // Login and verify login was successful String redirect_uri = oauth.AUTH_SERVER_ROOT + "/realms/test/account"; - oauth.clientId("account"); + oauth.client("account"); oauth.redirectUri(redirect_uri); oauth.doLogin("test-user@localhost", "password"); EventRepresentation loginEvent = events.expectLogin().client("account").detail(Details.REDIRECT_URI, redirect_uri).assertEvent(); @@ -488,7 +488,7 @@ public void testClientSessionCountExceededAndOldestSessionRemovedResetPasswordFl // Login and verify login was successful String redirect_uri = oauth.AUTH_SERVER_ROOT + "/realms/test/account"; - oauth.clientId("account"); + oauth.client("account"); oauth.redirectUri(redirect_uri); oauth.doLogin("test-user@localhost", "password"); EventRepresentation loginEvent = events.expectLogin().client("account").detail(Details.REDIRECT_URI, redirect_uri).assertEvent(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/TestAppHelper.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/TestAppHelper.java index 57cdc06b34b6..7a2ff806cd8b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/TestAppHelper.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/TestAppHelper.java @@ -81,7 +81,7 @@ public boolean login(String username, String password, String otp) { } public boolean login(String username, String password, String realm, String clientId, String idp) { - oauth.clientId(clientId); + oauth.client(clientId); loginPage.open(realm); loginPage.clickSocial(idp); loginPage.login(username, password);