();
- for (UserRepresentation userRep : rep.getUsers()) userReps.put(userRep.getUsername(), userRep);
-
- // override enabled to false if user does not have at least all of browser or client credentials
- for (UserRepresentation userRep : rep.getUsers())
- {
- if (userRep.getCredentials() == null)
- {
- userRep.setEnabled(false);
- }
- else
- {
- boolean hasBrowserCredentials = true;
- for (RequiredCredentialRepresentation credential : rep.getRequiredCredentials())
- {
- boolean hasCredential = false;
- for (UserRepresentation.Credential cred : userRep.getCredentials())
- {
- if (cred.getType().equals(credential.getType()))
- {
- hasCredential = true;
- break;
- }
- }
- if (!hasCredential)
- {
- hasBrowserCredentials = false;
- break;
- }
- }
- if (!hasBrowserCredentials)
- {
- userRep.setEnabled(false);
- }
-
- }
- }
-
- if (rep.getResources() != null)
- {
- // check mappings
- for (ResourceRepresentation resourceRep : rep.getResources())
- {
- if (resourceRep.getRoleMappings() != null)
- {
- for (RoleMappingRepresentation mapping : resourceRep.getRoleMappings())
- {
- if (!userReps.containsKey(mapping.getUsername()))
- {
- throw new WebApplicationException(Response.status(Response.Status.BAD_REQUEST)
- .entity("No users declared for role mapping").type("text/plain").build());
-
- }
- }
- }
- }
- }
- }
-
-}
diff --git a/services/src/main/java/org/keycloak/services/resources/RealmResource.java b/services/src/main/java/org/keycloak/services/resources/RealmResource.java
deleted file mode 100755
index a2ec89a3cae4..000000000000
--- a/services/src/main/java/org/keycloak/services/resources/RealmResource.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package org.keycloak.services.resources;
-
-import org.keycloak.services.models.RealmManager;
-import org.jboss.resteasy.logging.Logger;
-import org.keycloak.representations.idm.PublishedRealmRepresentation;
-import org.keycloak.services.models.RealmModel;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.NotFoundException;
-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.UriBuilder;
-import javax.ws.rs.core.UriInfo;
-
-/**
- * @author Bill Burke
- * @version $Revision: 1 $
- */
-@Path("/realms")
-public class RealmResource
-{
- protected Logger logger = Logger.getLogger(RealmResource.class);
- protected RealmManager adapter;
- @Context
- protected UriInfo uriInfo;
-
- public RealmResource(RealmManager adapter)
- {
- this.adapter = adapter;
- }
-
- @GET
- @Path("{realm}")
- @Produces("application/json")
- public PublishedRealmRepresentation getRealm(@PathParam("realm") String id)
- {
- RealmModel realm = adapter.getRealm(id);
- if (realm == null)
- {
- logger.debug("realm not found");
- throw new NotFoundException();
- }
- return realmRep(realm, uriInfo);
- }
-
- @GET
- @Path("{realm}.html")
- @Produces("text/html")
- public String getRealmHtml(@PathParam("realm") String id)
- {
- RealmModel realm = adapter.getRealm(id);
- if (realm == null)
- {
- logger.debug("realm not found");
- throw new NotFoundException();
- }
- return realmHtml(realm);
- }
-
- private String realmHtml(RealmModel realm)
- {
- StringBuffer html = new StringBuffer();
-
- UriBuilder auth = uriInfo.getBaseUriBuilder();
- auth.path(TokenService.class)
- .path(TokenService.class, "requestAccessCode");
- String authUri = auth.build(realm.getId()).toString();
-
- UriBuilder code = uriInfo.getBaseUriBuilder();
- code.path(TokenService.class).path(TokenService.class, "accessRequest");
- String codeUri = code.build(realm.getId()).toString();
-
- UriBuilder grant = uriInfo.getBaseUriBuilder();
- grant.path(TokenService.class).path(TokenService.class, "accessTokenGrant");
- String grantUrl = grant.build(realm.getId()).toString();
-
- UriBuilder idGrant = uriInfo.getBaseUriBuilder();
- grant.path(TokenService.class).path(TokenService.class, "identityTokenGrant");
- String idGrantUrl = idGrant.build(realm.getId()).toString();
-
- html.append("Realm: ").append(realm.getName()).append("
");
- html.append("auth: ").append(authUri).append("
");
- html.append("code: ").append(codeUri).append("
");
- html.append("grant: ").append(grantUrl).append("
");
- html.append("identity grant: ").append(idGrantUrl).append("
");
- html.append("public key: ").append(realm.getPublicKeyPem()).append("
");
- html.append("");
-
- return html.toString();
- }
-
-
- public static PublishedRealmRepresentation realmRep(RealmModel realm, UriInfo uriInfo)
- {
- PublishedRealmRepresentation rep = new PublishedRealmRepresentation();
- rep.setRealm(realm.getName());
- rep.setSelf(uriInfo.getRequestUri().toString());
- rep.setPublicKeyPem(realm.getPublicKeyPem());
-
- UriBuilder auth = uriInfo.getBaseUriBuilder();
- auth.path(TokenService.class)
- .path(TokenService.class, "requestAccessCode");
- rep.setAuthorizationUrl(auth.build(realm.getId()).toString());
-
- UriBuilder code = uriInfo.getBaseUriBuilder();
- code.path(TokenService.class).path(TokenService.class, "accessRequest");
- rep.setCodeUrl(code.build(realm.getId()).toString());
-
- UriBuilder grant = uriInfo.getBaseUriBuilder();
- grant.path(TokenService.class).path(TokenService.class, "accessTokenGrant");
- String grantUrl = grant.build(realm.getId()).toString();
- rep.setGrantUrl(grantUrl);
-
- UriBuilder idGrant = uriInfo.getBaseUriBuilder();
- grant.path(TokenService.class).path(TokenService.class, "identityTokenGrant");
- String idGrantUrl = idGrant.build(realm.getId()).toString();
- rep.setIdentityGrantUrl(idGrantUrl);
- return rep;
- }
-}
diff --git a/services/src/main/java/org/keycloak/services/resources/RealmSubResource.java b/services/src/main/java/org/keycloak/services/resources/RealmSubResource.java
new file mode 100755
index 000000000000..9d76a21a609b
--- /dev/null
+++ b/services/src/main/java/org/keycloak/services/resources/RealmSubResource.java
@@ -0,0 +1,105 @@
+package org.keycloak.services.resources;
+
+import org.jboss.resteasy.logging.Logger;
+import org.keycloak.representations.idm.PublishedRealmRepresentation;
+import org.keycloak.services.models.RealmModel;
+import org.picketlink.idm.IdentitySession;
+
+import javax.ws.rs.GET;
+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.UriBuilder;
+import javax.ws.rs.core.UriInfo;
+
+/**
+ * @author Bill Burke
+ * @version $Revision: 1 $
+ */
+public class RealmSubResource {
+ protected static final Logger logger = Logger.getLogger(RealmSubResource.class);
+
+ @Context
+ protected UriInfo uriInfo;
+
+ @Context
+ protected IdentitySession IdentitySession;
+
+ protected RealmModel realm;
+
+ public RealmSubResource(RealmModel realm) {
+ this.realm = realm;
+ }
+
+ @GET
+ @Path("json")
+ @Produces("application/json")
+ public PublishedRealmRepresentation getRealm(@PathParam("realm") String id) {
+ return realmRep(realm, uriInfo);
+ }
+
+ @GET
+ @Path("html")
+ @Produces("text/html")
+ public String getRealmHtml(@PathParam("realm") String id) {
+ StringBuffer html = new StringBuffer();
+
+ UriBuilder auth = uriInfo.getBaseUriBuilder();
+ auth.path(TokenService.class)
+ .path(TokenService.class, "requestAccessCode");
+ String authUri = auth.build(realm.getId()).toString();
+
+ UriBuilder code = uriInfo.getBaseUriBuilder();
+ code.path(TokenService.class).path(TokenService.class, "accessRequest");
+ String codeUri = code.build(realm.getId()).toString();
+
+ UriBuilder grant = uriInfo.getBaseUriBuilder();
+ grant.path(TokenService.class).path(TokenService.class, "accessTokenGrant");
+ String grantUrl = grant.build(realm.getId()).toString();
+
+ UriBuilder idGrant = uriInfo.getBaseUriBuilder();
+ grant.path(TokenService.class).path(TokenService.class, "identityTokenGrant");
+ String idGrantUrl = idGrant.build(realm.getId()).toString();
+
+ html.append("Realm: ").append(realm.getName()).append("
");
+ html.append("auth: ").append(authUri).append("
");
+ html.append("code: ").append(codeUri).append("
");
+ html.append("grant: ").append(grantUrl).append("
");
+ html.append("identity grant: ").append(idGrantUrl).append("
");
+ html.append("public key: ").append(realm.getPublicKeyPem()).append("
");
+ html.append("");
+
+ return html.toString();
+ }
+
+
+ public static PublishedRealmRepresentation realmRep(RealmModel realm, UriInfo uriInfo) {
+ PublishedRealmRepresentation rep = new PublishedRealmRepresentation();
+ rep.setRealm(realm.getName());
+ rep.setSelf(uriInfo.getRequestUri().toString());
+ rep.setPublicKeyPem(realm.getPublicKeyPem());
+
+ UriBuilder auth = uriInfo.getBaseUriBuilder();
+ auth.path(RealmsResource.class).path(RealmsResource.class, "getTokenService")
+ .path(TokenService.class, "requestAccessCode");
+ rep.setAuthorizationUrl(auth.build(realm.getId()).toString());
+
+ UriBuilder code = uriInfo.getBaseUriBuilder();
+ code.path(RealmsResource.class).path(RealmsResource.class, "getTokenService").path(TokenService.class, "accessRequest");
+ rep.setCodeUrl(code.build(realm.getId()).toString());
+
+ UriBuilder grant = uriInfo.getBaseUriBuilder();
+ grant.path(RealmsResource.class).path(RealmsResource.class, "getTokenService").path(TokenService.class, "accessTokenGrant");
+ String grantUrl = grant.build(realm.getId()).toString();
+ rep.setGrantUrl(grantUrl);
+
+ UriBuilder idGrant = uriInfo.getBaseUriBuilder();
+ grant.path(RealmsResource.class).path(RealmsResource.class, "getTokenService").path(TokenService.class, "identityTokenGrant");
+ String idGrantUrl = idGrant.build(realm.getId()).toString();
+ rep.setIdentityGrantUrl(idGrantUrl);
+ return rep;
+ }
+
+
+}
diff --git a/services/src/main/java/org/keycloak/services/resources/RealmsResource.java b/services/src/main/java/org/keycloak/services/resources/RealmsResource.java
new file mode 100755
index 000000000000..b749569102db
--- /dev/null
+++ b/services/src/main/java/org/keycloak/services/resources/RealmsResource.java
@@ -0,0 +1,323 @@
+package org.keycloak.services.resources;
+
+import org.jboss.resteasy.logging.Logger;
+import org.keycloak.representations.idm.RealmRepresentation;
+import org.keycloak.representations.idm.RequiredCredentialRepresentation;
+import org.keycloak.representations.idm.ResourceRepresentation;
+import org.keycloak.representations.idm.RoleMappingRepresentation;
+import org.keycloak.representations.idm.ScopeMappingRepresentation;
+import org.keycloak.representations.idm.UserRepresentation;
+import org.keycloak.services.managers.AccessCodeEntry;
+import org.keycloak.services.managers.AuthenticationManager;
+import org.keycloak.services.models.RealmManager;
+import org.keycloak.services.models.RealmModel;
+import org.keycloak.services.models.RequiredCredentialModel;
+import org.keycloak.services.models.ResourceModel;
+import org.keycloak.services.models.UserCredentialModel;
+import org.picketlink.idm.IdentitySession;
+import org.picketlink.idm.model.Attribute;
+import org.picketlink.idm.model.Realm;
+import org.picketlink.idm.model.Role;
+import org.picketlink.idm.model.SimpleRole;
+import org.picketlink.idm.model.SimpleUser;
+import org.picketlink.idm.model.User;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.NotAuthorizedException;
+import javax.ws.rs.NotFoundException;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.container.ResourceContext;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriBuilder;
+import javax.ws.rs.core.UriInfo;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * @author Bill Burke
+ * @version $Revision: 1 $
+ */
+@Path("/realms")
+public class RealmsResource {
+ protected static Logger logger = Logger.getLogger(RealmsResource.class);
+
+ @Context
+ protected UriInfo uriInfo;
+
+ @Context
+ protected HttpHeaders headers;
+
+ @Context
+ protected
+ IdentitySession IdentitySession;
+
+ @Context
+ ResourceContext resourceContext;
+
+ protected Map accessCodes = new ConcurrentHashMap();
+
+ @Path("{realm}/tokens")
+ public TokenService getTokenService(@PathParam("realm") String id) {
+ RealmManager realmManager = new RealmManager(IdentitySession);
+ RealmModel realm = realmManager.getRealm(id);
+ if (realm == null) {
+ logger.debug("realm not found");
+ throw new NotFoundException();
+ }
+ TokenService tokenService = new TokenService(realm, accessCodes);
+ resourceContext.initResource(tokenService);
+ return tokenService;
+
+ }
+
+
+ @Path("{realm}")
+ public RealmSubResource getRealmResource(@PathParam("realm") String id) {
+ RealmManager realmManager = new RealmManager(IdentitySession);
+ RealmModel realm = realmManager.getRealm(id);
+ if (realm == null) {
+ logger.debug("realm not found");
+ throw new NotFoundException();
+ }
+ RealmSubResource realmResource = new RealmSubResource(realm);
+ resourceContext.initResource(realmResource);
+ return realmResource;
+
+ }
+
+
+ @POST
+ @Consumes("application/json")
+ public Response importRealm(RealmRepresentation rep) {
+ IdentitySession.getTransaction().begin();
+ RealmModel realm;
+ try {
+ realm = createRealm(rep);
+ IdentitySession.getTransaction().commit();
+ } catch (RuntimeException re) {
+ IdentitySession.getTransaction().rollback();
+ throw re;
+ }
+ UriBuilder builder = uriInfo.getRequestUriBuilder().path(realm.getId());
+ return Response.created(builder.build())
+ .entity(RealmSubResource.realmRep(realm, uriInfo))
+ .type(MediaType.APPLICATION_JSON_TYPE).build();
+ }
+
+ protected RealmModel createRealm(RealmRepresentation rep) {
+ RealmManager realmManager = new RealmManager(IdentitySession);
+ RealmModel defaultRealm = realmManager.getRealm(Realm.DEFAULT_REALM);
+ User realmCreator = new AuthenticationManager().authenticateToken(defaultRealm, headers);
+ Role creatorRole = defaultRealm.getIdm().getRole(RegistrationService.REALM_CREATOR_ROLE);
+ if (!defaultRealm.getIdm().hasRole(realmCreator, creatorRole)) {
+ logger.warn("not a realm creator");
+ throw new NotAuthorizedException("Bearer");
+ }
+ verifyRealmRepresentation(rep);
+
+ RealmModel realm = realmManager.createRealm(rep.getRealm());
+ realmManager.generateRealmKeys(realm);
+ realm.addRealmAdmin(realmCreator);
+ realm.setName(rep.getRealm());
+ realm.setEnabled(rep.isEnabled());
+ realm.setTokenLifespan(rep.getTokenLifespan());
+ realm.setAccessCodeLifespan(rep.getAccessCodeLifespan());
+ realm.setSslNotRequired(rep.isSslNotRequired());
+ realm.setCookieLoginAllowed(rep.isCookieLoginAllowed());
+ realm.updateRealm();
+
+
+ Map userMap = new HashMap();
+
+ for (RequiredCredentialRepresentation requiredCred : rep.getRequiredCredentials()) {
+ RequiredCredentialModel credential = new RequiredCredentialModel();
+ credential.setType(requiredCred.getType());
+ credential.setInput(requiredCred.isInput());
+ credential.setSecret(requiredCred.isSecret());
+ realm.addRequiredCredential(credential);
+ }
+
+ for (UserRepresentation userRep : rep.getUsers()) {
+ User user = new SimpleUser(userRep.getUsername());
+ user.setEnabled(userRep.isEnabled());
+ if (userRep.getAttributes() != null) {
+ for (Map.Entry entry : userRep.getAttributes().entrySet()) {
+ user.setAttribute(new Attribute(entry.getKey(), entry.getValue()));
+ }
+ }
+ realm.getIdm().add(user);
+ if (userRep.getCredentials() != null) {
+ for (UserRepresentation.Credential cred : userRep.getCredentials()) {
+ UserCredentialModel credential = new UserCredentialModel();
+ credential.setType(cred.getType());
+ credential.setValue(cred.getValue());
+ realm.updateCredential(user, credential);
+ }
+ }
+ userMap.put(user.getLoginName(), user);
+ }
+
+ Map roles = new HashMap();
+
+ if (rep.getRoles() != null) {
+ for (String roleString : rep.getRoles()) {
+ SimpleRole role = new SimpleRole(roleString.trim());
+ realm.getIdm().add(role);
+ roles.put(role.getName(), role);
+ }
+ }
+
+ if (rep.getRoleMappings() != null) {
+ for (RoleMappingRepresentation mapping : rep.getRoleMappings()) {
+ User user = userMap.get(mapping.getUsername());
+ for (String roleString : mapping.getRoles()) {
+ Role role = roles.get(roleString.trim());
+ if (role == null) {
+ role = new SimpleRole(roleString.trim());
+ realm.getIdm().add(role);
+ roles.put(role.getName(), role);
+ }
+ realm.getIdm().grantRole(user, role);
+ }
+ }
+ }
+
+ if (rep.getScopeMappings() != null) {
+ for (ScopeMappingRepresentation scope : rep.getScopeMappings()) {
+ for (String roleString : scope.getRoles()) {
+ Role role = roles.get(roleString.trim());
+ if (role == null) {
+ role = new SimpleRole(roleString.trim());
+ realm.getIdm().add(role);
+ roles.put(role.getName(), role);
+ }
+ User user = userMap.get(scope.getUsername());
+ realm.addScope(user, role.getName());
+ }
+
+ }
+ }
+
+ if (!roles.containsKey("*")) {
+ SimpleRole wildcard = new SimpleRole("*");
+ realm.getIdm().add(wildcard);
+ roles.put("*", wildcard);
+ }
+
+ if (rep.getResources() != null) {
+ createResources(rep, realm, userMap);
+ }
+ return realm;
+ }
+
+ protected void createResources(RealmRepresentation rep, RealmModel realm, Map userMap) {
+ for (ResourceRepresentation resourceRep : rep.getResources()) {
+ ResourceModel resource = realm.addResource(resourceRep.getName());
+ resource.setSurrogateAuthRequired(resourceRep.isSurrogateAuthRequired());
+ resource.updateResource();
+ Map roles = new HashMap();
+ if (resourceRep.getRoles() != null) {
+ for (String roleString : resourceRep.getRoles()) {
+ SimpleRole role = new SimpleRole(roleString.trim());
+ resource.getIdm().add(role);
+ roles.put(role.getName(), role);
+ }
+ }
+ if (resourceRep.getRoleMappings() != null) {
+ for (RoleMappingRepresentation mapping : resourceRep.getRoleMappings()) {
+ User user = userMap.get(mapping.getUsername());
+ for (String roleString : mapping.getRoles()) {
+ Role role = roles.get(roleString.trim());
+ if (role == null) {
+ role = new SimpleRole(roleString.trim());
+ resource.getIdm().add(role);
+ roles.put(role.getName(), role);
+ }
+ Role role1 = resource.getIdm().getRole(role.getName());
+ realm.getIdm().grantRole(user, role1);
+ }
+ }
+ }
+ if (resourceRep.getScopeMappings() != null) {
+ for (ScopeMappingRepresentation mapping : resourceRep.getScopeMappings()) {
+ User user = userMap.get(mapping.getUsername());
+ for (String roleString : mapping.getRoles()) {
+ Role role = roles.get(roleString.trim());
+ if (role == null) {
+ role = new SimpleRole(roleString.trim());
+ resource.getIdm().add(role);
+ roles.put(role.getName(), role);
+ }
+ resource.addScope(user, role.getName());
+ }
+ }
+ }
+ if (!roles.containsKey("*")) {
+ SimpleRole wildcard = new SimpleRole("*");
+ resource.getIdm().add(wildcard);
+ roles.put("*", wildcard);
+ }
+
+ }
+ }
+
+ protected void verifyRealmRepresentation(RealmRepresentation rep) {
+ if (rep.getRequiredCredentials() == null) {
+ throw new WebApplicationException(Response.status(Response.Status.BAD_REQUEST)
+ .entity("Realm credential requirements not defined").type("text/plain").build());
+
+ }
+
+ HashMap userReps = new HashMap();
+ for (UserRepresentation userRep : rep.getUsers()) userReps.put(userRep.getUsername(), userRep);
+
+ // override enabled to false if user does not have at least all of browser or client credentials
+ for (UserRepresentation userRep : rep.getUsers()) {
+ if (userRep.getCredentials() == null) {
+ userRep.setEnabled(false);
+ } else {
+ boolean hasBrowserCredentials = true;
+ for (RequiredCredentialRepresentation credential : rep.getRequiredCredentials()) {
+ boolean hasCredential = false;
+ for (UserRepresentation.Credential cred : userRep.getCredentials()) {
+ if (cred.getType().equals(credential.getType())) {
+ hasCredential = true;
+ break;
+ }
+ }
+ if (!hasCredential) {
+ hasBrowserCredentials = false;
+ break;
+ }
+ }
+ if (!hasBrowserCredentials) {
+ userRep.setEnabled(false);
+ }
+
+ }
+ }
+
+ if (rep.getResources() != null) {
+ // check mappings
+ for (ResourceRepresentation resourceRep : rep.getResources()) {
+ if (resourceRep.getRoleMappings() != null) {
+ for (RoleMappingRepresentation mapping : resourceRep.getRoleMappings()) {
+ if (!userReps.containsKey(mapping.getUsername())) {
+ throw new WebApplicationException(Response.status(Response.Status.BAD_REQUEST)
+ .entity("No users declared for role mapping").type("text/plain").build());
+
+ }
+ }
+ }
+ }
+ }
+ }
+
+}
diff --git a/services/src/main/java/org/keycloak/services/resources/RegistrationService.java b/services/src/main/java/org/keycloak/services/resources/RegistrationService.java
index c4c9b050156f..55c576c3f864 100755
--- a/services/src/main/java/org/keycloak/services/resources/RegistrationService.java
+++ b/services/src/main/java/org/keycloak/services/resources/RegistrationService.java
@@ -1,15 +1,17 @@
package org.keycloak.services.resources;
+import org.jboss.resteasy.logging.Logger;
import org.keycloak.representations.idm.UserRepresentation;
import org.keycloak.services.models.RealmManager;
import org.keycloak.services.models.RealmModel;
import org.keycloak.services.models.UserCredentialModel;
-import org.picketlink.idm.model.Realm;
+import org.picketlink.idm.IdentitySession;
import org.picketlink.idm.model.Role;
import org.picketlink.idm.model.SimpleUser;
import org.picketlink.idm.model.User;
import javax.ws.rs.Consumes;
+import javax.ws.rs.ForbiddenException;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.core.Context;
@@ -23,47 +25,53 @@
* @version $Revision: 1 $
*/
@Path("/registrations")
-public class RegistrationService
-{
- public static final String REALM_CREATOR_ROLE = "realm-creator";
- protected RealmManager adapter;
- protected RealmModel defaultRealm;
+public class RegistrationService {
+ protected static final Logger logger = Logger.getLogger(RegistrationService.class);
+ public static final String REALM_CREATOR_ROLE = "realm-creator";
- @Context
- protected UriInfo uriInfo;
+ @Context
+ protected UriInfo uriInfo;
- public RegistrationService(RealmManager adapter)
- {
- this.adapter = adapter;
- defaultRealm = adapter.getRealm(Realm.DEFAULT_REALM);
- }
+ @Context
+ protected IdentitySession identitySession;
+ @POST
+ @Consumes(MediaType.APPLICATION_JSON)
+ public Response register(UserRepresentation newUser) {
+ identitySession.getTransaction().begin();
+ try {
+ RealmManager realmManager = new RealmManager(identitySession);
+ RealmModel defaultRealm = realmManager.defaultRealm();
+ if (!defaultRealm.isEnabled()) {
+ throw new ForbiddenException();
+ }
+ if (!defaultRealm.isRegistrationAllowed()) {
+ throw new ForbiddenException();
+ }
+ User user = defaultRealm.getIdm().getUser(newUser.getUsername());
+ if (user != null) {
+ return Response.status(400).type("text/plain").entity("user exists").build();
+ }
-
- @POST
- @Consumes(MediaType.APPLICATION_JSON)
- public Response register(UserRepresentation newUser)
- {
- User user = defaultRealm.getIdm().getUser(newUser.getUsername());
- if (user != null)
- {
- return Response.status(400).type("text/plain").entity("user exists").build();
- }
-
- user = new SimpleUser(newUser.getUsername());
- defaultRealm.getIdm().add(user);
- for (UserRepresentation.Credential cred : newUser.getCredentials())
- {
- UserCredentialModel credModel = new UserCredentialModel();
- credModel.setType(cred.getType());
- credModel.setValue(cred.getValue());
- defaultRealm.updateCredential(user, credModel);
- }
- Role realmCreator = defaultRealm.getIdm().getRole(REALM_CREATOR_ROLE);
- defaultRealm.getIdm().grantRole(user, realmCreator);
- URI uri = uriInfo.getBaseUriBuilder().path(RealmFactory.class).path(user.getLoginName()).build();
- return Response.created(uri).build();
- }
+ user = new SimpleUser(newUser.getUsername());
+ defaultRealm.getIdm().add(user);
+ for (UserRepresentation.Credential cred : newUser.getCredentials()) {
+ UserCredentialModel credModel = new UserCredentialModel();
+ credModel.setType(cred.getType());
+ credModel.setValue(cred.getValue());
+ defaultRealm.updateCredential(user, credModel);
+ }
+ Role realmCreator = defaultRealm.getIdm().getRole(REALM_CREATOR_ROLE);
+ defaultRealm.getIdm().grantRole(user, realmCreator);
+ identitySession.getTransaction().commit();
+ URI uri = uriInfo.getBaseUriBuilder().path(RealmsResource.class).path(user.getLoginName()).build();
+ return Response.created(uri).build();
+ } catch (RuntimeException e) {
+ logger.error("Failed to register", e);
+ identitySession.getTransaction().rollback();
+ throw e;
+ }
+ }
}
diff --git a/services/src/main/java/org/keycloak/services/resources/SkeletonKeyApplication.java b/services/src/main/java/org/keycloak/services/resources/SkeletonKeyApplication.java
deleted file mode 100755
index 6517a870d862..000000000000
--- a/services/src/main/java/org/keycloak/services/resources/SkeletonKeyApplication.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.keycloak.services.resources;
-
-import org.infinispan.Cache;
-import org.infinispan.manager.DefaultCacheManager;
-import org.keycloak.SkeletonKeyContextResolver;
-
-import javax.ws.rs.core.Application;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * @author Bill Burke
- * @version $Revision: 1 $
- */
-public class SkeletonKeyApplication extends Application
-{
- protected Set