From 396e0c61713894adef51ff88183ef0e9ef20af61 Mon Sep 17 00:00:00 2001 From: Bill Burke Date: Tue, 3 Mar 2015 20:38:28 -0500 Subject: [PATCH] refactor mappers --- .../META-INF/jpa-changelog-1.2.0.Beta1.xml | 25 +- .../main/resources/META-INF/persistence.xml | 1 - .../idm/ApplicationRepresentation.java | 6 +- .../idm/ClaimTypeRepresentation.java | 45 ---- .../ClientProtocolMappingRepresentation.java | 26 -- .../idm/OAuthClientRepresentation.java | 6 +- .../idm/ProtocolMapperRepresentation.java | 9 - .../idm/RealmRepresentation.java | 10 - .../main/resources/theme/admin/base/index.ftl | 1 - .../theme/admin/base/resources/js/app.js | 90 +++---- .../resources/js/controllers/applications.js | 169 +++++++++---- .../resources/js/controllers/protocols.js | 125 ---------- .../theme/admin/base/resources/js/loaders.js | 14 +- .../theme/admin/base/resources/js/services.js | 11 +- .../partials/application-mappers-add.html | 4 +- .../partials/application-mappers.html | 7 +- .../resources/partials/protocol-list.html | 22 -- .../partials/protocol-mapper-detail.html | 26 +- .../partials/protocol-mapper-list.html | 41 ---- .../base/resources/partials/realm-menu.html | 1 - .../java/org/keycloak/models/ClientModel.java | 8 +- .../keycloak/models/ProtocolMapperModel.java | 9 - .../java/org/keycloak/models/RealmModel.java | 16 -- .../models/entities/ClaimTypeEntity.java | 53 ---- .../models/entities/ClientEntity.java | 6 +- .../models/entities/ProtocolMapperEntity.java | 9 - .../keycloak/models/entities/RealmEntity.java | 18 -- .../models/utils/ModelToRepresentation.java | 38 +-- .../models/utils/RepresentationToModel.java | 64 +---- .../keycloak/models/cache/ClientAdapter.java | 32 ++- .../keycloak/models/cache/RealmAdapter.java | 76 ------ .../models/cache/entities/CachedClient.java | 10 +- .../models/cache/entities/CachedRealm.java | 17 -- .../keycloak/models/jpa/ClientAdapter.java | 135 ++++++---- .../org/keycloak/models/jpa/RealmAdapter.java | 230 ++---------------- .../models/jpa/entities/ClaimTypeEntity.java | 82 ------- .../models/jpa/entities/ClientEntity.java | 3 +- .../jpa/entities/ProtocolMapperEntity.java | 25 +- .../models/jpa/entities/RealmEntity.java | 21 -- .../keycloak/adapters/ClientAdapter.java | 110 ++++++++- .../mongo/keycloak/adapters/RealmAdapter.java | 186 -------------- .../protocol/saml/SamlProtocolFactory.java | 38 ++- .../mappers/AttributeStatementHelper.java | 9 +- ...ttributeBasicAttributeStatementMapper.java | 7 +- ...eUriReferenceAttributeStatementMapper.java | 7 +- ...serModelBasicAttributeStatementMapper.java | 7 +- ...lUriReferenceAttributeStatementMapper.java | 8 +- .../AbstractLoginProtocolFactory.java | 22 +- .../protocol/LoginProtocolFactory.java | 6 + .../oidc/OIDCLoginProtocolFactory.java | 92 ++++--- .../mappers/OIDCAttributeMapperHelper.java | 10 +- .../oidc/mappers/OIDCUserAttributeMapper.java | 7 +- .../oidc/mappers/OIDCUserModelMapper.java | 7 +- .../resources/admin/ApplicationResource.java | 4 +- .../admin/ClientProtocolMappersResource.java | 120 --------- .../resources/admin/OAuthClientResource.java | 4 +- .../admin/ProtocolMappersResource.java | 40 ++- .../resources/admin/RealmAdminResource.java | 17 +- .../admin/ServerInfoAdminResource.java | 31 ++- 59 files changed, 640 insertions(+), 1583 deletions(-) delete mode 100755 core/src/main/java/org/keycloak/representations/idm/ClaimTypeRepresentation.java delete mode 100755 core/src/main/java/org/keycloak/representations/idm/ClientProtocolMappingRepresentation.java delete mode 100755 forms/common-themes/src/main/resources/theme/admin/base/resources/js/controllers/protocols.js delete mode 100755 forms/common-themes/src/main/resources/theme/admin/base/resources/partials/protocol-list.html delete mode 100755 forms/common-themes/src/main/resources/theme/admin/base/resources/partials/protocol-mapper-list.html delete mode 100755 model/api/src/main/java/org/keycloak/models/entities/ClaimTypeEntity.java delete mode 100755 model/jpa/src/main/java/org/keycloak/models/jpa/entities/ClaimTypeEntity.java delete mode 100755 services/src/main/java/org/keycloak/services/resources/admin/ClientProtocolMappersResource.java diff --git a/connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-1.2.0.Beta1.xml b/connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-1.2.0.Beta1.xml index b27e9bd616..f5109227e9 100755 --- a/connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-1.2.0.Beta1.xml +++ b/connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-1.2.0.Beta1.xml @@ -17,7 +17,7 @@ - + @@ -30,15 +30,6 @@ - - - - - - - - - @@ -82,33 +73,21 @@ - - - - - - - - - - - + - - diff --git a/connections/jpa/src/main/resources/META-INF/persistence.xml b/connections/jpa/src/main/resources/META-INF/persistence.xml index eff01c4ce4..8baedb3ddf 100755 --- a/connections/jpa/src/main/resources/META-INF/persistence.xml +++ b/connections/jpa/src/main/resources/META-INF/persistence.xml @@ -19,7 +19,6 @@ org.keycloak.models.jpa.entities.ScopeMappingEntity org.keycloak.models.jpa.entities.IdentityProviderEntity org.keycloak.models.jpa.entities.ClientIdentityProviderMappingEntity - org.keycloak.models.jpa.entities.ClaimTypeEntity org.keycloak.models.jpa.entities.ProtocolMapperEntity diff --git a/core/src/main/java/org/keycloak/representations/idm/ApplicationRepresentation.java b/core/src/main/java/org/keycloak/representations/idm/ApplicationRepresentation.java index 6537fc25df..88c8cff5e3 100755 --- a/core/src/main/java/org/keycloak/representations/idm/ApplicationRepresentation.java +++ b/core/src/main/java/org/keycloak/representations/idm/ApplicationRepresentation.java @@ -29,7 +29,7 @@ public class ApplicationRepresentation { protected Integer nodeReRegistrationTimeout; protected Map registeredNodes; protected List identityProviders; - protected List protocolMappers; + protected List protocolMappers; public String getId() { return id; @@ -199,11 +199,11 @@ public class ApplicationRepresentation { this.identityProviders = identityProviders; } - public List getProtocolMappers() { + public List getProtocolMappers() { return protocolMappers; } - public void setProtocolMappers(List protocolMappers) { + public void setProtocolMappers(List protocolMappers) { this.protocolMappers = protocolMappers; } } diff --git a/core/src/main/java/org/keycloak/representations/idm/ClaimTypeRepresentation.java b/core/src/main/java/org/keycloak/representations/idm/ClaimTypeRepresentation.java deleted file mode 100755 index 747c366fd1..0000000000 --- a/core/src/main/java/org/keycloak/representations/idm/ClaimTypeRepresentation.java +++ /dev/null @@ -1,45 +0,0 @@ -package org.keycloak.representations.idm; - -/** - * @author Bill Burke - * @version $Revision: 1 $ - */ -public class ClaimTypeRepresentation { - - private String id; - private String name; - private Boolean builtIn; - private String type; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public Boolean isBuiltIn() { - return builtIn; - } - - public void setBuiltIn(Boolean builtIn) { - this.builtIn = builtIn; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } -} diff --git a/core/src/main/java/org/keycloak/representations/idm/ClientProtocolMappingRepresentation.java b/core/src/main/java/org/keycloak/representations/idm/ClientProtocolMappingRepresentation.java deleted file mode 100755 index e5252b1c16..0000000000 --- a/core/src/main/java/org/keycloak/representations/idm/ClientProtocolMappingRepresentation.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.keycloak.representations.idm; - -/** - * @author Bill Burke - * @version $Revision: 1 $ - */ -public class ClientProtocolMappingRepresentation { - protected String protocol; - protected String name; - - public String getProtocol() { - return protocol; - } - - public void setProtocol(String protocol) { - this.protocol = protocol; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } -} diff --git a/core/src/main/java/org/keycloak/representations/idm/OAuthClientRepresentation.java b/core/src/main/java/org/keycloak/representations/idm/OAuthClientRepresentation.java index c12a9ebe60..e477be0a8d 100755 --- a/core/src/main/java/org/keycloak/representations/idm/OAuthClientRepresentation.java +++ b/core/src/main/java/org/keycloak/representations/idm/OAuthClientRepresentation.java @@ -22,7 +22,7 @@ public class OAuthClientRepresentation { protected Boolean directGrantsOnly; protected Boolean fullScopeAllowed; protected Boolean frontchannelLogout; - protected List protocolMappers; + protected List protocolMappers; private List identityProviders; @@ -146,11 +146,11 @@ public class OAuthClientRepresentation { this.identityProviders = identityProviders; } - public List getProtocolMappers() { + public List getProtocolMappers() { return protocolMappers; } - public void setProtocolMappers(List protocolMappers) { + public void setProtocolMappers(List protocolMappers) { this.protocolMappers = protocolMappers; } } diff --git a/core/src/main/java/org/keycloak/representations/idm/ProtocolMapperRepresentation.java b/core/src/main/java/org/keycloak/representations/idm/ProtocolMapperRepresentation.java index 4f132e106a..7637cb54a1 100755 --- a/core/src/main/java/org/keycloak/representations/idm/ProtocolMapperRepresentation.java +++ b/core/src/main/java/org/keycloak/representations/idm/ProtocolMapperRepresentation.java @@ -12,7 +12,6 @@ public class ProtocolMapperRepresentation { protected String name; protected String protocol; protected String protocolMapper; - protected boolean appliedByDefault; protected boolean consentRequired; protected String consentText; protected Map config = new HashMap(); @@ -42,14 +41,6 @@ public class ProtocolMapperRepresentation { this.protocol = protocol; } - public boolean isAppliedByDefault() { - return appliedByDefault; - } - - public void setAppliedByDefault(boolean appliedByDefault) { - this.appliedByDefault = appliedByDefault; - } - public String getProtocolMapper() { return protocolMapper; } diff --git a/core/src/main/java/org/keycloak/representations/idm/RealmRepresentation.java b/core/src/main/java/org/keycloak/representations/idm/RealmRepresentation.java index dc5ada6a6d..ae57f06565 100755 --- a/core/src/main/java/org/keycloak/representations/idm/RealmRepresentation.java +++ b/core/src/main/java/org/keycloak/representations/idm/RealmRepresentation.java @@ -64,7 +64,6 @@ public class RealmRepresentation { protected Long eventsExpiration; protected List eventsListeners; private List identityProviders; - private List claimTypes; private List protocolMappers; private Boolean identityFederationEnabled; @@ -484,15 +483,6 @@ public class RealmRepresentation { return !getIdentityProviders().isEmpty(); } - public List getClaimTypes() { - if (claimTypes == null) claimTypes = new ArrayList(); - return claimTypes; - } - - public void setClaimTypes(List claimTypes) { - this.claimTypes = claimTypes; - } - public List getProtocolMappers() { return protocolMappers; } diff --git a/forms/common-themes/src/main/resources/theme/admin/base/index.ftl b/forms/common-themes/src/main/resources/theme/admin/base/index.ftl index 9884c9b6e0..e4a8a19ea4 100755 --- a/forms/common-themes/src/main/resources/theme/admin/base/index.ftl +++ b/forms/common-themes/src/main/resources/theme/admin/base/index.ftl @@ -33,7 +33,6 @@ - diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/js/app.js b/forms/common-themes/src/main/resources/theme/admin/base/resources/js/app.js index 59f169fa77..3f39818c19 100755 --- a/forms/common-themes/src/main/resources/theme/admin/base/resources/js/app.js +++ b/forms/common-themes/src/main/resources/theme/admin/base/resources/js/app.js @@ -440,7 +440,7 @@ module.config([ '$routeProvider', function($routeProvider) { return ServerInfoLoader(); } }, - controller : 'ApplicationProtocolMapperCtrl' + controller : 'ApplicationProtocolMapperListCtrl' }) .when('/realms/:realm/applications/:application/add-mappers', { templateUrl : resourceUrl + '/partials/application-mappers-add.html', @@ -455,7 +455,41 @@ module.config([ '$routeProvider', function($routeProvider) { return ServerInfoLoader(); } }, - controller : 'AddApplicationProtocolMapperCtrl' + controller : 'AddBuiltinProtocolMapperCtrl' + }) + .when('/realms/:realm/applications/:application/mappers/:id', { + templateUrl : resourceUrl + '/partials/protocol-mapper-detail.html', + resolve : { + realm : function(RealmLoader) { + return RealmLoader(); + }, + application : function(ApplicationLoader) { + return ApplicationLoader(); + }, + serverInfo : function(ServerInfoLoader) { + return ServerInfoLoader(); + }, + mapper : function(ApplicationProtocolMapperLoader) { + return ApplicationProtocolMapperLoader(); + } + + }, + controller : 'ApplicationProtocolMapperCtrl' + }) + .when('/create/application/:realm/:application/mappers', { + templateUrl : resourceUrl + '/partials/protocol-mapper-detail.html', + resolve : { + realm : function(RealmLoader) { + return RealmLoader(); + }, + serverInfo : function(ServerInfoLoader) { + return ServerInfoLoader(); + }, + application : function(ApplicationLoader) { + return ApplicationLoader(); + } + }, + controller : 'ApplicationProtocolMapperCreateCtrl' }) .when('/realms/:realm/applications/:application/sessions', { templateUrl : resourceUrl + '/partials/application-sessions.html', @@ -974,59 +1008,7 @@ module.config([ '$routeProvider', function($routeProvider) { }, controller : 'ProtocolListCtrl' }) - .when('/realms/:realm/protocols/:protocol/mappers', { - templateUrl : resourceUrl + '/partials/protocol-mapper-list.html', - resolve : { - realm : function(RealmLoader) { - return RealmLoader(); - }, - serverInfo : function(ServerInfoLoader) { - return ServerInfoLoader(); - }, - protocol : function($route) { - return $route.current.params.protocol; - }, - mappers : function(RealmProtocolMappersByProtocolLoader) { - return RealmProtocolMappersByProtocolLoader(); - } - }, - controller : 'ProtocolMapperListCtrl' - }) - .when('/realms/:realm/protocols/:protocol/mappers/:id', { - templateUrl : resourceUrl + '/partials/protocol-mapper-detail.html', - resolve : { - realm : function(RealmLoader) { - return RealmLoader(); - }, - serverInfo : function(ServerInfoLoader) { - return ServerInfoLoader(); - }, - protocol : function($route) { - return $route.current.params.protocol; - }, - mapper : function(RealmProtocolMapperLoader) { - return RealmProtocolMapperLoader(); - } - - }, - controller : 'ProtocolMapperCtrl' - }) - .when('/create/protocols/:protocol/realms/:realm/mappers', { - templateUrl : resourceUrl + '/partials/protocol-mapper-detail.html', - resolve : { - realm : function(RealmLoader) { - return RealmLoader(); - }, - serverInfo : function(ServerInfoLoader) { - return ServerInfoLoader(); - }, - protocol : function($route) { - return $route.current.params.protocol; - } - }, - controller : 'ProtocolMapperCreateCtrl' - }) .when('/server-info', { templateUrl : resourceUrl + '/partials/server-info.html' diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/js/controllers/applications.js b/forms/common-themes/src/main/resources/theme/admin/base/resources/js/controllers/applications.js index f617bc26dd..a03344f5d5 100755 --- a/forms/common-themes/src/main/resources/theme/admin/base/resources/js/controllers/applications.js +++ b/forms/common-themes/src/main/resources/theme/admin/base/resources/js/controllers/applications.js @@ -1086,7 +1086,7 @@ module.controller('ApplicationClusteringNodeCtrl', function($scope, application, } }); -module.controller('ApplicationProtocolMapperCtrl', function($scope, realm, application, serverInfo, +module.controller('ApplicationProtocolMapperListCtrl', function($scope, realm, application, serverInfo, ApplicationProtocolMappersByProtocol, $http, $location, Dialog, Notifications) { $scope.realm = realm; @@ -1105,35 +1105,12 @@ module.controller('ApplicationProtocolMapperCtrl', function($scope, realm, appli var updateMappers = function() { $scope.mappers = ApplicationProtocolMappersByProtocol.query({realm : realm.realm, application : application.id, protocol : application.protocol}); - - for (var i = 0; i < $scope.mappers.length; i++) { - $scope.mappers[i].isChecked = false; - } }; updateMappers(); - - $scope.remove = function() { - var toDelete = []; - for (var i = 0; i < $scope.mappers.length; i++) { - if ($scope.mappers[i].isChecked) { - toDelete.push($scope.mappers[i].id); - } - } - $http.delete(authUrl + '/admin/realms/' + realm.realm + '/applications-by-id/' + application.id + '/protocol-mappers/models', - {data : toDelete, headers : {"content-type" : "application/json"}}).success(function() { - Notifications.success("Mappers removed"); - updateMappers(); - }).error(function() { - updateMappers(); - Notifications.error("Error removing mappers"); - }); - }; - }); -module.controller('AddApplicationProtocolMapperCtrl', function($scope, realm, application, serverInfo, - RealmProtocolMappersByProtocol, +module.controller('AddBuiltinProtocolMapperCtrl', function($scope, realm, application, serverInfo, ApplicationProtocolMappersByProtocol, $http, $location, Dialog, Notifications) { $scope.realm = realm; @@ -1150,27 +1127,31 @@ module.controller('AddApplicationProtocolMapperCtrl', function($scope, realm, ap $scope.mapperTypes = mapperTypes; + + var updateMappers = function() { - var mappers = RealmProtocolMappersByProtocol.query({realm : realm.realm, protocol : application.protocol}, function() { - var appMappers = ApplicationProtocolMappersByProtocol.query({realm : realm.realm, application : application.id, protocol : application.protocol}, function() { - for (var i = 0; i < appMappers.length; i++) { - for (var j = 0; j < mappers.length; j++) { - if (mappers[j].id == appMappers[i].id) { - mappers.remove(j); - break; - } + var appMappers = ApplicationProtocolMappersByProtocol.query({realm : realm.realm, application : application.id, protocol : application.protocol}, function() { + var builtinMappers = serverInfo.builtinProtocolMappers[application.protocol]; + for (var i = 0; i < appMappers.length; i++) { + for (var j = 0; j < builtinMappers.length; j++) { + if (builtinMappers[j].name == appMappers[i].name + && builtinMappers[j].protocolMapper == appMappers[i].protocolMapper) { + console.log('removing: ' + builtinMappers[j].name); + builtinMappers.splice(j, 1); + break; } } - $scope.mappers = mappers; - for (var i = 0; i < $scope.mappers.length; i++) { - $scope.mappers[i].isChecked = false; - } + } + for (var j = 0; j < builtinMappers.length; j++) { + console.log('builtin left: ' + builtinMappers[j].name); + } + $scope.mappers = builtinMappers; + for (var i = 0; i < $scope.mappers.length; i++) { + $scope.mappers[i].isChecked = false; + } - }) - - }) - + }); }; updateMappers(); @@ -1179,10 +1160,11 @@ module.controller('AddApplicationProtocolMapperCtrl', function($scope, realm, ap var toAdd = []; for (var i = 0; i < $scope.mappers.length; i++) { if ($scope.mappers[i].isChecked) { - toAdd.push($scope.mappers[i].id); + delete $scope.mappers[i].isChecked; + toAdd.push($scope.mappers[i]); } } - $http.post(authUrl + '/admin/realms/' + realm.realm + '/applications-by-id/' + application.id + '/protocol-mappers/models', + $http.post(authUrl + '/admin/realms/' + realm.realm + '/applications-by-id/' + application.id + '/protocol-mappers/add-models', toAdd).success(function() { Notifications.success("Mappers added"); $location.url('/realms/' + realm.realm + '/applications/' + application.id + '/mappers'); @@ -1194,5 +1176,106 @@ module.controller('AddApplicationProtocolMapperCtrl', function($scope, realm, ap }); +module.controller('ApplicationProtocolMapperCtrl', function($scope, realm, serverInfo, application, mapper, ApplicationProtocolMapper, Notifications, Dialog, $location) { + $scope.realm = realm; + $scope.application = application; + $scope.create = false; + var protocol = application.protocol; + $scope.protocol = application.protocol; + $scope.mapper = angular.copy(mapper); + var oldCopy = angular.copy($scope.realm); + $scope.changed = false; + $scope.boolval = true; + $scope.boolvalId = 'boolval'; + + console.log('protocol: ' + protocol); + var protocolMappers = serverInfo.protocolMapperTypes[protocol]; + for (var i = 0; i < protocolMappers.length; i++) { + if (protocolMappers[i].id == mapper.protocolMapper) { + $scope.mapperType = protocolMappers[i]; + } + } + $scope.$watch(function() { + return $location.path(); + }, function() { + $scope.path = $location.path().substring(1).split("/"); + }); + + $scope.$watch('mapper', function() { + if (!angular.equals($scope.mapper, mapper)) { + $scope.changed = true; + } + }, true); + + $scope.save = function() { + ApplicationProtocolMapper.update({ + realm : realm.realm, + application: application.id, + id : mapper.id + }, $scope.mapper, function() { + $scope.changed = false; + mapper = angular.copy($scope.mapper); + $location.url("/realms/" + realm.realm + '/applications/' + application.id + "/mappers/" + mapper.id); + Notifications.success("Your changes have been saved."); + }); + }; + + $scope.reset = function() { + $scope.mapper = angular.copy(mapper); + $scope.changed = false; + }; + + $scope.cancel = function() { + //$location.url("/realms"); + window.history.back(); + }; + + $scope.remove = function() { + Dialog.confirmDelete($scope.mapper.name, 'mapper', function() { + ApplicationProtocolMapper.remove({ realm: realm.realm, application: application.id, id : $scope.mapper.id }, function() { + Notifications.success("The mapper has been deleted."); + $location.url("/realms/" + realm.realm + '/applications/' + application.id + "/mappers"); + }); + }); + }; + +}); + +module.controller('ApplicationProtocolMapperCreateCtrl', function($scope, realm, serverInfo, application, ApplicationProtocolMapper, Notifications, Dialog, $location) { + $scope.realm = realm; + $scope.application = application; + $scope.create = true; + var protocol = application.protocol; + $scope.protocol = protocol; + $scope.mapper = { protocol : application.protocol, config: {}}; + $scope.mapperTypes = serverInfo.protocolMapperTypes[protocol]; + + $scope.$watch(function() { + return $location.path(); + }, function() { + $scope.path = $location.path().substring(1).split("/"); + }); + + $scope.save = function() { + $scope.mapper.protocolMapper = $scope.mapperType.id; + ApplicationProtocolMapper.save({ + realm : realm.realm, application: application.id + }, $scope.mapper, function(data, headers) { + var l = headers().location; + var id = l.substring(l.lastIndexOf("/") + 1); + $location.url("/realms/" + realm.realm + '/applications/' + application.id + "/mappers/" + id); + Notifications.success("Mapper has been created."); + }); + }; + + $scope.cancel = function() { + //$location.url("/realms"); + window.history.back(); + }; + + +}); + + diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/js/controllers/protocols.js b/forms/common-themes/src/main/resources/theme/admin/base/resources/js/controllers/protocols.js deleted file mode 100755 index b1b29565c6..0000000000 --- a/forms/common-themes/src/main/resources/theme/admin/base/resources/js/controllers/protocols.js +++ /dev/null @@ -1,125 +0,0 @@ -module.controller('ProtocolListCtrl', function($scope, realm, serverInfo, $location) { - $scope.realm = realm; - $scope.protocols = serverInfo.protocols; - $scope.$watch(function() { - return $location.path(); - }, function() { - $scope.path = $location.path().substring(1).split("/"); - }); -}); - -module.controller('ProtocolMapperListCtrl', function($scope, realm, serverInfo, protocol, mappers, $location) { - $scope.realm = realm; - $scope.protocol = protocol; - var protocolMappers = serverInfo.protocolMapperTypes[protocol]; - var mapperTypes = {}; - for (var i = 0; i < protocolMappers.length; i++) { - mapperTypes[protocolMappers[i].id] = protocolMappers[i]; - } - $scope.mapperTypes = mapperTypes; - - $scope.mappers = mappers; - $scope.$watch(function() { - return $location.path(); - }, function() { - $scope.path = $location.path().substring(1).split("/"); - }); -}); - -module.controller('ProtocolMapperCtrl', function($scope, realm, serverInfo, protocol, mapper, RealmProtocolMapper, Notifications, Dialog, $location) { - $scope.realm = realm; - $scope.create = false; - $scope.protocol = protocol; - $scope.mapper = angular.copy(mapper); - var oldCopy = angular.copy($scope.realm); - $scope.changed = false; - $scope.boolval = true; - $scope.boolvalId = 'boolval'; - - console.log('protocol: ' + protocol); - var protocolMappers = serverInfo.protocolMapperTypes[protocol]; - for (var i = 0; i < protocolMappers.length; i++) { - if (protocolMappers[i].id == mapper.protocolMapper) { - $scope.mapperType = protocolMappers[i]; - } - } - $scope.$watch(function() { - return $location.path(); - }, function() { - $scope.path = $location.path().substring(1).split("/"); - }); - - $scope.$watch('mapper', function() { - if (!angular.equals($scope.mapper, mapper)) { - $scope.changed = true; - } - }, true); - - $scope.save = function() { - RealmProtocolMapper.update({ - realm : realm.realm, - id : mapper.id - }, $scope.mapper, function() { - $scope.changed = false; - mapper = angular.copy($scope.mapper); - $location.url("/realms/" + realm.realm + "/protocols/" + protocol + "/mappers/" + mapper.id); - Notifications.success("Your changes have been saved."); - }); - }; - - $scope.reset = function() { - $scope.mapper = angular.copy(mapper); - $scope.changed = false; - }; - - $scope.cancel = function() { - //$location.url("/realms"); - window.history.back(); - }; - - $scope.remove = function() { - Dialog.confirmDelete($scope.mapper.name, 'mapper', function() { - RealmProtocolMapper.remove({ realm: realm.realm, id : $scope.mapper.id }, function() { - Notifications.success("The mapper has been deleted."); - $location.url("/realms/" + realm.realm + "/protocols/" + protocol + "/mappers"); - }); - }); - }; - -}); - -module.controller('ProtocolMapperCreateCtrl', function($scope, realm, serverInfo, protocol, RealmProtocolMapper, Notifications, Dialog, $location) { - $scope.realm = realm; - $scope.create = true; - $scope.protocol = protocol; - $scope.mapper = { protocol : protocol, config: {}}; - $scope.mapperTypes = serverInfo.protocolMapperTypes[protocol]; - - $scope.$watch(function() { - return $location.path(); - }, function() { - $scope.path = $location.path().substring(1).split("/"); - }); - - $scope.save = function() { - $scope.mapper.protocolMapper = $scope.mapperType.id; - RealmProtocolMapper.save({ - realm : realm.realm - }, $scope.mapper, function(data, headers) { - var l = headers().location; - var id = l.substring(l.lastIndexOf("/") + 1); - $location.url("/realms/" + realm.realm + "/protocols/" + protocol + "/mappers/" + id); - Notifications.success("Mapper has been created."); - }); - }; - - $scope.cancel = function() { - //$location.url("/realms"); - window.history.back(); - }; - - -}); - - - diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/js/loaders.js b/forms/common-themes/src/main/resources/theme/admin/base/resources/js/loaders.js index 9793cb0412..decbbff93e 100755 --- a/forms/common-themes/src/main/resources/theme/admin/base/resources/js/loaders.js +++ b/forms/common-themes/src/main/resources/theme/admin/base/resources/js/loaders.js @@ -79,19 +79,11 @@ module.factory('RealmApplicationSessionStatsLoader', function(Loader, RealmAppli }); }); -module.factory('RealmProtocolMappersByProtocolLoader', function(Loader, RealmProtocolMappersByProtocol, $route, $q) { - return Loader.query(RealmProtocolMappersByProtocol, function() { - return { - realm : $route.current.params.realm, - protocol: $route.current.params.protocol - } - }); -}); - -module.factory('RealmProtocolMapperLoader', function(Loader, RealmProtocolMapper, $route, $q) { - return Loader.get(RealmProtocolMapper, function() { +module.factory('ApplicationProtocolMapperLoader', function(Loader, ApplicationProtocolMapper, $route, $q) { + return Loader.get(ApplicationProtocolMapper, function() { return { realm : $route.current.params.realm, + application : $route.current.params.application, id: $route.current.params.id } }); diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/js/services.js b/forms/common-themes/src/main/resources/theme/admin/base/resources/js/services.js index a0c538325d..b6e306b896 100755 --- a/forms/common-themes/src/main/resources/theme/admin/base/resources/js/services.js +++ b/forms/common-themes/src/main/resources/theme/admin/base/resources/js/services.js @@ -188,15 +188,10 @@ module.factory('ServerInfo', function($resource) { return $resource(authUrl + '/admin/serverinfo'); }); -module.factory('RealmProtocolMappersByProtocol', function($resource) { - return $resource(authUrl + '/admin/realms/:realm/protocol-mappers/protocol/:protocol', { - realm : '@realm', - protocol : "@protocol" - }); -}); -module.factory('RealmProtocolMapper', function($resource) { - return $resource(authUrl + '/admin/realms/:realm/protocol-mappers/models/:id', { +module.factory('ApplicationProtocolMapper', function($resource) { + return $resource(authUrl + '/admin/realms/:realm/applications-by-id/:application/protocol-mappers/models/:id', { realm : '@realm', + application: '@application', id : "@id" }, { update : { diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-mappers-add.html b/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-mappers-add.html index 5d1520afec..95c4eead09 100755 --- a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-mappers-add.html +++ b/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-mappers-add.html @@ -6,9 +6,9 @@
  • Applications
  • {{application.name}}
  • {{application.name}} Mappers
    • -
  • Add Protocol Mappers
    • +
  • Add Builtin Protocol Mappers
    • -

    {{realm.realm}} Add {{application.name}} {{application.protocol}} Protocol Mappers

    +

    {{realm.realm}} Add Builtin Protocol Mappers

    diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-mappers.html b/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-mappers.html index edaf8cc04a..c9c14fede4 100755 --- a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-mappers.html +++ b/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/application-mappers.html @@ -21,9 +21,8 @@
    - Create + Create Add Builtin -
    @@ -31,15 +30,13 @@ - - + - diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/protocol-list.html b/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/protocol-list.html deleted file mode 100755 index 383815aa1e..0000000000 --- a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/protocol-list.html +++ /dev/null @@ -1,22 +0,0 @@ -
    -
    -

    -
    -

    {{realm.realm}} Client Protocols

    -
    Name Category TypeRemove
    {{mapper.name}}{{mapper.name}} {{mapperTypes[mapper.protocolMapper].category}} {{mapperTypes[mapper.protocolMapper].name}}
    No mappers available
    - - - - - - - - - - - - - -
    Protocol Name
    {{protocol}}
    No protocols available
    - - \ No newline at end of file diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/protocol-mapper-detail.html b/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/protocol-mapper-detail.html index 6ec92d3cc0..25be1f11d0 100755 --- a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/protocol-mapper-detail.html +++ b/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/protocol-mapper-detail.html @@ -1,20 +1,22 @@
    - +
    -
      -
    1. Protocol Mappers
      2. -
    2. {{mapper.name}}
      3. -
    3. Protocol Mapper
      4. -
      -
    1. Protocol Mappers
      2. -
    2. Add Protocol Mapper
      3. +
    3. Applications
      4. +
    4. {{application.name}}
      5. +
    5. Protocol Mappers
      6. +
    6. Create Protocol Mapper
    -

    Protocol Mapper Settings

    -

    Add Protocol Mapper

    + +
      +
    1. Applications
      2. +
    2. {{application.name}}
      3. +
    3. Protocol Mappers
      4. +
    4. {{mapper.name}}
      5. +
    +

    {{mapper.name}} Protocol Mapper

    +

    Create Protocol Mapper

    * Required fields

    diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/protocol-mapper-list.html b/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/protocol-mapper-list.html deleted file mode 100755 index e3a7970bb1..0000000000 --- a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/protocol-mapper-list.html +++ /dev/null @@ -1,41 +0,0 @@ -
    -
    -

    -
    -

    {{realm.realm}} {{protocol}} Protocol Mappers

    - - - - - - - - - - - - - - - - - - - - - -
    -
    - - -
    -
    - Create -
    -
    NameCategoryType
    {{mapper.name}}{{mapperTypes[mapper.protocolMapper].category}}{{mapperTypes[mapper.protocolMapper].name}}
    No mappers available
    -
    -
    \ No newline at end of file diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-menu.html b/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-menu.html index a8d3aab9c5..8415ba23ee 100755 --- a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-menu.html +++ b/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-menu.html @@ -14,7 +14,6 @@
  • Applications
  • OAuth Clients
  • Sessions and Tokens
    • -
  • Protocol Settings
  • Security Defenses
  • Events
    • \ No newline at end of file diff --git a/model/api/src/main/java/org/keycloak/models/ClientModel.java b/model/api/src/main/java/org/keycloak/models/ClientModel.java index 3ebdc2aac7..5f66b7d4ae 100755 --- a/model/api/src/main/java/org/keycloak/models/ClientModel.java +++ b/model/api/src/main/java/org/keycloak/models/ClientModel.java @@ -104,7 +104,9 @@ public interface ClientModel { boolean isAllowedRetrieveTokenFromIdentityProvider(String providerId); Set getProtocolMappers(); - void addProtocolMappers(Set mapperIds); - void removeProtocolMappers(Set mapperIds); - void setProtocolMappers(Set mapperIds); + ProtocolMapperModel addProtocolMapper(ProtocolMapperModel model); + void removeProtocolMapper(ProtocolMapperModel mapping); + void updateProtocolMapper(ProtocolMapperModel mapping); + public ProtocolMapperModel getProtocolMapperById(String id); + public ProtocolMapperModel getProtocolMapperByName(String protocol, String name); } diff --git a/model/api/src/main/java/org/keycloak/models/ProtocolMapperModel.java b/model/api/src/main/java/org/keycloak/models/ProtocolMapperModel.java index f27a9ea5ee..34294751aa 100755 --- a/model/api/src/main/java/org/keycloak/models/ProtocolMapperModel.java +++ b/model/api/src/main/java/org/keycloak/models/ProtocolMapperModel.java @@ -18,7 +18,6 @@ public class ProtocolMapperModel { protected String protocolMapper; protected boolean consentRequired; protected String consentText; - protected boolean appliedByDefault; protected Map config; @@ -46,14 +45,6 @@ public class ProtocolMapperModel { this.protocol = protocol; } - public boolean isAppliedByDefault() { - return appliedByDefault; - } - - public void setAppliedByDefault(boolean appliedByDefault) { - this.appliedByDefault = appliedByDefault; - } - public String getProtocolMapper() { return protocolMapper; } diff --git a/model/api/src/main/java/org/keycloak/models/RealmModel.java b/model/api/src/main/java/org/keycloak/models/RealmModel.java index f70f8255a5..d002fd0bed 100755 --- a/model/api/src/main/java/org/keycloak/models/RealmModel.java +++ b/model/api/src/main/java/org/keycloak/models/RealmModel.java @@ -20,7 +20,6 @@ public interface RealmModel extends RoleContainerModel { RealmModel getCreatedRealm(); } interface ClientCreationEvent extends ProviderEvent { - RealmModel getCreatedRealm(); ClientModel getCreatedClient(); } interface ApplicationCreationEvent extends ClientCreationEvent { @@ -237,19 +236,4 @@ public interface RealmModel extends RoleContainerModel { ClientModel findClientById(String id); boolean isIdentityFederationEnabled(); - - Set getClaimTypes(); - ClaimTypeModel addClaimType(ClaimTypeModel model); - void removeClaimType(ClaimTypeModel claimType); - ClaimTypeModel getClaimType(String name); - void updateClaimType(ClaimTypeModel claimType); - - Set getProtocolMappers(); - ProtocolMapperModel addProtocolMapper(ProtocolMapperModel model); - void removeProtocolMapper(ProtocolMapperModel mapping); - void updateProtocolMapper(ProtocolMapperModel mapping); - public ProtocolMapperModel getProtocolMapperById(String id); - public ProtocolMapperModel getProtocolMapperByName(String protocol, String name); - - } diff --git a/model/api/src/main/java/org/keycloak/models/entities/ClaimTypeEntity.java b/model/api/src/main/java/org/keycloak/models/entities/ClaimTypeEntity.java deleted file mode 100755 index 93572cde8b..0000000000 --- a/model/api/src/main/java/org/keycloak/models/entities/ClaimTypeEntity.java +++ /dev/null @@ -1,53 +0,0 @@ -package org.keycloak.models.entities; - -import org.keycloak.models.ClaimTypeModel; - -/** - * @author Bill Burke - * @version $Revision: 1 $ - */ -public class ClaimTypeEntity { - protected String id; - - private String name; - - protected boolean builtIn; - - protected ClaimTypeModel.ValueType type; - - private String realmId; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public boolean isBuiltIn() { - return builtIn; - } - - public void setBuiltIn(boolean builtIn) { - this.builtIn = builtIn; - } - - public ClaimTypeModel.ValueType getType() { - return type; - } - - public void setType(ClaimTypeModel.ValueType type) { - this.type = type; - } - -} - diff --git a/model/api/src/main/java/org/keycloak/models/entities/ClientEntity.java b/model/api/src/main/java/org/keycloak/models/entities/ClientEntity.java index 134d1bfaf1..8ba2ef0b6c 100755 --- a/model/api/src/main/java/org/keycloak/models/entities/ClientEntity.java +++ b/model/api/src/main/java/org/keycloak/models/entities/ClientEntity.java @@ -30,7 +30,7 @@ public class ClientEntity extends AbstractIdentifiableEntity { private List redirectUris = new ArrayList(); private List scopeIds = new ArrayList(); private List identityProviders = new ArrayList(); - private Set protocolMappers = new HashSet(); + private List protocolMappers = new ArrayList(); public String getName() { return name; @@ -152,11 +152,11 @@ public class ClientEntity extends AbstractIdentifiableEntity { this.identityProviders = identityProviders; } - public Set getProtocolMappers() { + public List getProtocolMappers() { return protocolMappers; } - public void setProtocolMappers(Set protocolMappers) { + public void setProtocolMappers(List protocolMappers) { this.protocolMappers = protocolMappers; } } diff --git a/model/api/src/main/java/org/keycloak/models/entities/ProtocolMapperEntity.java b/model/api/src/main/java/org/keycloak/models/entities/ProtocolMapperEntity.java index 13f4cfc333..21330e59c5 100755 --- a/model/api/src/main/java/org/keycloak/models/entities/ProtocolMapperEntity.java +++ b/model/api/src/main/java/org/keycloak/models/entities/ProtocolMapperEntity.java @@ -13,7 +13,6 @@ public class ProtocolMapperEntity { protected String name; protected String protocol; protected String protocolMapper; - protected boolean appliedByDefault; protected boolean consentRequired; protected String consentText; protected Map config; @@ -42,14 +41,6 @@ public class ProtocolMapperEntity { this.protocol = protocol; } - public boolean isAppliedByDefault() { - return appliedByDefault; - } - - public void setAppliedByDefault(boolean appliedByDefault) { - this.appliedByDefault = appliedByDefault; - } - public String getProtocolMapper() { return protocolMapper; } diff --git a/model/api/src/main/java/org/keycloak/models/entities/RealmEntity.java b/model/api/src/main/java/org/keycloak/models/entities/RealmEntity.java index b511a32896..47a97a84a5 100755 --- a/model/api/src/main/java/org/keycloak/models/entities/RealmEntity.java +++ b/model/api/src/main/java/org/keycloak/models/entities/RealmEntity.java @@ -52,8 +52,6 @@ public class RealmEntity extends AbstractIdentifiableEntity { private List requiredCredentials = new ArrayList(); private List userFederationProviders = new ArrayList(); private List identityProviders = new ArrayList(); - private List claimTypes = new ArrayList(); - private List protocolMappers = new ArrayList(); private Map browserSecurityHeaders = new HashMap(); private Map smtpConfig = new HashMap(); @@ -392,22 +390,6 @@ public class RealmEntity extends AbstractIdentifiableEntity { public void setCertificatePem(String certificatePem) { this.certificatePem = certificatePem; } - - public List getClaimTypes() { - return claimTypes; - } - - public void setClaimTypes(List claimTypes) { - this.claimTypes = claimTypes; - } - - public List getProtocolMappers() { - return protocolMappers; - } - - public void setProtocolMappers(List protocolMappers) { - this.protocolMappers = protocolMappers; - } } diff --git a/model/api/src/main/java/org/keycloak/models/utils/ModelToRepresentation.java b/model/api/src/main/java/org/keycloak/models/utils/ModelToRepresentation.java index 7bd7cfaecc..c90afb5836 100755 --- a/model/api/src/main/java/org/keycloak/models/utils/ModelToRepresentation.java +++ b/model/api/src/main/java/org/keycloak/models/utils/ModelToRepresentation.java @@ -2,7 +2,6 @@ package org.keycloak.models.utils; import org.keycloak.models.ApplicationModel; import org.keycloak.models.ClaimMask; -import org.keycloak.models.ClaimTypeModel; import org.keycloak.models.ClientIdentityProviderMappingModel; import org.keycloak.models.ClientModel; import org.keycloak.models.ClientSessionModel; @@ -19,9 +18,7 @@ import org.keycloak.models.UserModel; import org.keycloak.models.UserSessionModel; import org.keycloak.representations.idm.ApplicationRepresentation; import org.keycloak.representations.idm.ClaimRepresentation; -import org.keycloak.representations.idm.ClaimTypeRepresentation; import org.keycloak.representations.idm.ClientIdentityProviderMappingRepresentation; -import org.keycloak.representations.idm.ClientProtocolMappingRepresentation; import org.keycloak.representations.idm.CredentialRepresentation; import org.keycloak.representations.idm.FederatedIdentityRepresentation; import org.keycloak.representations.idm.IdentityProviderRepresentation; @@ -156,14 +153,6 @@ public class ModelToRepresentation { rep.addIdentityProvider(toRepresentation(provider)); } - for (ClaimTypeModel claimType : realm.getClaimTypes()) { - rep.getClaimTypes().add(toRepresentation(claimType)); - } - - for (ProtocolMapperModel mapping : realm.getProtocolMappers()) { - rep.addProtocolMapper(toRepresentation(mapping)); - } - return rep; } @@ -269,11 +258,9 @@ public class ModelToRepresentation { } if (!applicationModel.getProtocolMappers().isEmpty()) { - List mappings = new LinkedList(); + List mappings = new LinkedList(); for (ProtocolMapperModel model : applicationModel.getProtocolMappers()) { - ClientProtocolMappingRepresentation map = new ClientProtocolMappingRepresentation(); - map.setProtocol(model.getProtocol()); - map.setName(model.getName()); + mappings.add(toRepresentation(model)); } rep.setProtocolMappers(mappings); } @@ -323,13 +310,11 @@ public class ModelToRepresentation { } if (!model.getProtocolMappers().isEmpty()) { - List mappings = new LinkedList(); - for (ProtocolMapperModel mapping : model.getProtocolMappers()) { - ClientProtocolMappingRepresentation map = new ClientProtocolMappingRepresentation(); - map.setProtocol(mapping.getProtocol()); - map.setName(mapping.getName()); - } - rep.setProtocolMappers(mappings); + List mappings = new LinkedList(); + for (ProtocolMapperModel mapper : model.getProtocolMappers()) { + mappings.add(toRepresentation(mapper)); + } + rep.setProtocolMappers(mappings); } return rep; @@ -373,18 +358,9 @@ public class ModelToRepresentation { rep.setConfig(config); rep.setName(model.getName()); rep.setProtocolMapper(model.getProtocolMapper()); - rep.setAppliedByDefault(model.isAppliedByDefault()); rep.setConsentText(model.getConsentText()); rep.setConsentRequired(model.isConsentRequired()); return rep; } - public static ClaimTypeRepresentation toRepresentation(ClaimTypeModel claimType) { - ClaimTypeRepresentation rep = new ClaimTypeRepresentation(); - rep.setId(claimType.getId()); - rep.setName(claimType.getName()); - rep.setBuiltIn(claimType.isBuiltIn()); - rep.setType(claimType.getType().name().toLowerCase()); - return rep; - } } diff --git a/model/api/src/main/java/org/keycloak/models/utils/RepresentationToModel.java b/model/api/src/main/java/org/keycloak/models/utils/RepresentationToModel.java index f24a094c24..a986de55da 100755 --- a/model/api/src/main/java/org/keycloak/models/utils/RepresentationToModel.java +++ b/model/api/src/main/java/org/keycloak/models/utils/RepresentationToModel.java @@ -6,7 +6,6 @@ import org.keycloak.enums.SslRequired; import org.keycloak.models.ApplicationModel; import org.keycloak.models.BrowserSecurityHeaders; import org.keycloak.models.ClaimMask; -import org.keycloak.models.ClaimTypeModel; import org.keycloak.models.ClientIdentityProviderMappingModel; import org.keycloak.models.ClientModel; import org.keycloak.models.FederatedIdentityModel; @@ -23,9 +22,7 @@ import org.keycloak.models.UserFederationProviderModel; import org.keycloak.models.UserModel; import org.keycloak.representations.idm.ApplicationRepresentation; import org.keycloak.representations.idm.ClaimRepresentation; -import org.keycloak.representations.idm.ClaimTypeRepresentation; import org.keycloak.representations.idm.ClientIdentityProviderMappingRepresentation; -import org.keycloak.representations.idm.ClientProtocolMappingRepresentation; import org.keycloak.representations.idm.CredentialRepresentation; import org.keycloak.representations.idm.FederatedIdentityRepresentation; import org.keycloak.representations.idm.IdentityProviderRepresentation; @@ -120,8 +117,6 @@ public class RepresentationToModel { if (rep.getPasswordPolicy() != null) newRealm.setPasswordPolicy(new PasswordPolicy(rep.getPasswordPolicy())); importIdentityProviders(rep, newRealm); - importClaimTypes(rep, newRealm); - importProtocolMappers(rep, newRealm); if (rep.getApplications() != null) { Map appMap = createApplications(rep, newRealm); @@ -458,15 +453,13 @@ public class RepresentationToModel { } if (resourceRep.getProtocolMappers() != null) { - Set ids = new HashSet(); - for (ClientProtocolMappingRepresentation map : resourceRep.getProtocolMappers()) { - ProtocolMapperModel mapperModel = applicationModel.getRealm().getProtocolMapperByName(map.getProtocol(), map.getName()); - if (mapperModel != null) { - ids.add(mapperModel.getId()); - } + // first, remove all default/built in mappers + Set mappers = applicationModel.getProtocolMappers(); + for (ProtocolMapperModel mapper : mappers) applicationModel.removeProtocolMapper(mapper); + for (ProtocolMapperRepresentation mapper : resourceRep.getProtocolMappers()) { + applicationModel.addProtocolMapper(toModel(mapper)); } - applicationModel.setProtocolMappers(ids); } applicationModel.updateAllowedIdentityProviders(toModel(resourceRep.getIdentityProviders(), realm)); @@ -636,15 +629,13 @@ public class RepresentationToModel { updateClientIdentityProvides(rep.getIdentityProviders(), model); if (rep.getProtocolMappers() != null) { - Set ids = new HashSet(); - for (ClientProtocolMappingRepresentation map : rep.getProtocolMappers()) { - ProtocolMapperModel mapperModel = model.getRealm().getProtocolMapperByName(map.getProtocol(), map.getName()); - if (mapperModel != null) { - ids.add(mapperModel.getId()); - } + // first, remove all default/built in mappers + Set mappers = model.getProtocolMappers(); + for (ProtocolMapperModel mapper : mappers) model.removeProtocolMapper(mapper); + for (ProtocolMapperRepresentation mapper : rep.getProtocolMappers()) { + model.addProtocolMapper(toModel(mapper)); } - model.setProtocolMappers(ids); } } @@ -770,31 +761,6 @@ public class RepresentationToModel { } } } - private static void importClaimTypes(RealmRepresentation rep, RealmModel newRealm) { - if (rep.getClaimTypes() != null) { - for (ClaimTypeRepresentation representation : rep.getClaimTypes()) { - newRealm.addClaimType(toModel(representation)); - } - } - } - - private static void importProtocolMappers(RealmRepresentation rep, RealmModel newRealm) { - if (rep.getProtocolMappers() != null) { - // we make sure we don't recreate mappers that are automatically created by the protocol providers. - Set mappers = newRealm.getProtocolMappers(); - for (ProtocolMapperRepresentation representation : rep.getProtocolMappers()) { - ProtocolMapperModel existing = newRealm.getProtocolMapperByName(representation.getProtocol(), representation.getName()); - if (existing == null) { - newRealm.addProtocolMapper(toModel(representation)); - } else { - ProtocolMapperModel mapping = toModel(representation); - mapping.setId(existing.getId()); - newRealm.updateProtocolMapper(mapping); - } - } - } - } - public static IdentityProviderModel toModel(IdentityProviderRepresentation representation) { IdentityProviderModel identityProviderModel = new IdentityProviderModel(); @@ -811,20 +777,10 @@ public class RepresentationToModel { return identityProviderModel; } - public static ClaimTypeModel toModel(ClaimTypeRepresentation rep) { - ClaimTypeModel model = new ClaimTypeModel(); - model.setId(rep.getId()); - model.setType(ClaimTypeModel.ValueType.valueOf(rep.getType())); - model.setBuiltIn(rep.isBuiltIn()); - model.setName(rep.getName()); - return model; - } - public static ProtocolMapperModel toModel(ProtocolMapperRepresentation rep) { ProtocolMapperModel model = new ProtocolMapperModel(); model.setId(rep.getId()); model.setName(rep.getName()); - model.setAppliedByDefault(rep.isAppliedByDefault()); model.setConsentRequired(rep.isConsentRequired()); model.setConsentText(rep.getConsentText()); model.setProtocol(rep.getProtocol()); diff --git a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/ClientAdapter.java b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/ClientAdapter.java index a17cc7c14a..c15059e0e0 100755 --- a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/ClientAdapter.java +++ b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/ClientAdapter.java @@ -290,26 +290,42 @@ public abstract class ClientAdapter implements ClientModel { @Override public Set getProtocolMappers() { if (updatedClient != null) return updatedClient.getProtocolMappers(); - return cachedClient.getProtocolClaimMappings(); } + return cachedClient.getProtocolMappers(); + } @Override - public void addProtocolMappers(Set mapperNames) { + public ProtocolMapperModel addProtocolMapper(ProtocolMapperModel model) { getDelegateForUpdate(); - updatedClient.addProtocolMappers(mapperNames); + return updatedClient.addProtocolMapper(model); + } + + @Override + public void removeProtocolMapper(ProtocolMapperModel mapping) { + getDelegateForUpdate(); + updatedClient.removeProtocolMapper(mapping); } @Override - public void removeProtocolMappers(Set mapperNames) { + public void updateProtocolMapper(ProtocolMapperModel mapping) { getDelegateForUpdate(); - updatedClient.removeProtocolMappers(mapperNames); + updatedClient.updateProtocolMapper(mapping); } @Override - public void setProtocolMappers(Set mapperNames) { - getDelegateForUpdate(); - updatedClient.setProtocolMappers(mapperNames); + public ProtocolMapperModel getProtocolMapperById(String id) { + for (ProtocolMapperModel mapping : cachedClient.getProtocolMappers()) { + if (mapping.getId().equals(id)) return mapping; + } + return null; + } + @Override + public ProtocolMapperModel getProtocolMapperByName(String protocol, String name) { + for (ProtocolMapperModel mapping : cachedClient.getProtocolMappers()) { + if (mapping.getProtocol().equals(protocol) && mapping.getName().equals(name)) return mapping; + } + return null; } } diff --git a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/RealmAdapter.java b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/RealmAdapter.java index 588f9d369e..9ade50f3d0 100755 --- a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/RealmAdapter.java +++ b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/RealmAdapter.java @@ -850,82 +850,6 @@ public class RealmAdapter implements RealmModel { return cached.isIdentityFederationEnabled(); } - @Override - public Set getClaimTypes() { - if (updated != null) return updated.getClaimTypes(); - return cached.getClaimTypes(); - } - - @Override - public ClaimTypeModel addClaimType(ClaimTypeModel claimType) { - getDelegateForUpdate(); - return updated.addClaimType(claimType); - } - - @Override - public void removeClaimType(ClaimTypeModel claimType) { - getDelegateForUpdate(); - updated.removeClaimType(claimType); - - } - - @Override - public ClaimTypeModel getClaimType(String name) { - for (ClaimTypeModel claimType : getClaimTypes()) { - if (claimType.getName().equals(name)) return claimType; - } - return null; - } - - @Override - public void updateClaimType(ClaimTypeModel claimType) { - getDelegateForUpdate(); - updated.updateClaimType(claimType); - - } - - - @Override - public Set getProtocolMappers() { - if (updated != null) return updated.getProtocolMappers(); - return cached.getProtocolMappers(); - } - - @Override - public ProtocolMapperModel addProtocolMapper(ProtocolMapperModel model) { - getDelegateForUpdate(); - return updated.addProtocolMapper(model); - } - - @Override - public void removeProtocolMapper(ProtocolMapperModel mapping) { - getDelegateForUpdate(); - updated.removeProtocolMapper(mapping); - - } - - @Override - public void updateProtocolMapper(ProtocolMapperModel mapping) { - getDelegateForUpdate(); - updated.updateProtocolMapper(mapping); - - } - - @Override - public ProtocolMapperModel getProtocolMapperById(String id) { - for (ProtocolMapperModel mapping : cached.getProtocolMappers()) { - if (mapping.getId().equals(id)) return mapping; - } - return null; - } - - @Override - public ProtocolMapperModel getProtocolMapperByName(String protocol, String name) { - for (ProtocolMapperModel mapping : cached.getProtocolMappers()) { - if (mapping.getProtocol().equals(protocol) && mapping.getName().equals(name)) return mapping; - } - return null; - } @Override public boolean equals(Object o) { diff --git a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/entities/CachedClient.java b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/entities/CachedClient.java index e9a8a89b74..859e59399a 100755 --- a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/entities/CachedClient.java +++ b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/entities/CachedClient.java @@ -37,7 +37,7 @@ public class CachedClient { protected Set scope = new HashSet(); protected Set webOrigins = new HashSet(); private List identityProviders = new ArrayList(); - private Set protocolClaimMappings = new HashSet(); + private Set protocolMappers = new HashSet(); public CachedClient(RealmCache cache, RealmProvider delegate, RealmModel realm, ClientModel model) { id = model.getId(); @@ -59,7 +59,9 @@ public class CachedClient { scope.add(role.getId()); } this.identityProviders = model.getIdentityProviders(); - protocolClaimMappings.addAll(model.getProtocolMappers()); + for (ProtocolMapperModel mapper : model.getProtocolMappers()) { + this.protocolMappers.add(mapper); + } } public String getId() { @@ -140,8 +142,8 @@ public class CachedClient { return false; } - public Set getProtocolClaimMappings() { - return protocolClaimMappings; + public Set getProtocolMappers() { + return protocolMappers; } public boolean isAllowedRetrieveTokenFromIdentityProvider(String providerId) { diff --git a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/entities/CachedRealm.java b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/entities/CachedRealm.java index a3f2406c98..12cb2c5a06 100755 --- a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/entities/CachedRealm.java +++ b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/entities/CachedRealm.java @@ -70,8 +70,6 @@ public class CachedRealm { private List requiredCredentials = new ArrayList(); private List userFederationProviders = new ArrayList(); private List identityProviders = new ArrayList(); - private Set claimTypes = new HashSet(); - private Set protocolMappers = new HashSet(); private Map browserSecurityHeaders = new HashMap(); private Map smtpConfig = new HashMap(); @@ -135,13 +133,6 @@ public class CachedRealm { this.identityProviders.add(new IdentityProviderModel(identityProviderModel)); } - for (ClaimTypeModel claimType : model.getClaimTypes()) { - this.claimTypes.add(new ClaimTypeModel(claimType)); - } - for (ProtocolMapperModel mapper : model.getProtocolMappers()) { - this.protocolMappers.add(mapper); - } - smtpConfig.putAll(model.getSmtpConfig()); browserSecurityHeaders.putAll(model.getBrowserSecurityHeaders()); @@ -351,12 +342,4 @@ public class CachedRealm { public List getIdentityProviders() { return identityProviders; } - - public Set getClaimTypes() { - return claimTypes; - } - - public Set getProtocolMappers() { - return protocolMappers; - } } diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/ClientAdapter.java b/model/jpa/src/main/java/org/keycloak/models/jpa/ClientAdapter.java index 04af5ee4a4..52fe96551b 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/ClientAdapter.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/ClientAdapter.java @@ -1,7 +1,9 @@ package org.keycloak.models.jpa; +import org.keycloak.models.ApplicationModel; import org.keycloak.models.ClientIdentityProviderMappingModel; import org.keycloak.models.ClientModel; +import org.keycloak.models.OAuthClientModel; import org.keycloak.models.ProtocolMapperModel; import org.keycloak.models.RealmModel; import org.keycloak.models.RoleContainerModel; @@ -12,6 +14,7 @@ import org.keycloak.models.jpa.entities.IdentityProviderEntity; import org.keycloak.models.jpa.entities.ProtocolMapperEntity; import org.keycloak.models.jpa.entities.RoleEntity; import org.keycloak.models.jpa.entities.ScopeMappingEntity; +import org.keycloak.models.utils.KeycloakModelUtils; import javax.persistence.EntityManager; import javax.persistence.TypedQuery; @@ -412,7 +415,6 @@ public abstract class ClientAdapter implements ClientModel { mapping.setName(entity.getName()); mapping.setProtocol(entity.getProtocol()); mapping.setProtocolMapper(entity.getProtocolMapper()); - mapping.setAppliedByDefault(entity.isAppliedByDefault()); mapping.setConsentRequired(entity.isConsentRequired()); mapping.setConsentText(entity.getConsentText()); Map config = new HashMap(); @@ -425,71 +427,98 @@ public abstract class ClientAdapter implements ClientModel { return mappings; } - protected ProtocolMapperEntity findProtocolMapperByName(String protocol, String name) { - TypedQuery query = em.createNamedQuery("getProtocolMapperByNameProtocol", ProtocolMapperEntity.class); - query.setParameter("name", name); - query.setParameter("protocol", protocol); - query.setParameter("realm", entity.getRealm()); - List entities = query.getResultList(); - if (entities.size() == 0) return null; - if (entities.size() > 1) throw new IllegalStateException("Should not be more than one protocol mapper with same name"); - return query.getResultList().get(0); + @Override + public ProtocolMapperModel addProtocolMapper(ProtocolMapperModel model) { + if (getProtocolMapperByName(model.getProtocol(), model.getName()) != null) { + throw new RuntimeException("protocol mapper name must be unique per protocol"); + } + String id = KeycloakModelUtils.generateId(); + ProtocolMapperEntity entity = new ProtocolMapperEntity(); + entity.setId(id); + entity.setName(model.getName()); + entity.setProtocol(model.getProtocol()); + entity.setProtocolMapper(model.getProtocolMapper()); + entity.setClient(this.entity); + entity.setConfig(model.getConfig()); + entity.setConsentRequired(model.isConsentRequired()); + entity.setConsentText(model.getConsentText()); + + em.persist(entity); + this.entity.getProtocolMappers().add(entity); + return entityToModel(entity); + } + + protected ProtocolMapperEntity getProtocolMapperEntity(String id) { + for (ProtocolMapperEntity entity : this.entity.getProtocolMappers()) { + if (entity.getId().equals(id)) { + return entity; + } + } + return null; + + } + + protected ProtocolMapperEntity getProtocolMapperEntityByName(String protocol, String name) { + for (ProtocolMapperEntity entity : this.entity.getProtocolMappers()) { + if (entity.getProtocol().equals(protocol) && entity.getName().equals(name)) { + return entity; + } + } + return null; } @Override - public void addProtocolMappers(Set mappings) { - Collection entities = entity.getProtocolMappers(); - Set already = new HashSet(); - for (ProtocolMapperEntity rel : entities) { - already.add(rel.getId()); + public void removeProtocolMapper(ProtocolMapperModel mapping) { + ProtocolMapperEntity toDelete = getProtocolMapperEntity(mapping.getId()); + if (toDelete != null) { + this.entity.getProtocolMappers().remove(toDelete); + em.remove(toDelete); } - for (String id : mappings) { - if (!already.contains(id)) { - ProtocolMapperEntity mapping = em.find(ProtocolMapperEntity.class, id); - if (mapping != null) { - entities.add(mapping); - } - } - } - em.flush(); + } @Override - public void removeProtocolMappers(Set mappings) { - Collection entities = entity.getProtocolMappers(); - List remove = new LinkedList(); - for (ProtocolMapperEntity rel : entities) { - if (mappings.contains(rel.getId())) remove.add(rel); - } - for (ProtocolMapperEntity entity : remove) { - entities.remove(entity); + public void updateProtocolMapper(ProtocolMapperModel mapping) { + ProtocolMapperEntity entity = getProtocolMapperEntity(mapping.getId()); + entity.setProtocolMapper(mapping.getProtocolMapper()); + entity.setConsentRequired(mapping.isConsentRequired()); + entity.setConsentText(mapping.getConsentText()); + if (entity.getConfig() == null) { + entity.setConfig(mapping.getConfig()); + } else { + entity.getConfig().clear(); + entity.getConfig().putAll(mapping.getConfig()); } em.flush(); + } + @Override - public void setProtocolMappers(Set mappings) { - Collection entities = entity.getProtocolMappers(); - Iterator it = entities.iterator(); - Set already = new HashSet(); - while (it.hasNext()) { - ProtocolMapperEntity mapper = it.next(); - if (mappings.contains(mapper.getId())) { - already.add(mapper.getId()); - continue; - } - it.remove(); - } - for (String id : mappings) { - if (!already.contains(id)) { - ProtocolMapperEntity mapping = em.find(ProtocolMapperEntity.class, id); - if (mapping != null) { - entities.add(mapping); - } - } - } - em.flush(); + public ProtocolMapperModel getProtocolMapperById(String id) { + ProtocolMapperEntity entity = getProtocolMapperEntity(id); + if (entity == null) return null; + return entityToModel(entity); } + @Override + public ProtocolMapperModel getProtocolMapperByName(String protocol, String name) { + ProtocolMapperEntity entity = getProtocolMapperEntityByName(protocol, name); + if (entity == null) return null; + return entityToModel(entity); + } + protected ProtocolMapperModel entityToModel(ProtocolMapperEntity entity) { + ProtocolMapperModel mapping = new ProtocolMapperModel(); + mapping.setId(entity.getId()); + mapping.setName(entity.getName()); + mapping.setProtocol(entity.getProtocol()); + mapping.setProtocolMapper(entity.getProtocolMapper()); + mapping.setConsentRequired(entity.isConsentRequired()); + mapping.setConsentText(entity.getConsentText()); + Map config = new HashMap(); + if (entity.getConfig() != null) config.putAll(entity.getConfig()); + mapping.setConfig(config); + return mapping; + } } diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/RealmAdapter.java b/model/jpa/src/main/java/org/keycloak/models/jpa/RealmAdapter.java index d581d62862..f0564496b0 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/RealmAdapter.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/RealmAdapter.java @@ -2,22 +2,18 @@ package org.keycloak.models.jpa; import org.keycloak.enums.SslRequired; import org.keycloak.models.ApplicationModel; -import org.keycloak.models.ClaimTypeModel; import org.keycloak.models.ClientModel; import org.keycloak.models.IdentityProviderModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.OAuthClientModel; import org.keycloak.models.PasswordPolicy; -import org.keycloak.models.ProtocolMapperModel; import org.keycloak.models.RealmModel; import org.keycloak.models.RequiredCredentialModel; import org.keycloak.models.RoleModel; import org.keycloak.models.UserFederationProviderModel; import org.keycloak.models.jpa.entities.ApplicationEntity; -import org.keycloak.models.jpa.entities.ClaimTypeEntity; import org.keycloak.models.jpa.entities.IdentityProviderEntity; import org.keycloak.models.jpa.entities.OAuthClientEntity; -import org.keycloak.models.jpa.entities.ProtocolMapperEntity; import org.keycloak.models.jpa.entities.RealmAttributeEntity; import org.keycloak.models.jpa.entities.RealmEntity; import org.keycloak.models.jpa.entities.RequiredCredentialEntity; @@ -628,17 +624,6 @@ public class RealmAdapter implements RealmModel { return this.addApplication(KeycloakModelUtils.generateId(), name); } - public void addDefaultClientProtocolMappers(ClientModel client) { - Set adding = new HashSet(); - for (ProtocolMapperEntity mapper : realm.getProtocolMappers()) { - if (mapper.isAppliedByDefault()) { - adding.add(mapper.getId()); - } - } - client.setProtocolMappers(adding); - - } - @Override public ApplicationModel addApplication(String id, String name) { ApplicationEntity applicationData = new ApplicationEntity(); @@ -649,9 +634,19 @@ public class RealmAdapter implements RealmModel { realm.getApplications().add(applicationData); em.persist(applicationData); em.flush(); - ApplicationModel resource = new ApplicationAdapter(this, em, session, applicationData); - addDefaultClientProtocolMappers(resource); + final ApplicationModel resource = new ApplicationAdapter(this, em, session, applicationData); em.flush(); + session.getKeycloakSessionFactory().publish(new ApplicationCreationEvent() { + @Override + public ApplicationModel getCreatedApplication() { + return resource; + } + + @Override + public ClientModel getCreatedClient() { + return resource; + } + }); return resource; } @@ -714,9 +709,19 @@ public class RealmAdapter implements RealmModel { data.setRealm(realm); em.persist(data); em.flush(); - OAuthClientModel model = new OAuthClientAdapter(this, data, em); - addDefaultClientProtocolMappers(model); + final OAuthClientModel model = new OAuthClientAdapter(this, data, em); em.flush(); + session.getKeycloakSessionFactory().publish(new OAuthClientCreationEvent() { + @Override + public OAuthClientModel getCreatedOAuthClient() { + return model; + } + + @Override + public ClientModel getCreatedClient() { + return model; + } + }); return model; } @@ -1211,191 +1216,4 @@ public class RealmAdapter implements RealmModel { return !this.realm.getIdentityProviders().isEmpty(); } - @Override - public Set getClaimTypes() { - Set claimTypes = new HashSet(); - for (ClaimTypeEntity claimTypeEntity : realm.getClaimTypes()) { - claimTypes.add(new ClaimTypeModel(claimTypeEntity.getId(), claimTypeEntity.getName(), claimTypeEntity.isBuiltIn(), ClaimTypeModel.ValueType.valueOf(claimTypeEntity.getType()))); - } - return claimTypes; - } - - @Override - public ClaimTypeModel addClaimType(ClaimTypeModel model) { - String id = model.getId() == null ? KeycloakModelUtils.generateId() : model.getId(); - ClaimTypeEntity claimEntity = new ClaimTypeEntity(); - claimEntity.setId(id); - claimEntity.setType(model.getType().name()); - claimEntity.setBuiltIn(model.isBuiltIn()); - claimEntity.setRealm(realm); - em.persist(claimEntity); - realm.getClaimTypes().add(claimEntity); - return new ClaimTypeModel(claimEntity.getId(), model.getName(), model.isBuiltIn(), model.getType()); - } - - protected ClaimTypeEntity getClaimTypeEntity(ClaimTypeModel claim) { - for (ClaimTypeEntity claimTypeEntity : realm.getClaimTypes()) { - if (claimTypeEntity.getId().equals(claim.getId())) { - return claimTypeEntity; - } - } - return null; - - } - - @Override - public void removeClaimType(ClaimTypeModel claimType) { - ClaimTypeEntity toDelete = getClaimTypeEntity(claimType); - if (toDelete != null) { - realm.getClaimTypes().remove(toDelete); - em.remove(toDelete); - } - } - - @Override - public ClaimTypeModel getClaimType(String name) { - for (ClaimTypeModel model : getClaimTypes()) { - if (model.getName().equals(name)) { - return model; - } - } - return null; - } - - @Override - public void updateClaimType(ClaimTypeModel claimType) { - ClaimTypeEntity updated = getClaimTypeEntity(claimType); - updated.setName(claimType.getName()); - updated.setBuiltIn(claimType.isBuiltIn()); - updated.setType(claimType.getType().name()); - em.flush(); - } - - @Override - public Set getProtocolMappers() { - Set mappings = new HashSet(); - for (ProtocolMapperEntity entity : realm.getProtocolMappers()) { - ProtocolMapperModel mapping = new ProtocolMapperModel(); - mapping.setId(entity.getId()); - mapping.setName(entity.getName()); - mapping.setProtocol(entity.getProtocol()); - mapping.setAppliedByDefault(entity.isAppliedByDefault()); - mapping.setProtocolMapper(entity.getProtocolMapper()); - mapping.setConsentRequired(entity.isConsentRequired()); - mapping.setConsentText(entity.getConsentText()); - Map config = new HashMap(); - if (entity.getConfig() != null) { - config.putAll(entity.getConfig()); - } - mapping.setConfig(config); - mappings.add(mapping); - } - return mappings; - } - - @Override - public ProtocolMapperModel addProtocolMapper(ProtocolMapperModel model) { - if (getProtocolMapperByName(model.getProtocol(), model.getName()) != null) { - throw new RuntimeException("protocol mapper name must be unique per protocol"); - } - String id = KeycloakModelUtils.generateId(); - ProtocolMapperEntity entity = new ProtocolMapperEntity(); - entity.setId(id); - entity.setName(model.getName()); - entity.setProtocol(model.getProtocol()); - entity.setProtocolMapper(model.getProtocolMapper()); - entity.setAppliedByDefault(model.isAppliedByDefault()); - entity.setRealm(realm); - entity.setConfig(model.getConfig()); - entity.setConsentRequired(model.isConsentRequired()); - entity.setConsentText(model.getConsentText()); - - em.persist(entity); - realm.getProtocolMappers().add(entity); - return entityToModel(entity); - } - - protected ProtocolMapperEntity getProtocolMapperEntity(String id) { - for (ProtocolMapperEntity entity : realm.getProtocolMappers()) { - if (entity.getId().equals(id)) { - return entity; - } - } - return null; - - } - - protected ProtocolMapperEntity getProtocolMapperEntityByName(String protocol, String name) { - for (ProtocolMapperEntity entity : realm.getProtocolMappers()) { - if (entity.getProtocol().equals(protocol) && entity.getName().equals(name)) { - return entity; - } - } - return null; - - } - - @Override - public void removeProtocolMapper(ProtocolMapperModel mapping) { - ProtocolMapperEntity toDelete = getProtocolMapperEntity(mapping.getId()); - if (toDelete != null) { - realm.getProtocolMappers().remove(toDelete); - Set removeId = new HashSet(); - removeId.add(mapping.getId()); - for (ApplicationModel app : getApplications()) { - app.removeProtocolMappers(removeId); - } - for (OAuthClientModel app : getOAuthClients()) { - app.removeProtocolMappers(removeId); - } - em.remove(toDelete); - } - - } - - @Override - public void updateProtocolMapper(ProtocolMapperModel mapping) { - ProtocolMapperEntity entity = getProtocolMapperEntity(mapping.getId()); - entity.setProtocolMapper(mapping.getProtocolMapper()); - entity.setAppliedByDefault(mapping.isAppliedByDefault()); - entity.setConsentRequired(mapping.isConsentRequired()); - entity.setConsentText(mapping.getConsentText()); - if (entity.getConfig() == null) { - entity.setConfig(mapping.getConfig()); - } else { - entity.getConfig().clear(); - entity.getConfig().putAll(mapping.getConfig()); - } - em.flush(); - - } - - @Override - public ProtocolMapperModel getProtocolMapperById(String id) { - ProtocolMapperEntity entity = getProtocolMapperEntity(id); - if (entity == null) return null; - return entityToModel(entity); - } - - @Override - public ProtocolMapperModel getProtocolMapperByName(String protocol, String name) { - ProtocolMapperEntity entity = getProtocolMapperEntityByName(protocol, name); - if (entity == null) return null; - return entityToModel(entity); - } - - protected ProtocolMapperModel entityToModel(ProtocolMapperEntity entity) { - ProtocolMapperModel mapping = new ProtocolMapperModel(); - mapping.setId(entity.getId()); - mapping.setName(entity.getName()); - mapping.setProtocol(entity.getProtocol()); - mapping.setProtocolMapper(entity.getProtocolMapper()); - mapping.setAppliedByDefault(entity.isAppliedByDefault()); - mapping.setConsentRequired(entity.isConsentRequired()); - mapping.setConsentText(entity.getConsentText()); - Map config = new HashMap(); - if (entity.getConfig() != null) config.putAll(entity.getConfig()); - mapping.setConfig(config); - return mapping; - } } \ No newline at end of file diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ClaimTypeEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ClaimTypeEntity.java deleted file mode 100755 index c77245f814..0000000000 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ClaimTypeEntity.java +++ /dev/null @@ -1,82 +0,0 @@ -package org.keycloak.models.jpa.entities; - -import org.keycloak.models.ClaimTypeModel; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; - -/** - * @author Bill Burke - * @version $Revision: 1 $ - */ -@Entity -@NamedQueries({ - @NamedQuery(name="deleteClaimTypesByRealm", query="delete from ClaimTypeEntity attr where attr.realm = :realm") -}) -@Table(name="CLAIM_TYPE") -public class ClaimTypeEntity { - - @Id - @Column(name="ID", length = 36) - protected String id; - - @Column(name = "NAME") - private String name; - - @Column(name = "BUILT_IN") - protected boolean builtIn; - - @Column(name = "VALUE_TYPE") - protected String type; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "REALM_ID") - protected RealmEntity realm; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public boolean isBuiltIn() { - return builtIn; - } - - public void setBuiltIn(boolean builtIn) { - this.builtIn = builtIn; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public RealmEntity getRealm() { - return realm; - } - - public void setRealm(RealmEntity realm) { - this.realm = realm; - } -} diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ClientEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ClientEntity.java index dcf33cb769..f61f7bf9e0 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ClientEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ClientEntity.java @@ -76,8 +76,7 @@ public abstract class ClientEntity { @OneToMany(fetch = FetchType.LAZY, mappedBy = "client", cascade = CascadeType.REMOVE) Collection identityProviders = new ArrayList(); - @OneToMany(fetch = FetchType.LAZY) - @JoinTable(name="CLIENT_PROTOCOL_MAPPER", joinColumns = { @JoinColumn(name="CLIENT_ID")}, inverseJoinColumns = { @JoinColumn(name="MAPPING_ID")}) + @OneToMany(cascade ={CascadeType.REMOVE}, orphanRemoval = true, mappedBy = "client") Collection protocolMappers = new ArrayList(); public RealmEntity getRealm() { diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ProtocolMapperEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ProtocolMapperEntity.java index cfb79390e1..7b2c323331 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ProtocolMapperEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ProtocolMapperEntity.java @@ -19,9 +19,6 @@ import java.util.Map; * @version $Revision: 1 $ */ @Entity -@NamedQueries({ - @NamedQuery(name="getProtocolMapperByNameProtocol", query="select mapper from ProtocolMapperEntity mapper where mapper.protocol = :protocol and mapper.name = :name and mapper.realm = :realm") -}) @Table(name="PROTOCOL_MAPPER") public class ProtocolMapperEntity { @@ -36,8 +33,6 @@ public class ProtocolMapperEntity { protected String protocol; @Column(name = "PROTOCOL_MAPPER_NAME") protected String protocolMapper; - @Column(name = "APPLIED_BY_DEFAULT") - protected boolean appliedByDefault; @Column(name="CONSENT_REQUIRED") protected boolean consentRequired; @Column(name="CONSENT_TEXT") @@ -50,8 +45,8 @@ public class ProtocolMapperEntity { private Map config; @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "REALM_ID") - protected RealmEntity realm; + @JoinColumn(name = "CLIENT_ID") + private ClientEntity client; public String getId() { return id; @@ -85,14 +80,6 @@ public class ProtocolMapperEntity { this.protocolMapper = protocolMapper; } - public boolean isAppliedByDefault() { - return appliedByDefault; - } - - public void setAppliedByDefault(boolean appliedByDefault) { - this.appliedByDefault = appliedByDefault; - } - public Map getConfig() { return config; } @@ -101,12 +88,12 @@ public class ProtocolMapperEntity { this.config = config; } - public RealmEntity getRealm() { - return realm; + public ClientEntity getClient() { + return client; } - public void setRealm(RealmEntity realm) { - this.realm = realm; + public void setClient(ClientEntity client) { + this.client = client; } public boolean isConsentRequired() { diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RealmEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RealmEntity.java index 2f24d06bf7..258b88f346 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RealmEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RealmEntity.java @@ -92,12 +92,6 @@ public class RealmEntity { @OneToMany(cascade ={CascadeType.REMOVE}, orphanRemoval = true, mappedBy = "realm") Collection attributes = new ArrayList(); - @OneToMany(cascade ={CascadeType.REMOVE}, orphanRemoval = true, mappedBy = "realm") - Collection claimTypes = new ArrayList(); - - @OneToMany(cascade ={CascadeType.REMOVE}, orphanRemoval = true, mappedBy = "realm") - Collection protocolMappers = new ArrayList(); - @OneToMany(cascade ={CascadeType.REMOVE}, orphanRemoval = true, mappedBy = "realm") Collection requiredCredentials = new ArrayList(); @@ -439,20 +433,5 @@ public class RealmEntity { getIdentityProviders().add(entity); } - public Collection getClaimTypes() { - return claimTypes; - } - - public void setClaimTypes(Collection claimTypes) { - this.claimTypes = claimTypes; - } - - public Collection getProtocolMappers() { - return protocolMappers; - } - - public void setProtocolMappers(Collection protocolMappers) { - this.protocolMappers = protocolMappers; - } } diff --git a/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/ClientAdapter.java b/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/ClientAdapter.java index 1072181907..92465e1620 100755 --- a/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/ClientAdapter.java +++ b/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/ClientAdapter.java @@ -11,8 +11,10 @@ import org.keycloak.models.RealmProvider; import org.keycloak.models.RoleModel; import org.keycloak.models.entities.ClientEntity; import org.keycloak.models.entities.ClientIdentityProviderMappingEntity; +import org.keycloak.models.entities.ProtocolMapperEntity; import org.keycloak.models.mongo.keycloak.entities.MongoRoleEntity; import org.keycloak.models.mongo.utils.MongoModelUtils; +import org.keycloak.models.utils.KeycloakModelUtils; import java.util.ArrayList; import java.util.HashMap; @@ -295,33 +297,117 @@ public abstract class ClientAdapter extends A @Override public Set getProtocolMappers() { Set result = new HashSet(); - for (String id : getMongoEntityAsClient().getProtocolMappers()) { - ProtocolMapperModel model = getRealm().getProtocolMapperById(id); - if (model != null) result.add(model); + for (ProtocolMapperEntity entity : getMongoEntityAsClient().getProtocolMappers()) { + ProtocolMapperModel mapping = new ProtocolMapperModel(); + mapping.setId(entity.getId()); + mapping.setName(entity.getName()); + mapping.setProtocol(entity.getProtocol()); + mapping.setConsentRequired(entity.isConsentRequired()); + mapping.setConsentText(entity.getConsentText()); + Map config = new HashMap(); + if (entity.getConfig() != null) { + config.putAll(entity.getConfig()); + } + mapping.setConfig(config); } return result; } @Override - public void addProtocolMappers(Set mapperIds) { - getMongoEntityAsClient().getProtocolMappers().addAll(mapperIds); + public ProtocolMapperModel addProtocolMapper(ProtocolMapperModel model) { + if (getProtocolMapperByName(model.getProtocol(), model.getName()) != null) { + throw new RuntimeException("protocol mapper name must be unique per protocol"); + } + ProtocolMapperEntity entity = new ProtocolMapperEntity(); + entity.setId(KeycloakModelUtils.generateId()); + entity.setProtocol(model.getProtocol()); + entity.setName(model.getName()); + entity.setProtocolMapper(model.getProtocolMapper()); + entity.setConfig(model.getConfig()); + entity.setConsentRequired(model.isConsentRequired()); + entity.setConsentText(model.getConsentText()); + getMongoEntityAsClient().getProtocolMappers().add(entity); + updateMongoEntity(); + return entityToModel(entity); + } + + @Override + public void removeProtocolMapper(ProtocolMapperModel mapping) { + for (ProtocolMapperEntity entity : getMongoEntityAsClient().getProtocolMappers()) { + if (entity.getId().equals(mapping.getId())) { + getMongoEntityAsClient().getProtocolMappers().remove(entity); + updateMongoEntity(); + break; + } + } + + } + + protected ProtocolMapperEntity getProtocolMapperyEntityById(String id) { + for (ProtocolMapperEntity entity : getMongoEntityAsClient().getProtocolMappers()) { + if (entity.getId().equals(id)) { + return entity; + } + } + return null; + + } + protected ProtocolMapperEntity getProtocolMapperEntityByName(String protocol, String name) { + for (ProtocolMapperEntity entity : getMongoEntityAsClient().getProtocolMappers()) { + if (entity.getProtocol().equals(protocol) && entity.getName().equals(name)) { + return entity; + } + } + return null; + + } + + + @Override + public void updateProtocolMapper(ProtocolMapperModel mapping) { + ProtocolMapperEntity entity = getProtocolMapperyEntityById(mapping.getId()); + entity.setProtocolMapper(mapping.getProtocolMapper()); + entity.setConsentRequired(mapping.isConsentRequired()); + entity.setConsentText(mapping.getConsentText()); + if (entity.getConfig() != null) { + entity.getConfig().clear(); + entity.getConfig().putAll(mapping.getConfig()); + } else { + entity.setConfig(mapping.getConfig()); + } updateMongoEntity(); } @Override - public void removeProtocolMappers(Set mapperIds) { - getMongoEntityAsClient().getProtocolMappers().removeAll(mapperIds); - updateMongoEntity(); + public ProtocolMapperModel getProtocolMapperById(String id) { + ProtocolMapperEntity entity = getProtocolMapperyEntityById(id); + if (entity == null) return null; + return entityToModel(entity); } @Override - public void setProtocolMappers(Set mapperIds) { - getMongoEntityAsClient().getProtocolMappers().clear(); - getMongoEntityAsClient().getProtocolMappers().addAll(mapperIds); - updateMongoEntity(); + public ProtocolMapperModel getProtocolMapperByName(String protocol, String name) { + ProtocolMapperEntity entity = getProtocolMapperEntityByName(protocol, name); + if (entity == null) return null; + return entityToModel(entity); } + protected ProtocolMapperModel entityToModel(ProtocolMapperEntity entity) { + ProtocolMapperModel mapping = new ProtocolMapperModel(); + mapping.setId(entity.getId()); + mapping.setName(entity.getName()); + mapping.setProtocol(entity.getProtocol()); + mapping.setProtocolMapper(entity.getProtocolMapper()); + mapping.setConsentRequired(entity.isConsentRequired()); + mapping.setConsentText(entity.getConsentText()); + Map config = new HashMap(); + if (entity.getConfig() != null) config.putAll(entity.getConfig()); + mapping.setConfig(config); + return mapping; + } + + @Override public void updateAllowedIdentityProviders(List identityProviders) { List stored = new ArrayList(); diff --git a/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/RealmAdapter.java b/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/RealmAdapter.java index be033a3e28..c149e9394e 100755 --- a/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/RealmAdapter.java +++ b/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/RealmAdapter.java @@ -5,21 +5,17 @@ import com.mongodb.QueryBuilder; import org.keycloak.connections.mongo.api.context.MongoStoreInvocationContext; import org.keycloak.enums.SslRequired; import org.keycloak.models.ApplicationModel; -import org.keycloak.models.ClaimTypeModel; import org.keycloak.models.ClientModel; import org.keycloak.models.IdentityProviderModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.OAuthClientModel; import org.keycloak.models.PasswordPolicy; -import org.keycloak.models.ProtocolMapperModel; import org.keycloak.models.RealmModel; import org.keycloak.models.RealmProvider; import org.keycloak.models.RequiredCredentialModel; import org.keycloak.models.RoleModel; import org.keycloak.models.UserFederationProviderModel; -import org.keycloak.models.entities.ClaimTypeEntity; import org.keycloak.models.entities.IdentityProviderEntity; -import org.keycloak.models.entities.ProtocolMapperEntity; import org.keycloak.models.entities.RequiredCredentialEntity; import org.keycloak.models.entities.UserFederationProviderEntity; import org.keycloak.models.mongo.keycloak.entities.MongoApplicationEntity; @@ -616,14 +612,6 @@ public class RealmAdapter extends AbstractMongoAdapter impleme return result; } - public void addDefaultClientProtocolMappers(ClientModel client) { - Set adding = new HashSet(); - for (ProtocolMapperEntity mapper : realm.getProtocolMappers()) { - if (mapper.isAppliedByDefault()) adding.add(mapper.getId()); - } - client.setProtocolMappers(adding); - - } @Override public ApplicationModel addApplication(String name) { return this.addApplication(null, name); @@ -639,7 +627,6 @@ public class RealmAdapter extends AbstractMongoAdapter impleme getMongoStore().insertEntity(appData, invocationContext); ApplicationModel model = new ApplicationAdapter(session, this, appData, invocationContext); - addDefaultClientProtocolMappers(model); return model; } @@ -662,7 +649,6 @@ public class RealmAdapter extends AbstractMongoAdapter impleme getMongoStore().insertEntity(oauthClient, invocationContext); OAuthClientAdapter model = new OAuthClientAdapter(session, this, oauthClient, invocationContext); - addDefaultClientProtocolMappers(model); return model; } @@ -798,178 +784,6 @@ public class RealmAdapter extends AbstractMongoAdapter impleme updateRealm(); } - @Override - public Set getProtocolMappers() { - Set result = new HashSet(); - for (ProtocolMapperEntity entity : realm.getProtocolMappers()) { - ProtocolMapperModel mapping = new ProtocolMapperModel(); - mapping.setId(entity.getId()); - mapping.setName(entity.getName()); - mapping.setProtocol(entity.getProtocol()); - mapping.setAppliedByDefault(entity.isAppliedByDefault()); - mapping.setConsentRequired(entity.isConsentRequired()); - mapping.setConsentText(entity.getConsentText()); - Map config = new HashMap(); - if (entity.getConfig() != null) { - config.putAll(entity.getConfig()); - } - mapping.setConfig(config); - } - return result; - } - - @Override - public ProtocolMapperModel addProtocolMapper(ProtocolMapperModel model) { - if (getProtocolMapperByName(model.getProtocol(), model.getName()) != null) { - throw new RuntimeException("protocol mapper name must be unique per protocol"); - } - ProtocolMapperEntity entity = new ProtocolMapperEntity(); - entity.setId(KeycloakModelUtils.generateId()); - entity.setProtocol(model.getProtocol()); - entity.setName(model.getName()); - entity.setAppliedByDefault(model.isAppliedByDefault()); - entity.setProtocolMapper(model.getProtocolMapper()); - entity.setConfig(model.getConfig()); - entity.setConsentRequired(model.isConsentRequired()); - entity.setConsentText(model.getConsentText()); - realm.getProtocolMappers().add(entity); - updateRealm(); - return entityToModel(entity); - } - - @Override - public void removeProtocolMapper(ProtocolMapperModel mapping) { - for (ProtocolMapperEntity entity : realm.getProtocolMappers()) { - if (entity.getId().equals(mapping.getId())) { - realm.getProtocolMappers().remove(entity); - updateRealm(); - break; - } - } - - } - - protected ProtocolMapperEntity getProtocolMapperyEntityById(String id) { - for (ProtocolMapperEntity entity : realm.getProtocolMappers()) { - if (entity.getId().equals(id)) { - return entity; - } - } - return null; - - } - protected ProtocolMapperEntity getProtocolMapperEntityByName(String protocol, String name) { - for (ProtocolMapperEntity entity : realm.getProtocolMappers()) { - if (entity.getProtocol().equals(protocol) && entity.getName().equals(name)) { - return entity; - } - } - return null; - - } - - - @Override - public void updateProtocolMapper(ProtocolMapperModel mapping) { - ProtocolMapperEntity entity = getProtocolMapperyEntityById(mapping.getId()); - entity.setAppliedByDefault(mapping.isAppliedByDefault()); - entity.setProtocolMapper(mapping.getProtocolMapper()); - entity.setConsentRequired(mapping.isConsentRequired()); - entity.setConsentText(mapping.getConsentText()); - if (entity.getConfig() != null) { - entity.getConfig().clear(); - entity.getConfig().putAll(mapping.getConfig()); - } else { - entity.setConfig(mapping.getConfig()); - } - updateRealm(); - - } - - @Override - public ProtocolMapperModel getProtocolMapperById(String id) { - ProtocolMapperEntity entity = getProtocolMapperyEntityById(id); - if (entity == null) return null; - return entityToModel(entity); - } - - @Override - public ProtocolMapperModel getProtocolMapperByName(String protocol, String name) { - ProtocolMapperEntity entity = getProtocolMapperEntityByName(protocol, name); - if (entity == null) return null; - return entityToModel(entity); - } - - protected ProtocolMapperModel entityToModel(ProtocolMapperEntity entity) { - ProtocolMapperModel mapping = new ProtocolMapperModel(); - mapping.setId(entity.getId()); - mapping.setName(entity.getName()); - mapping.setProtocol(entity.getProtocol()); - mapping.setAppliedByDefault(entity.isAppliedByDefault()); - mapping.setProtocolMapper(entity.getProtocolMapper()); - mapping.setConsentRequired(entity.isConsentRequired()); - mapping.setConsentText(entity.getConsentText()); - Map config = new HashMap(); - if (entity.getConfig() != null) config.putAll(entity.getConfig()); - mapping.setConfig(config); - return mapping; - } - - @Override - public Set getClaimTypes() { - Set result = new HashSet(); - for (ClaimTypeEntity entity : realm.getClaimTypes()) { - result.add(new ClaimTypeModel(entity.getId(), entity.getName(), entity.isBuiltIn(), entity.getType())); - } - return result; - } - - @Override - public ClaimTypeModel addClaimType(ClaimTypeModel model) { - String id = model.getId() == null ? KeycloakModelUtils.generateId() : model.getId(); - ClaimTypeModel claim = new ClaimTypeModel(id, model.getName(), model.isBuiltIn(), model.getType()); - ClaimTypeEntity entity = new ClaimTypeEntity(); - entity.setId(claim.getId()); - entity.setType(model.getType()); - entity.setBuiltIn(model.isBuiltIn()); - entity.setName(model.getName()); - realm.getClaimTypes().add(entity); - updateRealm(); - return claim; - } - - @Override - public void removeClaimType(ClaimTypeModel claimType) { - for (ClaimTypeEntity entity : realm.getClaimTypes()) { - if (entity.getId().equals(claimType.getId())) { - realm.getClaimTypes().remove(entity); - updateRealm(); - break; - } - } - } - - @Override - public ClaimTypeModel getClaimType(String name) { - for (ClaimTypeModel claimType : getClaimTypes()) { - if (claimType.getName().equals(name)) return claimType; - } - return null; - } - - @Override - public void updateClaimType(ClaimTypeModel claimType) { - for (ClaimTypeEntity entity : realm.getClaimTypes()) { - if (entity.getId().equals(claimType.getId())) { - entity.setName(claimType.getName()); - entity.setBuiltIn(claimType.isBuiltIn()); - entity.setType(claimType.getType()); - updateRealm(); - break; - } - } - } - @Override public List getIdentityProviders() { diff --git a/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/SamlProtocolFactory.java b/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/SamlProtocolFactory.java index bda8659e41..934abe90f1 100755 --- a/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/SamlProtocolFactory.java +++ b/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/SamlProtocolFactory.java @@ -2,6 +2,7 @@ package org.keycloak.protocol.saml; import org.keycloak.Config; import org.keycloak.events.EventBuilder; +import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.ProtocolMapperModel; @@ -19,7 +20,9 @@ import org.keycloak.services.managers.AuthenticationManager; import org.picketlink.identity.federation.core.saml.v2.constants.X500SAMLProfileConstants; import org.picketlink.identity.federation.core.sts.PicketLinkCoreSTS; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; /** @@ -50,22 +53,37 @@ public class SamlProtocolFactory extends AbstractLoginProtocolFactory { } @Override - protected void addDefaults(RealmModel realm) { - UserModelUriReferenceAttributeStatementMapper.addAttributeMapper(realm, "X500 email", + public List getBuiltinMappers() { + return builtins; + } + + static List builtins = new ArrayList<>(); + static List defaultBuiltins = new ArrayList<>(); + + static { + ProtocolMapperModel model; + model = UserModelUriReferenceAttributeStatementMapper.createAttributeMapper("X500 email", "email", X500SAMLProfileConstants.EMAIL.get(), X500SAMLProfileConstants.EMAIL.getFriendlyName(), - true, "email", - false); - UserModelUriReferenceAttributeStatementMapper.addAttributeMapper(realm, "X500 givenName", + true, "email"); + builtins.add(model); + model = UserModelUriReferenceAttributeStatementMapper.createAttributeMapper("X500 givenName", "firstName", X500SAMLProfileConstants.GIVEN_NAME.get(), X500SAMLProfileConstants.GIVEN_NAME.getFriendlyName(), - true, "given name", - false); - UserModelUriReferenceAttributeStatementMapper.addAttributeMapper(realm, "X500 surname", + true, "given name"); + builtins.add(model); + model = UserModelUriReferenceAttributeStatementMapper.createAttributeMapper("X500 surname", "lastName", X500SAMLProfileConstants.SURNAME.get(), X500SAMLProfileConstants.SURNAME.getFriendlyName(), - true, "family name", - false); + true, "family name"); + builtins.add(model); + + } + + + @Override + protected void addDefaults(ClientModel client) { + for (ProtocolMapperModel model : defaultBuiltins) client.addProtocolMapper(model); } diff --git a/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/mappers/AttributeStatementHelper.java b/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/mappers/AttributeStatementHelper.java index fd325611f9..3bbb7fcb75 100755 --- a/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/mappers/AttributeStatementHelper.java +++ b/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/mappers/AttributeStatementHelper.java @@ -74,16 +74,13 @@ public class AttributeStatementHelper { configProperties.add(property); } - public static void addAttributeMapper(RealmModel realm, String name, String userAttribute, String samlAttributeName, String friendlyName, boolean consentRequired, String consentText, boolean appliedByDefault, String mapperId) { - ProtocolMapperModel mapper = realm.getProtocolMapperByName(SamlProtocol.LOGIN_PROTOCOL, name); - if (mapper != null) return; - mapper = new ProtocolMapperModel(); + public static ProtocolMapperModel createAttributeMapper(String name, String userAttribute, String samlAttributeName, String friendlyName, boolean consentRequired, String consentText, String mapperId) { + ProtocolMapperModel mapper = mapper = new ProtocolMapperModel(); mapper.setName(name); mapper.setProtocolMapper(mapperId); mapper.setProtocol(SamlProtocol.LOGIN_PROTOCOL); mapper.setConsentRequired(consentRequired); mapper.setConsentText(consentText); - mapper.setAppliedByDefault(appliedByDefault); Map config = new HashMap(); config.put(ProtocolMapperUtils.USER_ATTRIBUTE, userAttribute); config.put(SAML_ATTRIBUTE_NAME, samlAttributeName); @@ -91,6 +88,6 @@ public class AttributeStatementHelper { config.put(FRIENDLY_NAME, friendlyName); } mapper.setConfig(config); - realm.addProtocolMapper(mapper); + return mapper; } } diff --git a/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/mappers/UserAttributeBasicAttributeStatementMapper.java b/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/mappers/UserAttributeBasicAttributeStatementMapper.java index 3fc56032c2..16374dd991 100755 --- a/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/mappers/UserAttributeBasicAttributeStatementMapper.java +++ b/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/mappers/UserAttributeBasicAttributeStatementMapper.java @@ -67,14 +67,13 @@ public class UserAttributeBasicAttributeStatementMapper extends AbstractSAMLProt } - public static void addAttributeMapper(RealmModel realm, String name, + public static ProtocolMapperModel createAttributeMapper(String name, String userAttribute, String samlAttributeName, String friendlyName, - boolean consentRequired, String consentText, - boolean appliedByDefault) { + boolean consentRequired, String consentText) { String mapperId = PROVIDER_ID; - AttributeStatementHelper.addAttributeMapper(realm, name, userAttribute, samlAttributeName, friendlyName, consentRequired, consentText, appliedByDefault, mapperId); + return AttributeStatementHelper.createAttributeMapper(name, userAttribute, samlAttributeName, friendlyName, consentRequired, consentText, mapperId); } diff --git a/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/mappers/UserAttributeUriReferenceAttributeStatementMapper.java b/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/mappers/UserAttributeUriReferenceAttributeStatementMapper.java index a690870262..232474dbc0 100755 --- a/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/mappers/UserAttributeUriReferenceAttributeStatementMapper.java +++ b/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/mappers/UserAttributeUriReferenceAttributeStatementMapper.java @@ -66,14 +66,13 @@ public class UserAttributeUriReferenceAttributeStatementMapper extends AbstractS AttributeStatementHelper.addUriReferenceAttribute(attributeStatement, mappingModel, attributeValue); } - public static void addAttributeMapper(RealmModel realm, String name, + public static ProtocolMapperModel createAttributeMapper(String name, String userAttribute, String samlAttributeName, String friendlyName, - boolean consentRequired, String consentText, - boolean appliedByDefault) { + boolean consentRequired, String consentText) { String mapperId = PROVIDER_ID; - AttributeStatementHelper.addAttributeMapper(realm, name, userAttribute, samlAttributeName, friendlyName, consentRequired, consentText, appliedByDefault, mapperId); + return AttributeStatementHelper.createAttributeMapper(name, userAttribute, samlAttributeName, friendlyName, consentRequired, consentText, mapperId); } diff --git a/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/mappers/UserModelBasicAttributeStatementMapper.java b/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/mappers/UserModelBasicAttributeStatementMapper.java index 7d41322a62..35b3354ba9 100755 --- a/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/mappers/UserModelBasicAttributeStatementMapper.java +++ b/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/mappers/UserModelBasicAttributeStatementMapper.java @@ -67,14 +67,13 @@ public class UserModelBasicAttributeStatementMapper extends AbstractSAMLProtocol } - public static void addAttributeMapper(RealmModel realm, String name, + public static ProtocolMapperModel createAttributeMapper(String name, String userAttribute, String samlAttributeName, String friendlyName, - boolean consentRequired, String consentText, - boolean appliedByDefault) { + boolean consentRequired, String consentText) { String mapperId = PROVIDER_ID; - AttributeStatementHelper.addAttributeMapper(realm, name, userAttribute, samlAttributeName, friendlyName, consentRequired, consentText, appliedByDefault, mapperId); + return AttributeStatementHelper.createAttributeMapper(name, userAttribute, samlAttributeName, friendlyName, consentRequired, consentText, mapperId); } } diff --git a/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/mappers/UserModelUriReferenceAttributeStatementMapper.java b/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/mappers/UserModelUriReferenceAttributeStatementMapper.java index 1cefe3c72f..8037638e46 100755 --- a/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/mappers/UserModelUriReferenceAttributeStatementMapper.java +++ b/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/mappers/UserModelUriReferenceAttributeStatementMapper.java @@ -3,7 +3,6 @@ package org.keycloak.protocol.saml.mappers; import org.keycloak.models.ClientSessionModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.ProtocolMapperModel; -import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.models.UserSessionModel; import org.keycloak.protocol.ProtocolMapperUtils; @@ -67,14 +66,13 @@ public class UserModelUriReferenceAttributeStatementMapper extends AbstractSAMLP } - public static void addAttributeMapper(RealmModel realm, String name, + public static ProtocolMapperModel createAttributeMapper(String name, String userAttribute, String samlAttributeName, String friendlyName, - boolean consentRequired, String consentText, - boolean appliedByDefault) { + boolean consentRequired, String consentText) { String mapperId = PROVIDER_ID; - AttributeStatementHelper.addAttributeMapper(realm, name, userAttribute, samlAttributeName, friendlyName, consentRequired, consentText, appliedByDefault, mapperId); + return AttributeStatementHelper.createAttributeMapper(name, userAttribute, samlAttributeName, friendlyName, consentRequired, consentText, mapperId); } } diff --git a/services/src/main/java/org/keycloak/protocol/AbstractLoginProtocolFactory.java b/services/src/main/java/org/keycloak/protocol/AbstractLoginProtocolFactory.java index 88f0f14270..f009c6b94a 100755 --- a/services/src/main/java/org/keycloak/protocol/AbstractLoginProtocolFactory.java +++ b/services/src/main/java/org/keycloak/protocol/AbstractLoginProtocolFactory.java @@ -2,6 +2,7 @@ package org.keycloak.protocol; import org.jboss.logging.Logger; import org.keycloak.Config; +import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.RealmModel; @@ -24,25 +25,12 @@ public abstract class AbstractLoginProtocolFactory implements LoginProtocolFacto @Override public void postInit(KeycloakSessionFactory factory) { - KeycloakSession session = factory.create(); - session.getTransaction().begin(); - try { - List realms = session.realms().getRealms(); - for (RealmModel realm : realms) addDefaults(realm); - session.getTransaction().commit(); - } catch (Exception e) { - logger.error("Can't add default mappers to realm", e); - session.getTransaction().rollback(); - } finally { - session.close(); - } - factory.register(new ProviderEventListener() { @Override public void onEvent(ProviderEvent event) { - if (event instanceof RealmModel.RealmCreationEvent) { - RealmModel realm = ((RealmModel.RealmCreationEvent)event).getCreatedRealm(); - addDefaults(realm); + if (event instanceof RealmModel.ClientCreationEvent) { + ClientModel client = ((RealmModel.ClientCreationEvent)event).getCreatedClient(); + addDefaults(client); } } }); @@ -50,7 +38,7 @@ public abstract class AbstractLoginProtocolFactory implements LoginProtocolFacto } - protected abstract void addDefaults(RealmModel realm); + protected abstract void addDefaults(ClientModel realm); @Override public void close() { diff --git a/services/src/main/java/org/keycloak/protocol/LoginProtocolFactory.java b/services/src/main/java/org/keycloak/protocol/LoginProtocolFactory.java index cf98f8c871..f6341612f8 100755 --- a/services/src/main/java/org/keycloak/protocol/LoginProtocolFactory.java +++ b/services/src/main/java/org/keycloak/protocol/LoginProtocolFactory.java @@ -13,5 +13,11 @@ import java.util.List; * @version $Revision: 1 $ */ public interface LoginProtocolFactory extends ProviderFactory { + /** + * List of built in protocol mappers that can be used to apply to clients. + * + * @return + */ + List getBuiltinMappers(); Object createProtocolEndpoint(RealmModel realm, EventBuilder event, AuthenticationManager authManager); } diff --git a/services/src/main/java/org/keycloak/protocol/oidc/OIDCLoginProtocolFactory.java b/services/src/main/java/org/keycloak/protocol/oidc/OIDCLoginProtocolFactory.java index 8b172c3f41..2d58fea193 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/OIDCLoginProtocolFactory.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/OIDCLoginProtocolFactory.java @@ -1,6 +1,7 @@ package org.keycloak.protocol.oidc; import org.keycloak.events.EventBuilder; +import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.ProtocolMapperModel; import org.keycloak.models.RealmModel; @@ -13,7 +14,9 @@ import org.keycloak.protocol.oidc.mappers.OIDCFullNameMapper; import org.keycloak.protocol.oidc.mappers.OIDCUserModelMapper; import org.keycloak.services.managers.AuthenticationManager; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; /** @@ -27,71 +30,80 @@ public class OIDCLoginProtocolFactory extends AbstractLoginProtocolFactory { } @Override - protected void addDefaults(RealmModel realm) { - int counter = 0; - // the ids must never change!!!! So if you add more default mappers, then add to end with higher counter. - OIDCUserModelMapper.addClaimMapper(realm, "username", + public List getBuiltinMappers() { + return builtins; + } + + static List builtins = new ArrayList<>(); + static List defaultBuiltins = new ArrayList<>(); + + static { + + ProtocolMapperModel model; + model = OIDCUserModelMapper.createClaimMapper("username", "username", "preferred_username", "String", true, "username", - true, true, true); - OIDCUserModelMapper.addClaimMapper(realm, "email", + builtins.add(model); + defaultBuiltins.add(model); + model = OIDCUserModelMapper.createClaimMapper("email", "email", "email", "String", true, "email", - true, true, true); - OIDCUserModelMapper.addClaimMapper(realm, "given name", + builtins.add(model); + defaultBuiltins.add(model); + model = OIDCUserModelMapper.createClaimMapper("given name", "firstName", "given_name", "String", true, "given name", - true, true, true); - OIDCUserModelMapper.addClaimMapper(realm, "family name", + builtins.add(model); + defaultBuiltins.add(model); + model = OIDCUserModelMapper.createClaimMapper("family name", "lastName", "family_name", "String", true, "family name", - true, true, true); - OIDCUserModelMapper.addClaimMapper(realm, "email verified", + builtins.add(model); + defaultBuiltins.add(model); + model = OIDCUserModelMapper.createClaimMapper("email verified", "emailVerified", "email_verified", "boolean", false, null, - false, true, true); + builtins.add(model); ProtocolMapperModel fullName = new ProtocolMapperModel(); - if (realm.getProtocolMapperByName(OIDCLoginProtocol.LOGIN_PROTOCOL, "full name") == null) { - fullName.setName("full name"); - fullName.setProtocolMapper(OIDCFullNameMapper.PROVIDER_ID); - fullName.setProtocol(OIDCLoginProtocol.LOGIN_PROTOCOL); - fullName.setConsentRequired(true); - fullName.setConsentText("full name"); - fullName.setAppliedByDefault(true); - Map config = new HashMap(); - config.put(OIDCAttributeMapperHelper.INCLUDE_IN_ACCESS_TOKEN, "true"); - config.put(OIDCAttributeMapperHelper.INCLUDE_IN_ID_TOKEN, "true"); - fullName.setConfig(config); - realm.addProtocolMapper(fullName); - } + fullName.setName("full name"); + fullName.setProtocolMapper(OIDCFullNameMapper.PROVIDER_ID); + fullName.setProtocol(OIDCLoginProtocol.LOGIN_PROTOCOL); + fullName.setConsentRequired(true); + fullName.setConsentText("full name"); + Map config = new HashMap(); + config.put(OIDCAttributeMapperHelper.INCLUDE_IN_ACCESS_TOKEN, "true"); + config.put(OIDCAttributeMapperHelper.INCLUDE_IN_ID_TOKEN, "true"); + fullName.setConfig(config); + builtins.add(fullName); + defaultBuiltins.add(fullName); ProtocolMapperModel address = new ProtocolMapperModel(); - if (realm.getProtocolMapperByName(OIDCLoginProtocol.LOGIN_PROTOCOL, "address") == null) { - address.setName("address"); - address.setProtocolMapper(OIDCAddressMapper.PROVIDER_ID); - address.setProtocol(OIDCLoginProtocol.LOGIN_PROTOCOL); - address.setConsentRequired(true); - address.setConsentText("address"); - address.setAppliedByDefault(false); - Map config = new HashMap(); - config.put(OIDCAttributeMapperHelper.INCLUDE_IN_ACCESS_TOKEN, "true"); - config.put(OIDCAttributeMapperHelper.INCLUDE_IN_ID_TOKEN, "true"); - address.setConfig(config); - realm.addProtocolMapper(address); - } - + address.setName("address"); + address.setProtocolMapper(OIDCAddressMapper.PROVIDER_ID); + address.setProtocol(OIDCLoginProtocol.LOGIN_PROTOCOL); + address.setConsentRequired(true); + address.setConsentText("address"); + config = new HashMap(); + config.put(OIDCAttributeMapperHelper.INCLUDE_IN_ACCESS_TOKEN, "true"); + config.put(OIDCAttributeMapperHelper.INCLUDE_IN_ID_TOKEN, "true"); + address.setConfig(config); + builtins.add(address); + } + @Override + protected void addDefaults(ClientModel client) { + for (ProtocolMapperModel model : defaultBuiltins) client.addProtocolMapper(model); } @Override diff --git a/services/src/main/java/org/keycloak/protocol/oidc/mappers/OIDCAttributeMapperHelper.java b/services/src/main/java/org/keycloak/protocol/oidc/mappers/OIDCAttributeMapperHelper.java index 552e4718d0..881971305e 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/mappers/OIDCAttributeMapperHelper.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/mappers/OIDCAttributeMapperHelper.java @@ -67,22 +67,18 @@ public class OIDCAttributeMapperHelper { } } - public static void addClaimMapper(RealmModel realm, String name, + public static ProtocolMapperModel createClaimMapper(String name, String userAttribute, String tokenClaimName, String claimType, boolean consentRequired, String consentText, - boolean appliedByDefault, boolean accessToken, boolean idToken, String mapperId) { - ProtocolMapperModel mapper = realm.getProtocolMapperByName(OIDCLoginProtocol.LOGIN_PROTOCOL, name); - if (mapper != null) return; - mapper = new ProtocolMapperModel(); + ProtocolMapperModel mapper = new ProtocolMapperModel(); mapper.setName(name); mapper.setProtocolMapper(mapperId); mapper.setProtocol(OIDCLoginProtocol.LOGIN_PROTOCOL); mapper.setConsentRequired(consentRequired); mapper.setConsentText(consentText); - mapper.setAppliedByDefault(appliedByDefault); Map config = new HashMap(); config.put(ProtocolMapperUtils.USER_ATTRIBUTE, userAttribute); config.put(TOKEN_CLAIM_NAME, tokenClaimName); @@ -90,7 +86,7 @@ public class OIDCAttributeMapperHelper { if (accessToken) config.put(INCLUDE_IN_ACCESS_TOKEN, "true"); if (idToken) config.put(INCLUDE_IN_ID_TOKEN, "true"); mapper.setConfig(config); - realm.addProtocolMapper(mapper); + return mapper; } public static boolean includeInIDToken(ProtocolMapperModel mappingModel) { diff --git a/services/src/main/java/org/keycloak/protocol/oidc/mappers/OIDCUserAttributeMapper.java b/services/src/main/java/org/keycloak/protocol/oidc/mappers/OIDCUserAttributeMapper.java index 98045ba72f..f0f565782e 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/mappers/OIDCUserAttributeMapper.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/mappers/OIDCUserAttributeMapper.java @@ -114,16 +114,15 @@ public class OIDCUserAttributeMapper extends AbstractOIDCProtocolMapper implemen return token; } - public static void addClaimMapper(RealmModel realm, String name, + public static ProtocolMapperModel createClaimMapper(String name, String userAttribute, String tokenClaimName, String claimType, boolean consentRequired, String consentText, - boolean appliedByDefault, boolean accessToken, boolean idToken) { - OIDCAttributeMapperHelper.addClaimMapper(realm, name, userAttribute, + return OIDCAttributeMapperHelper.createClaimMapper(name, userAttribute, tokenClaimName, claimType, consentRequired, consentText, - appliedByDefault, accessToken, idToken, + accessToken, idToken, PROVIDER_ID); } diff --git a/services/src/main/java/org/keycloak/protocol/oidc/mappers/OIDCUserModelMapper.java b/services/src/main/java/org/keycloak/protocol/oidc/mappers/OIDCUserModelMapper.java index 91cb5ad23d..cd0cd03d68 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/mappers/OIDCUserModelMapper.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/mappers/OIDCUserModelMapper.java @@ -112,16 +112,15 @@ public class OIDCUserModelMapper extends AbstractOIDCProtocolMapper implements O OIDCAttributeMapperHelper.mapClaim(token, mappingModel, propertyValue); } - public static void addClaimMapper(RealmModel realm, String name, + public static ProtocolMapperModel createClaimMapper(String name, String userAttribute, String tokenClaimName, String claimType, boolean consentRequired, String consentText, - boolean appliedByDefault, boolean accessToken, boolean idToken) { - OIDCAttributeMapperHelper.addClaimMapper(realm, name, userAttribute, + return OIDCAttributeMapperHelper.createClaimMapper(name, userAttribute, tokenClaimName, claimType, consentRequired, consentText, - appliedByDefault, accessToken, idToken, + accessToken, idToken, PROVIDER_ID); } diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ApplicationResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ApplicationResource.java index 583d886633..cc996cda40 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/ApplicationResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ApplicationResource.java @@ -89,8 +89,8 @@ public class ApplicationResource { } @Path("protocol-mappers") - public ClientProtocolMappersResource getProtocolMappers() { - ClientProtocolMappersResource mappers = new ClientProtocolMappersResource(realm, auth, application); + public ProtocolMappersResource getProtocolMappers() { + ProtocolMappersResource mappers = new ProtocolMappersResource(application, auth); ResteasyProviderFactory.getInstance().injectProperties(mappers); //resourceContext.initResource(mappers); return mappers; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientProtocolMappersResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientProtocolMappersResource.java deleted file mode 100755 index e9e482fd11..0000000000 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientProtocolMappersResource.java +++ /dev/null @@ -1,120 +0,0 @@ -package org.keycloak.services.resources.admin; - -import org.jboss.logging.Logger; -import org.jboss.resteasy.annotations.cache.NoCache; -import org.jboss.resteasy.spi.NotFoundException; -import org.keycloak.models.ClientModel; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.ProtocolMapperModel; -import org.keycloak.models.RealmModel; -import org.keycloak.models.utils.ModelToRepresentation; -import org.keycloak.models.utils.RepresentationToModel; -import org.keycloak.representations.idm.ProtocolMapperRepresentation; - -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; - -/** - * Base resource for managing users - * - * @author Bill Burke - * @version $Revision: 1 $ - */ -public class ClientProtocolMappersResource { - protected static final Logger logger = Logger.getLogger(ClientProtocolMappersResource.class); - protected ClientModel client; - protected RealmModel realm; - protected RealmAuth auth; - - @Context - protected UriInfo uriInfo; - - @Context - protected KeycloakSession session; - - public ClientProtocolMappersResource(RealmModel realm, RealmAuth auth, ClientModel client) { - this.auth = auth; - this.realm = realm; - this.client = client; - - auth.init(RealmAuth.Resource.USER); - } - - /** - * Map of mappers by name for a specific protocol attached to the client - * - * @param protocol - * @return - */ - @GET - @NoCache - @Path("protocol/{protocol}") - @Produces("application/json") - public List getMappersPerProtocol(@PathParam("protocol") String protocol) { - auth.requireView(); - List mappers = new LinkedList(); - for (ProtocolMapperModel mapper : client.getProtocolMappers()) { - mappers.add(ModelToRepresentation.toRepresentation(mapper)); - } - return mappers; - } - - /** - * Add mappers to client. - * - * @param mapperIds List of mapper ids - */ - @Path("models") - @POST - @NoCache - @Consumes("application/json") - public void addMappers(Set mapperIds) { - auth.requireManage(); - client.addProtocolMappers(mapperIds); - } - - /** - * remove client mappers. - * - * @param mapperIds List of mapper ids - */ - @Path("models") - @DELETE - @NoCache - @Consumes("application/json") - public void removeMappers(Set mapperIds) { - auth.requireManage(); - client.removeProtocolMappers(mapperIds); - } - - @GET - @NoCache - @Path("models") - @Produces("application/json") - public List getMappers() { - auth.requireView(); - List mappers = new LinkedList(); - for (ProtocolMapperModel mapper : realm.getProtocolMappers()) { - mappers.add(ModelToRepresentation.toRepresentation(mapper)); - } - return mappers; - } - - - - -} diff --git a/services/src/main/java/org/keycloak/services/resources/admin/OAuthClientResource.java b/services/src/main/java/org/keycloak/services/resources/admin/OAuthClientResource.java index e5768e6f0b..10b20b83ae 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/OAuthClientResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/OAuthClientResource.java @@ -80,8 +80,8 @@ public class OAuthClientResource { * @return */ @Path("protocol-mappers") - public ClientProtocolMappersResource getProtocolMappers() { - ClientProtocolMappersResource mappers = new ClientProtocolMappersResource(realm, auth, oauthClient); + public ProtocolMappersResource getProtocolMappers() { + ProtocolMappersResource mappers = new ProtocolMappersResource(oauthClient, auth); ResteasyProviderFactory.getInstance().injectProperties(mappers); //resourceContext.initResource(mappers); return mappers; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ProtocolMappersResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ProtocolMappersResource.java index 49f8053262..e4fff5ff4a 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/ProtocolMappersResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ProtocolMappersResource.java @@ -3,6 +3,7 @@ package org.keycloak.services.resources.admin; import org.jboss.logging.Logger; import org.jboss.resteasy.annotations.cache.NoCache; import org.jboss.resteasy.spi.NotFoundException; +import org.keycloak.models.ClientModel; import org.keycloak.models.KerberosConstants; import org.keycloak.models.KeycloakSession; import org.keycloak.models.ProtocolMapperModel; @@ -47,7 +48,7 @@ import java.util.Map; public class ProtocolMappersResource { protected static final Logger logger = Logger.getLogger(ProtocolMappersResource.class); - protected RealmModel realm; + protected ClientModel client; protected RealmAuth auth; @@ -57,9 +58,9 @@ public class ProtocolMappersResource { @Context protected KeycloakSession session; - public ProtocolMappersResource(RealmModel realm, RealmAuth auth) { + public ProtocolMappersResource(ClientModel client, RealmAuth auth) { this.auth = auth; - this.realm = realm; + this.client = client; auth.init(RealmAuth.Resource.USER); } @@ -77,14 +78,14 @@ public class ProtocolMappersResource { public List getMappersPerProtocol(@PathParam("protocol") String protocol) { auth.requireView(); List mappers = new LinkedList(); - for (ProtocolMapperModel mapper : realm.getProtocolMappers()) { + for (ProtocolMapperModel mapper : client.getProtocolMappers()) { if (mapper.getProtocol().equals(protocol)) mappers.add(ModelToRepresentation.toRepresentation(mapper)); } return mappers; } /** - * createa mapper + * creates mapper * * @param rep */ @@ -95,9 +96,24 @@ public class ProtocolMappersResource { public Response createMapper(ProtocolMapperRepresentation rep) { auth.requireManage(); ProtocolMapperModel model = RepresentationToModel.toModel(rep); - model = realm.addProtocolMapper(model); + model = client.addProtocolMapper(model); return Response.created(uriInfo.getAbsolutePathBuilder().path(model.getId()).build()).build(); } + /** + * creates multiple mapper + * + */ + @Path("add-models") + @POST + @NoCache + @Consumes("application/json") + public void createMapper(List reps) { + auth.requireManage(); + for (ProtocolMapperRepresentation rep : reps) { + ProtocolMapperModel model = RepresentationToModel.toModel(rep); + model = client.addProtocolMapper(model); + } + } @GET @NoCache @@ -106,7 +122,7 @@ public class ProtocolMappersResource { public List getMappers() { auth.requireView(); List mappers = new LinkedList(); - for (ProtocolMapperModel mapper : realm.getProtocolMappers()) { + for (ProtocolMapperModel mapper : client.getProtocolMappers()) { mappers.add(ModelToRepresentation.toRepresentation(mapper)); } return mappers; @@ -118,7 +134,7 @@ public class ProtocolMappersResource { @Produces("application/json") public ProtocolMapperRepresentation getMapperById(@PathParam("id") String id) { auth.requireView(); - ProtocolMapperModel model = realm.getProtocolMapperById(id); + ProtocolMapperModel model = client.getProtocolMapperById(id); if (model == null) throw new NotFoundException("Model not found"); return ModelToRepresentation.toRepresentation(model); } @@ -129,10 +145,10 @@ public class ProtocolMappersResource { @Consumes("application/json") public void update(@PathParam("id") String id, ProtocolMapperRepresentation rep) { auth.requireManage(); - ProtocolMapperModel model = realm.getProtocolMapperById(id); + ProtocolMapperModel model = client.getProtocolMapperById(id); if (model == null) throw new NotFoundException("Model not found"); model = RepresentationToModel.toModel(rep); - realm.updateProtocolMapper(model); + client.updateProtocolMapper(model); } @DELETE @@ -140,9 +156,9 @@ public class ProtocolMappersResource { @Path("models/{id}") public void delete(@PathParam("id") String id) { auth.requireManage(); - ProtocolMapperModel model = realm.getProtocolMapperById(id); + ProtocolMapperModel model = client.getProtocolMapperById(id); if (model == null) throw new NotFoundException("Model not found"); - realm.removeProtocolMapper(model); + client.removeProtocolMapper(model); } diff --git a/services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java b/services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java index 4eefb1fdaa..5b807ca321 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java @@ -12,6 +12,7 @@ import org.keycloak.exportimport.ApplicationImporter; import org.keycloak.models.ApplicationModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.ModelDuplicateException; +import org.keycloak.models.ProtocolMapperModel; import org.keycloak.models.RealmModel; import org.keycloak.models.UserFederationProviderModel; import org.keycloak.models.UserSessionModel; @@ -19,8 +20,12 @@ import org.keycloak.models.cache.CacheRealmProvider; import org.keycloak.models.cache.CacheUserProvider; import org.keycloak.models.utils.ModelToRepresentation; import org.keycloak.models.utils.RepresentationToModel; +import org.keycloak.protocol.LoginProtocol; +import org.keycloak.protocol.LoginProtocolFactory; import org.keycloak.protocol.oidc.TokenManager; +import org.keycloak.provider.ProviderFactory; import org.keycloak.representations.adapters.action.GlobalRequestResult; +import org.keycloak.representations.idm.ProtocolMapperRepresentation; import org.keycloak.representations.idm.RealmEventsConfigRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.services.managers.LDAPConnectionTestManager; @@ -273,18 +278,6 @@ public class RealmAdminResource { return new ResourceAdminManager().pushRealmRevocationPolicy(uriInfo.getRequestUri(), realm); } - /** - * Protocol mappers - * - */ - @Path("protocol-mappers") - public ProtocolMappersResource protocolMappers() { - ProtocolMappersResource mappers = new ProtocolMappersResource(realm, auth); - ResteasyProviderFactory.getInstance().injectProperties(mappers); - //resourceContext.initResource(mappers); - return mappers; - } - /** * Removes all user sessions. Any application that has an admin url will also be told to invalidate any sessions * they have. diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ServerInfoAdminResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ServerInfoAdminResource.java index 0c870934c8..4bfb629d27 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/ServerInfoAdminResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ServerInfoAdminResource.java @@ -1,6 +1,5 @@ package org.keycloak.services.resources.admin; -import org.jboss.resteasy.annotations.cache.Cache; import org.keycloak.Version; import org.keycloak.broker.provider.IdentityProvider; import org.keycloak.broker.provider.IdentityProviderFactory; @@ -10,11 +9,15 @@ import org.keycloak.exportimport.ApplicationImporterFactory; import org.keycloak.freemarker.Theme; import org.keycloak.freemarker.ThemeProvider; import org.keycloak.models.KeycloakSession; +import org.keycloak.models.ProtocolMapperModel; +import org.keycloak.models.utils.ModelToRepresentation; import org.keycloak.protocol.LoginProtocol; +import org.keycloak.protocol.LoginProtocolFactory; import org.keycloak.protocol.ProtocolMapper; import org.keycloak.provider.ProviderFactory; import org.keycloak.provider.Spi; import org.keycloak.representations.idm.IdentityProviderRepresentation; +import org.keycloak.representations.idm.ProtocolMapperRepresentation; import org.keycloak.representations.idm.ProtocolMapperTypeRepresentation; import org.keycloak.social.SocialIdentityProvider; @@ -55,7 +58,8 @@ public class ServerInfoAdminResource { setProtocols(info); setApplicationImporters(info); setProviders(info); - setProtocolMappers(info); + setProtocolMapperTypes(info); + setBuiltinProtocolMappers(info); return info; } @@ -131,7 +135,7 @@ public class ServerInfoAdminResource { Collections.sort(info.protocols); } - private void setProtocolMappers(ServerInfoRepresentation info) { + private void setProtocolMapperTypes(ServerInfoRepresentation info) { info.protocolMapperTypes = new HashMap>(); for (ProviderFactory p : session.getKeycloakSessionFactory().getProviderFactories(ProtocolMapper.class)) { ProtocolMapper mapper = (ProtocolMapper)p; @@ -159,6 +163,18 @@ public class ServerInfoAdminResource { } } + private void setBuiltinProtocolMappers(ServerInfoRepresentation info) { + info.builtinProtocolMappers = new HashMap<>(); + for (ProviderFactory p : session.getKeycloakSessionFactory().getProviderFactories(LoginProtocol.class)) { + LoginProtocolFactory factory = (LoginProtocolFactory)p; + List mappers = new LinkedList<>(); + for (ProtocolMapperModel mapper : factory.getBuiltinMappers()) { + mappers.add(ModelToRepresentation.toRepresentation(mapper)); + } + info.builtinProtocolMappers.put(p.getId(), mappers); + } + } + private void setApplicationImporters(ServerInfoRepresentation info) { info.applicationImporters = new LinkedList>(); for (ProviderFactory p : session.getKeycloakSessionFactory().getProviderFactories(ApplicationImporter.class)) { @@ -187,6 +203,7 @@ public class ServerInfoAdminResource { private List eventListeners; private Map> protocolMapperTypes; + private Map> builtinProtocolMappers; public ServerInfoRepresentation() { } @@ -230,6 +247,14 @@ public class ServerInfoAdminResource { public Map> getProtocolMapperTypes() { return protocolMapperTypes; } + + public Map> getBuiltinProtocolMappers() { + return builtinProtocolMappers; + } + + public void setBuiltinProtocolMappers(Map> builtinProtocolMappers) { + this.builtinProtocolMappers = builtinProtocolMappers; + } } }