From de5baa9df75c7b70240630bb82a926a5cd79a6ad Mon Sep 17 00:00:00 2001 From: Dane Barentine Date: Tue, 15 Dec 2015 11:15:55 -0800 Subject: [PATCH 1/2] KEYCLOAK-2229 Added depending on keycloak-broker-core module to resolve NoClassDefFoundError for BrokeredIdentityContext class --- .../base/org/keycloak/keycloak-login-freemarker/main/module.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-login-freemarker/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-login-freemarker/main/module.xml index 3b0e961ef7..155a65dcba 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-login-freemarker/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-login-freemarker/main/module.xml @@ -16,6 +16,7 @@ + From ee79f5e69ded412609e563e5680c5611c32c10d9 Mon Sep 17 00:00:00 2001 From: Bill Burke Date: Tue, 15 Dec 2015 17:37:53 -0500 Subject: [PATCH 2/2] remove default client mappers when templated --- .../theme/base/admin/resources/js/app.js | 3 +++ .../admin/resources/js/controllers/clients.js | 10 +++++++++- .../resources/partials/client-mappers.html | 1 + .../AbstractClientRegistrationProvider.java | 3 ++- .../services/managers/ClientManager.java | 16 ++++++++++++++-- .../services/managers/RealmManager.java | 12 ++++++------ .../migration/DefaultMigrationProvider.java | 0 .../resources/admin/ClientsResource.java | 3 ++- .../composites/CompositeRoleTest.java | 9 ++++----- .../federation/LDAPMultipleAttributesTest.java | 6 ++---- .../testsuite/forms/CustomFlowTest.java | 4 ++-- .../testsuite/jaxrs/JaxrsBasicAuthTest.java | 4 ++-- .../keycloak/testsuite/model/GroupTest.java | 18 ++---------------- .../testsuite/oauth/AccessTokenTest.java | 4 ++-- .../testsuite/oauth/OAuthRedirectUriTest.java | 8 ++++---- .../testsuite/oauth/OfflineTokenTest.java | 3 ++- ...ourceOwnerPasswordCredentialsGrantTest.java | 6 +++--- .../testsuite/oauth/ServiceAccountTest.java | 5 +++-- 18 files changed, 63 insertions(+), 52 deletions(-) mode change 100644 => 100755 services/src/main/java/org/keycloak/services/clientregistration/AbstractClientRegistrationProvider.java mode change 100644 => 100755 services/src/main/java/org/keycloak/services/migration/DefaultMigrationProvider.java mode change 100644 => 100755 testsuite/integration/src/test/java/org/keycloak/testsuite/federation/LDAPMultipleAttributesTest.java mode change 100644 => 100755 testsuite/integration/src/test/java/org/keycloak/testsuite/jaxrs/JaxrsBasicAuthTest.java mode change 100644 => 100755 testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/OfflineTokenTest.java mode change 100644 => 100755 testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/ServiceAccountTest.java diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/js/app.js b/forms/common-themes/src/main/resources/theme/base/admin/resources/js/app.js index 826a3daa30..f7a3c25708 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/js/app.js +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/js/app.js @@ -762,6 +762,9 @@ module.config([ '$routeProvider', function($routeProvider) { client : function(ClientLoader) { return ClientLoader(); }, + templates : function(ClientTemplateListLoader) { + return ClientTemplateListLoader(); + }, serverInfo : function(ServerInfoLoader) { return ServerInfoLoader(); } diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/js/controllers/clients.js b/forms/common-themes/src/main/resources/theme/base/admin/resources/js/controllers/clients.js index 420517d0f8..a6a9130f4a 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/js/controllers/clients.js +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/js/controllers/clients.js @@ -1419,7 +1419,7 @@ module.controller('AddBuiltinProtocolMapperCtrl', function($scope, realm, client }); -module.controller('ClientProtocolMapperListCtrl', function($scope, realm, client, serverInfo, +module.controller('ClientProtocolMapperListCtrl', function($scope, realm, client, templates, serverInfo, ClientProtocolMappersByProtocol, ClientProtocolMapper, $route, Dialog, Notifications) { $scope.realm = realm; @@ -1427,6 +1427,14 @@ module.controller('ClientProtocolMapperListCtrl', function($scope, realm, client if (client.protocol == null) { client.protocol = 'openid-connect'; } + if (client.clientTemplate) { + for (var i = 0; i < templates.length; i++) { + if (client.clientTemplate == templates[i].name) { + $scope.template = templates[i]; + break; + } + } + } var protocolMappers = serverInfo.protocolMapperTypes[client.protocol]; var mapperTypes = {}; diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-mappers.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-mappers.html index 23f7f971ed..9b98065eba 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-mappers.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-mappers.html @@ -24,6 +24,7 @@
{{:: 'create' | translate}} {{:: 'add-builtin' | translate}} + Inherited Template Mappers
diff --git a/services/src/main/java/org/keycloak/services/clientregistration/AbstractClientRegistrationProvider.java b/services/src/main/java/org/keycloak/services/clientregistration/AbstractClientRegistrationProvider.java old mode 100644 new mode 100755 index 0c95a37ce1..0666fab32c --- a/services/src/main/java/org/keycloak/services/clientregistration/AbstractClientRegistrationProvider.java +++ b/services/src/main/java/org/keycloak/services/clientregistration/AbstractClientRegistrationProvider.java @@ -11,6 +11,7 @@ import org.keycloak.models.utils.RepresentationToModel; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.services.ErrorResponseException; import org.keycloak.services.ForbiddenException; +import org.keycloak.services.managers.ClientManager; import javax.ws.rs.core.Response; @@ -33,7 +34,7 @@ public abstract class AbstractClientRegistrationProvider implements ClientRegist auth.requireCreate(); try { - ClientModel clientModel = RepresentationToModel.createClient(session, session.getContext().getRealm(), client, true); + ClientModel clientModel = ClientManager.createClient(session, session.getContext().getRealm(), client, true); if (client.getClientId() == null) { clientModel.setClientId(clientModel.getId()); } diff --git a/services/src/main/java/org/keycloak/services/managers/ClientManager.java b/services/src/main/java/org/keycloak/services/managers/ClientManager.java index 126b028802..358860f027 100755 --- a/services/src/main/java/org/keycloak/services/managers/ClientManager.java +++ b/services/src/main/java/org/keycloak/services/managers/ClientManager.java @@ -7,16 +7,19 @@ import org.keycloak.authentication.ClientAuthenticator; import org.keycloak.authentication.ClientAuthenticatorFactory; import org.keycloak.common.constants.ServiceAccountConstants; import org.keycloak.models.ClientModel; +import org.keycloak.models.KeycloakSession; import org.keycloak.models.ProtocolMapperModel; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.models.UserSessionProvider; import org.keycloak.models.session.UserSessionPersisterProvider; import org.keycloak.models.utils.KeycloakModelUtils; +import org.keycloak.models.utils.RepresentationToModel; import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.protocol.oidc.mappers.UserSessionNoteMapper; import org.keycloak.representations.adapters.config.BaseRealmConfig; import org.keycloak.common.util.Time; +import org.keycloak.representations.idm.ClientRepresentation; import java.net.URI; import java.util.Collections; @@ -42,10 +45,19 @@ public class ClientManager { public ClientManager() { } - public ClientModel createClient(RealmModel realm, String name) { - return KeycloakModelUtils.createClient(realm, name); + public static ClientModel createClient(KeycloakSession session, RealmModel realm, ClientRepresentation rep, boolean addDefaultRoles) { + ClientModel client = RepresentationToModel.createClient(session, realm, rep, addDefaultRoles); + + // remove default mappers + if (rep.getProtocolMappers() == null && rep.getClientTemplate() != null) { + Set mappers = client.getProtocolMappers(); + for (ProtocolMapperModel mapper : mappers) client.removeProtocolMapper(mapper); + } + return client; + } + public boolean removeClient(RealmModel realm, ClientModel client) { if (realm.removeClient(client.getId())) { UserSessionProvider sessions = realmManager.getSession().sessions(); diff --git a/services/src/main/java/org/keycloak/services/managers/RealmManager.java b/services/src/main/java/org/keycloak/services/managers/RealmManager.java index 8ab0cfc1c8..e16ac9115c 100755 --- a/services/src/main/java/org/keycloak/services/managers/RealmManager.java +++ b/services/src/main/java/org/keycloak/services/managers/RealmManager.java @@ -50,7 +50,7 @@ import org.keycloak.timer.TimerProvider; import java.util.Collections; import java.util.HashSet; import java.util.List; -import static java.lang.Boolean.TRUE; + import org.keycloak.models.ProtocolMapperModel; import org.keycloak.protocol.ProtocolMapperUtils; @@ -136,7 +136,7 @@ public class RealmManager implements RealmImporter { protected void setupAdminConsole(RealmModel realm) { ClientModel adminConsole = realm.getClientByClientId(Constants.ADMIN_CONSOLE_CLIENT_ID); - if (adminConsole == null) adminConsole = new ClientManager(this).createClient(realm, Constants.ADMIN_CONSOLE_CLIENT_ID); + if (adminConsole == null) adminConsole = KeycloakModelUtils.createClient(realm, Constants.ADMIN_CONSOLE_CLIENT_ID); adminConsole.setName("${client_" + Constants.ADMIN_CONSOLE_CLIENT_ID + "}"); String baseUrl = contextPath + "/admin/" + realm.getName() + "/console"; adminConsole.setBaseUrl(baseUrl + "/index.html"); @@ -162,7 +162,7 @@ public class RealmManager implements RealmImporter { public void setupAdminCli(RealmModel realm) { ClientModel adminCli = realm.getClientByClientId(Constants.ADMIN_CLI_CLIENT_ID); if (adminCli == null) { - adminCli = new ClientManager(this).createClient(realm, Constants.ADMIN_CLI_CLIENT_ID); + adminCli = KeycloakModelUtils.createClient(realm, Constants.ADMIN_CLI_CLIENT_ID); adminCli.setName("${client_" + Constants.ADMIN_CLI_CLIENT_ID + "}"); adminCli.setEnabled(true); adminCli.setPublicClient(true); @@ -309,7 +309,7 @@ public class RealmManager implements RealmImporter { String realmAdminClientId = getRealmAdminClientId(realm); ClientModel realmAdminClient = realm.getClientByClientId(realmAdminClientId); if (realmAdminClient == null) { - realmAdminClient = clientManager.createClient(realm, realmAdminClientId); + realmAdminClient = KeycloakModelUtils.createClient(realm, realmAdminClientId); realmAdminClient.setName("${client_" + realmAdminClientId + "}"); } RoleModel adminRole = realmAdminClient.addRole(AdminRoles.REALM_ADMIN); @@ -330,7 +330,7 @@ public class RealmManager implements RealmImporter { private void setupAccountManagement(RealmModel realm) { ClientModel client = realm.getClientNameMap().get(Constants.ACCOUNT_MANAGEMENT_CLIENT_ID); if (client == null) { - client = new ClientManager(this).createClient(realm, Constants.ACCOUNT_MANAGEMENT_CLIENT_ID); + client = KeycloakModelUtils.createClient(realm, Constants.ACCOUNT_MANAGEMENT_CLIENT_ID); client.setName("${client_" + Constants.ACCOUNT_MANAGEMENT_CLIENT_ID + "}"); client.setEnabled(true); client.setFullScopeAllowed(false); @@ -355,7 +355,7 @@ public class RealmManager implements RealmImporter { public void setupBrokerService(RealmModel realm) { ClientModel client = realm.getClientNameMap().get(Constants.BROKER_SERVICE_CLIENT_ID); if (client == null) { - client = new ClientManager(this).createClient(realm, Constants.BROKER_SERVICE_CLIENT_ID); + client = KeycloakModelUtils.createClient(realm, Constants.BROKER_SERVICE_CLIENT_ID); client.setEnabled(true); client.setName("${client_" + Constants.BROKER_SERVICE_CLIENT_ID + "}"); client.setFullScopeAllowed(false); diff --git a/services/src/main/java/org/keycloak/services/migration/DefaultMigrationProvider.java b/services/src/main/java/org/keycloak/services/migration/DefaultMigrationProvider.java old mode 100644 new mode 100755 diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientsResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientsResource.java index 5c80bca40e..c6127fd67d 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientsResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientsResource.java @@ -13,6 +13,7 @@ import org.keycloak.models.utils.ModelToRepresentation; import org.keycloak.models.utils.RepresentationToModel; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.services.ErrorResponse; +import org.keycloak.services.managers.ClientManager; import javax.ws.rs.Consumes; import javax.ws.rs.GET; @@ -95,7 +96,7 @@ public class ClientsResource { auth.requireManage(); try { - ClientModel clientModel = RepresentationToModel.createClient(session, realm, rep, true); + ClientModel clientModel = ClientManager.createClient(session, realm, rep, true); adminEvent.operation(OperationType.CREATE).resourcePath(uriInfo, clientModel.getId()).representation(rep).success(); diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/composites/CompositeRoleTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/composites/CompositeRoleTest.java index d7e3b46dd9..afb8b4c769 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/composites/CompositeRoleTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/composites/CompositeRoleTest.java @@ -35,7 +35,6 @@ import org.keycloak.models.UserCredentialModel; import org.keycloak.models.UserModel; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.representations.AccessToken; -import org.keycloak.services.managers.ClientManager; import org.keycloak.services.managers.RealmManager; import org.keycloak.testsuite.ApplicationServlet; import org.keycloak.testsuite.OAuthClient; @@ -85,7 +84,7 @@ public class CompositeRoleTest { realmRole1User.updateCredential(UserCredentialModel.password("password")); realmRole1User.grantRole(realmRole1); - final ClientModel realmComposite1Application = new ClientManager(manager).createClient(realm, "REALM_COMPOSITE_1_APPLICATION"); + final ClientModel realmComposite1Application = KeycloakModelUtils.createClient(realm, "REALM_COMPOSITE_1_APPLICATION"); realmComposite1Application.setFullScopeAllowed(false); realmComposite1Application.setEnabled(true); realmComposite1Application.addScopeMapping(realmComposite1); @@ -94,7 +93,7 @@ public class CompositeRoleTest { realmComposite1Application.setManagementUrl("http://localhost:8081/app/logout"); realmComposite1Application.setSecret("password"); - final ClientModel realmRole1Application = new ClientManager(manager).createClient(realm, "REALM_ROLE_1_APPLICATION"); + final ClientModel realmRole1Application = KeycloakModelUtils.createClient(realm, "REALM_ROLE_1_APPLICATION"); realmRole1Application.setFullScopeAllowed(false); realmRole1Application.setEnabled(true); realmRole1Application.addScopeMapping(realmRole1); @@ -104,7 +103,7 @@ public class CompositeRoleTest { realmRole1Application.setSecret("password"); - final ClientModel appRoleApplication = new ClientManager(manager).createClient(realm, "APP_ROLE_APPLICATION"); + final ClientModel appRoleApplication = KeycloakModelUtils.createClient(realm, "APP_ROLE_APPLICATION"); appRoleApplication.setFullScopeAllowed(false); appRoleApplication.setEnabled(true); appRoleApplication.addRedirectUri("http://localhost:8081/app/*"); @@ -127,7 +126,7 @@ public class CompositeRoleTest { realmAppRoleUser.updateCredential(UserCredentialModel.password("password")); realmAppRoleUser.grantRole(appRole2); - final ClientModel appCompositeApplication = new ClientManager(manager).createClient(realm, "APP_COMPOSITE_APPLICATION"); + final ClientModel appCompositeApplication = KeycloakModelUtils.createClient(realm, "APP_COMPOSITE_APPLICATION"); appCompositeApplication.setFullScopeAllowed(false); appCompositeApplication.setEnabled(true); appCompositeApplication.addRedirectUri("http://localhost:8081/app/*"); diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/LDAPMultipleAttributesTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/LDAPMultipleAttributesTest.java old mode 100644 new mode 100755 index 0b417e3c8e..a94618cc2c --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/LDAPMultipleAttributesTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/LDAPMultipleAttributesTest.java @@ -2,7 +2,6 @@ package org.keycloak.testsuite.federation; import java.net.URL; import java.util.Arrays; -import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; @@ -28,12 +27,11 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.UserFederationProvider; import org.keycloak.models.UserFederationProviderModel; import org.keycloak.models.UserModel; +import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.protocol.oidc.OIDCLoginProtocolService; import org.keycloak.protocol.oidc.mappers.UserAttributeMapper; -import org.keycloak.services.managers.ClientManager; import org.keycloak.services.managers.RealmManager; import org.keycloak.testsuite.OAuthClient; -import org.keycloak.testsuite.adapter.AdapterTest; import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.rule.KeycloakRule; import org.keycloak.testsuite.rule.LDAPRule; @@ -79,7 +77,7 @@ public class LDAPMultipleAttributesTest { ldapFedProvider.getLdapIdentityStore().updatePassword(bruce, "password"); // Create ldap-portal client - ClientModel ldapClient = new ClientManager(manager).createClient(appRealm, "ldap-portal"); + ClientModel ldapClient = KeycloakModelUtils.createClient(appRealm, "ldap-portal"); ldapClient.addRedirectUri("/ldap-portal"); ldapClient.addRedirectUri("/ldap-portal/*"); ldapClient.setManagementUrl("/ldap-portal"); diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/forms/CustomFlowTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/forms/CustomFlowTest.java index 31ac261e70..80486ac643 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/forms/CustomFlowTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/forms/CustomFlowTest.java @@ -34,9 +34,9 @@ import org.keycloak.models.AuthenticationFlowModel; import org.keycloak.models.ClientModel; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; +import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.representations.AccessToken; import org.keycloak.representations.RefreshToken; -import org.keycloak.services.managers.ClientManager; import org.keycloak.services.managers.RealmManager; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.OAuthClient; @@ -125,7 +125,7 @@ public class CustomFlowTest { appRealm.addAuthenticatorExecution(execution); // Set passthrough clientAuthenticator for our clients - ClientModel dummyClient = new ClientManager().createClient(appRealm, "dummy-client"); + ClientModel dummyClient = KeycloakModelUtils.createClient(appRealm, "dummy-client"); dummyClient.setClientAuthenticatorType(PassThroughClientAuthenticator.PROVIDER_ID); dummyClient.setDirectAccessGrantsEnabled(true); diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/jaxrs/JaxrsBasicAuthTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/jaxrs/JaxrsBasicAuthTest.java old mode 100644 new mode 100755 index 83e14e9184..edcff6f676 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/jaxrs/JaxrsBasicAuthTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/jaxrs/JaxrsBasicAuthTest.java @@ -22,7 +22,7 @@ import org.keycloak.adapters.HttpClientBuilder; import org.keycloak.common.util.Base64; import org.keycloak.models.ClientModel; import org.keycloak.models.RealmModel; -import org.keycloak.services.managers.ClientManager; +import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.services.managers.RealmManager; import org.keycloak.testsuite.Constants; import org.keycloak.testsuite.rule.KeycloakRule; @@ -44,7 +44,7 @@ public class JaxrsBasicAuthTest { @Override public void config(RealmManager manager, RealmModel adminstrationRealm, RealmModel appRealm) { - ClientModel app = new ClientManager(manager).createClient(appRealm, "jaxrs-app"); + ClientModel app = KeycloakModelUtils.createClient(appRealm, "jaxrs-app"); app.setEnabled(true); app.setSecret("password"); app.setFullScopeAllowed(true); diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/model/GroupTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/model/GroupTest.java index 29ab66b7d0..a31a2d6e07 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/model/GroupTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/model/GroupTest.java @@ -1,41 +1,27 @@ package org.keycloak.testsuite.model; -import org.apache.http.HttpResponse; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.impl.client.DefaultHttpClient; import org.junit.Assert; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; import org.keycloak.OAuth2Constants; import org.keycloak.admin.client.Keycloak; -import org.keycloak.admin.client.resource.GroupResource; import org.keycloak.admin.client.resource.RealmResource; -import org.keycloak.authentication.authenticators.client.ClientIdAndSecretAuthenticator; -import org.keycloak.common.util.Time; import org.keycloak.events.Details; -import org.keycloak.events.Errors; import org.keycloak.models.ClientModel; import org.keycloak.models.Constants; -import org.keycloak.models.PasswordPolicy; -import org.keycloak.models.ProtocolMapperModel; import org.keycloak.models.RealmModel; import org.keycloak.models.UserCredentialModel; import org.keycloak.models.UserModel; +import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.protocol.oidc.mappers.GroupMembershipMapper; import org.keycloak.protocol.oidc.mappers.UserAttributeMapper; -import org.keycloak.protocol.saml.mappers.AttributeStatementHelper; -import org.keycloak.protocol.saml.mappers.HardcodedAttributeMapper; -import org.keycloak.protocol.saml.mappers.HardcodedRole; -import org.keycloak.protocol.saml.mappers.RoleListMapper; -import org.keycloak.protocol.saml.mappers.RoleNameMapper; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.representations.AccessToken; import org.keycloak.representations.RefreshToken; import org.keycloak.representations.idm.GroupRepresentation; import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.representations.idm.UserRepresentation; -import org.keycloak.services.managers.ClientManager; import org.keycloak.services.managers.RealmManager; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.OAuthClient; @@ -61,7 +47,7 @@ public class GroupTest { public static KeycloakRule keycloakRule = new KeycloakRule(new KeycloakRule.KeycloakSetup() { @Override public void config(RealmManager manager, RealmModel adminstrationRealm, RealmModel appRealm) { - ClientModel app = new ClientManager(manager).createClient(appRealm, "resource-owner"); + ClientModel app = KeycloakModelUtils.createClient(appRealm, "resource-owner"); app.setDirectAccessGrantsEnabled(true); app.setSecret("secret"); diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/AccessTokenTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/AccessTokenTest.java index 4a16c8ced7..8473540d73 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/AccessTokenTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/AccessTokenTest.java @@ -49,6 +49,7 @@ import org.keycloak.models.ProtocolMapperModel; import org.keycloak.models.RealmModel; import org.keycloak.models.RoleModel; import org.keycloak.models.UserModel; +import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.models.utils.ModelToRepresentation; import org.keycloak.protocol.oidc.OIDCLoginProtocolService; import org.keycloak.protocol.oidc.mappers.AddressMapper; @@ -61,7 +62,6 @@ import org.keycloak.representations.IDToken; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.ClientTemplateRepresentation; import org.keycloak.representations.idm.ProtocolMapperRepresentation; -import org.keycloak.services.managers.ClientManager; import org.keycloak.services.managers.RealmManager; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.OAuthClient; @@ -881,7 +881,7 @@ public class AccessTokenTest { keycloakRule.configure(new KeycloakRule.KeycloakSetup() { @Override public void config(RealmManager manager, RealmModel adminstrationRealm, RealmModel appRealm) { - ClientModel client = new ClientManager(manager).createClient(appRealm, "sample-public-client"); + ClientModel client = KeycloakModelUtils.createClient(appRealm, "sample-public-client"); client.addRedirectUri("http://localhost:8081/app/auth"); client.setEnabled(true); client.setPublicClient(true); diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/OAuthRedirectUriTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/OAuthRedirectUriTest.java index d333f862c1..527e2795dc 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/OAuthRedirectUriTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/OAuthRedirectUriTest.java @@ -29,7 +29,7 @@ import org.keycloak.OAuth2Constants; import org.keycloak.models.ClientModel; import org.keycloak.models.Constants; import org.keycloak.models.RealmModel; -import org.keycloak.services.managers.ClientManager; +import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.services.managers.RealmManager; import org.keycloak.testsuite.OAuthClient; import org.keycloak.testsuite.pages.ErrorPage; @@ -51,18 +51,18 @@ public class OAuthRedirectUriTest { public static KeycloakRule keycloakRule = new KeycloakRule(new KeycloakRule.KeycloakSetup() { @Override public void config(RealmManager manager, RealmModel adminstrationRealm, RealmModel appRealm) { - ClientModel installedApp = new ClientManager(manager).createClient(appRealm, "test-installed"); + ClientModel installedApp = KeycloakModelUtils.createClient(appRealm, "test-installed"); installedApp.setEnabled(true); installedApp.addRedirectUri(Constants.INSTALLED_APP_URN); installedApp.addRedirectUri(Constants.INSTALLED_APP_URL); installedApp.setSecret("password"); - ClientModel installedApp2 = new ClientManager(manager).createClient(appRealm, "test-installed2"); + ClientModel installedApp2 = KeycloakModelUtils.createClient(appRealm, "test-installed2"); installedApp2.setEnabled(true); installedApp2.addRedirectUri(Constants.INSTALLED_APP_URL + "/myapp"); installedApp2.setSecret("password"); - ClientModel installedApp3 = new ClientManager(manager).createClient(appRealm, "test-wildcard"); + ClientModel installedApp3 = KeycloakModelUtils.createClient(appRealm, "test-wildcard"); installedApp3.setEnabled(true); installedApp3.addRedirectUri("http://example.com/foo/*"); installedApp3.addRedirectUri("http://localhost:8081/foo/*"); diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/OfflineTokenTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/OfflineTokenTest.java old mode 100644 new mode 100755 index fab919f984..caa61edefd --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/OfflineTokenTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/OfflineTokenTest.java @@ -31,6 +31,7 @@ import org.keycloak.models.Constants; import org.keycloak.models.RealmModel; import org.keycloak.models.RoleModel; import org.keycloak.models.UserModel; +import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.protocol.oidc.TokenManager; import org.keycloak.representations.AccessToken; import org.keycloak.representations.RefreshToken; @@ -66,7 +67,7 @@ public class OfflineTokenTest { appRealm.setAccessTokenLifespan(10); appRealm.setSsoSessionIdleTimeout(30); - ClientModel app = new ClientManager(manager).createClient(appRealm, "offline-client"); + ClientModel app = KeycloakModelUtils.createClient(appRealm, "offline-client"); app.setDirectAccessGrantsEnabled(true); app.setSecret("secret1"); String testAppRedirectUri = appRealm.getClientByClientId("test-app").getRedirectUris().iterator().next(); diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/ResourceOwnerPasswordCredentialsGrantTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/ResourceOwnerPasswordCredentialsGrantTest.java index edb1bf2baf..c8e4f4c8f6 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/ResourceOwnerPasswordCredentialsGrantTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/ResourceOwnerPasswordCredentialsGrantTest.java @@ -11,9 +11,9 @@ import org.keycloak.authentication.authenticators.client.ClientIdAndSecretAuthen import org.keycloak.events.Details; import org.keycloak.events.Errors; import org.keycloak.models.*; +import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.representations.AccessToken; import org.keycloak.representations.RefreshToken; -import org.keycloak.services.managers.ClientManager; import org.keycloak.services.managers.RealmManager; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.OAuthClient; @@ -34,11 +34,11 @@ public class ResourceOwnerPasswordCredentialsGrantTest { public static KeycloakRule keycloakRule = new KeycloakRule(new KeycloakRule.KeycloakSetup() { @Override public void config(RealmManager manager, RealmModel adminstrationRealm, RealmModel appRealm) { - ClientModel app = new ClientManager(manager).createClient(appRealm, "resource-owner"); + ClientModel app = KeycloakModelUtils.createClient(appRealm, "resource-owner"); app.setDirectAccessGrantsEnabled(true); app.setSecret("secret"); - ClientModel app2 = new ClientManager(manager).createClient(appRealm, "resource-owner-public"); + ClientModel app2 = KeycloakModelUtils.createClient(appRealm, "resource-owner-public"); app2.setDirectAccessGrantsEnabled(true); app2.setPublicClient(true); diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/ServiceAccountTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/ServiceAccountTest.java old mode 100644 new mode 100755 index 80e3349c8b..6c9f32ec6d --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/ServiceAccountTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/ServiceAccountTest.java @@ -12,6 +12,7 @@ import org.keycloak.events.Errors; import org.keycloak.models.ClientModel; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; +import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.representations.AccessToken; import org.keycloak.representations.RefreshToken; import org.keycloak.services.managers.ClientManager; @@ -34,11 +35,11 @@ public class ServiceAccountTest { public static KeycloakRule keycloakRule = new KeycloakRule(new KeycloakRule.KeycloakSetup() { @Override public void config(RealmManager manager, RealmModel adminstrationRealm, RealmModel appRealm) { - ClientModel app = new ClientManager(manager).createClient(appRealm, "service-account-cl"); + ClientModel app = KeycloakModelUtils.createClient(appRealm, "service-account-cl"); app.setSecret("secret1"); new ClientManager(manager).enableServiceAccount(app); - ClientModel disabledApp = new ClientManager(manager).createClient(appRealm, "service-account-disabled"); + ClientModel disabledApp = KeycloakModelUtils.createClient(appRealm, "service-account-disabled"); disabledApp.setSecret("secret1"); UserModel serviceAccountUser = session.users().getUserByUsername(ServiceAccountConstants.SERVICE_ACCOUNT_USER_PREFIX + "service-account-cl", appRealm);