libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases Packages Activity Actions

Merge pull request #53 from patriot1burke/master

Browse source 
model module refactor
This commit is contained in:
Bill Burke 2013-10-02 06:55:53 -07:00
commit 5943de4539
96 changed files with 449 additions and 276 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
examples/as7-eap-demo/server/pom.xml
View file

@ -30,6 +30,16 @@
<artifactId>keycloak-services</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-model-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-model-picketlink</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-social-core</artifactId>

6
examples/as7-eap-demo/server/src/main/java/org/keycloak/example/demo/DemoApplication.java
View file

@ -4,12 +4,10 @@ import org.jboss.resteasy.jwt.JsonSerialization;
import org.keycloak.representations.idm.CredentialRepresentation;
import org.keycloak.representations.idm.RealmRepresentation;
import org.keycloak.services.managers.RealmManager;
import org.keycloak.services.models.KeycloakSession;
import org.keycloak.services.models.RealmModel;
import org.keycloak.services.models.RequiredCredentialModel;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.RealmModel;
import org.keycloak.services.resources.KeycloakApplication;
import org.keycloak.services.resources.SaasService;
import org.keycloak.services.resources.SaasService;
import javax.servlet.ServletContext;
import javax.ws.rs.core.Context;

4
examples/as7-eap-demo/server/src/main/resources/META-INF/persistence.xml
View file

@ -18,8 +18,8 @@
<class>org.picketlink.idm.jpa.model.sample.simple.X509CredentialTypeEntity</class>
<class>org.picketlink.idm.jpa.model.sample.simple.OTPCredentialTypeEntity</class>
<class>org.picketlink.idm.jpa.model.sample.simple.AttributeTypeEntity</class>
<class>org.keycloak.services.models.picketlink.mappings.RealmEntity</class>
<class>org.keycloak.services.models.picketlink.mappings.ApplicationEntity</class>
<class>org.keycloak.models.picketlink.mappings.RealmEntity</class>
<class>org.keycloak.models.picketlink.mappings.ApplicationEntity</class>
<exclude-unlisted-classes>true</exclude-unlisted-classes>

5
forms/pom.xml
View file

@ -18,6 +18,11 @@
<artifactId>keycloak-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-model-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-services</artifactId>

2
forms/src/main/java/org/keycloak/forms/LoginBean.java Normal file → Executable file
View file

@ -51,7 +51,7 @@ public class LoginBean {
}
requiredCredentials = new LinkedList<RequiredCredential>();
for (org.keycloak.services.models.RequiredCredentialModel c : realm.getRealm().getRequiredCredentials()) {
for (org.keycloak.models.RequiredCredentialModel c : realm.getRealm().getRequiredCredentials()) {
if (c.isInput()) {
requiredCredentials.add(new RequiredCredential(c.getType(), c.isSecret(), c.getFormLabel()));
}

2
forms/src/main/java/org/keycloak/forms/RealmBean.java Normal file → Executable file
View file

@ -21,7 +21,7 @@
*/
package org.keycloak.forms;
import org.keycloak.services.models.RealmModel;
import org.keycloak.models.RealmModel;
/**
* @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>

2
forms/src/main/java/org/keycloak/forms/UserBean.java Normal file → Executable file
View file

@ -21,7 +21,7 @@
*/
package org.keycloak.forms;
import org.keycloak.services.models.UserModel;
import org.keycloak.models.UserModel;
/**
* @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>

30
model/api/pom.xml Executable file
View file

@ -0,0 +1,30 @@
<?xml version="1.0"?>
<project>
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.0-alpha-1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>keycloak-model-api</artifactId>
<name>Keycloak Model API</name>
<description/>
<dependencies>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>
</plugins>
</build>
</project>

2
services/src/main/java/org/keycloak/services/models/ApplicationModel.java → model/api/src/main/java/org/keycloak/models/ApplicationModel.java
View file

@ -1,4 +1,4 @@
package org.keycloak.services.models;
package org.keycloak.models;
import java.util.List;
import java.util.Set;

15
model/api/src/main/java/org/keycloak/models/IdGenerator.java Executable file
View file

@ -0,0 +1,15 @@
package org.keycloak.models;
import java.util.concurrent.atomic.AtomicLong;
/**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
* @version $Revision: 1 $
*/
public class IdGenerator {
private static AtomicLong counter = new AtomicLong(1);
public static String generateId() {
return counter.getAndIncrement() + "-" + System.currentTimeMillis();
}
}

2
services/src/main/java/org/keycloak/services/models/KeycloakSession.java → model/api/src/main/java/org/keycloak/models/KeycloakSession.java
View file

@ -1,4 +1,4 @@
package org.keycloak.services.models;
package org.keycloak.models;
import java.util.List;

2
services/src/main/java/org/keycloak/services/models/KeycloakSessionFactory.java → model/api/src/main/java/org/keycloak/models/KeycloakSessionFactory.java
View file

@ -1,4 +1,4 @@
package org.keycloak.services.models;
package org.keycloak.models;
/**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

2
services/src/main/java/org/keycloak/services/models/KeycloakTransaction.java → model/api/src/main/java/org/keycloak/models/KeycloakTransaction.java
View file

@ -1,4 +1,4 @@
package org.keycloak.services.models;
package org.keycloak.models;
/**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

2
services/src/main/java/org/keycloak/services/models/RealmModel.java → model/api/src/main/java/org/keycloak/models/RealmModel.java
View file

@ -1,4 +1,4 @@
package org.keycloak.services.models;
package org.keycloak.models;
import java.security.PrivateKey;
import java.security.PublicKey;

10
services/src/main/java/org/keycloak/services/models/RequiredCredentialModel.java → model/api/src/main/java/org/keycloak/models/RequiredCredentialModel.java
View file

@ -1,6 +1,4 @@
package org.keycloak.services.models;
import org.keycloak.representations.idm.CredentialRepresentation;
package org.keycloak.models;
import java.util.Collections;
import java.util.HashMap;
@ -59,19 +57,19 @@ public class RequiredCredentialModel {
static {
Map<String, RequiredCredentialModel> map = new HashMap<String, RequiredCredentialModel>();
PASSWORD = new RequiredCredentialModel();
PASSWORD.setType(CredentialRepresentation.PASSWORD);
PASSWORD.setType(UserCredentialModel.PASSWORD);
PASSWORD.setInput(true);
PASSWORD.setSecret(true);
PASSWORD.setFormLabel("password");
map.put(PASSWORD.getType(), PASSWORD);
TOTP = new RequiredCredentialModel();
TOTP.setType(CredentialRepresentation.TOTP);
TOTP.setType(UserCredentialModel.TOTP);
TOTP.setInput(true);
TOTP.setSecret(false);
TOTP.setFormLabel("authenticatorCode");
map.put(TOTP.getType(), TOTP);
CLIENT_CERT = new RequiredCredentialModel();
CLIENT_CERT.setType(CredentialRepresentation.CLIENT_CERT);
CLIENT_CERT.setType(UserCredentialModel.CLIENT_CERT);
CLIENT_CERT.setInput(false);
CLIENT_CERT.setSecret(false);
CLIENT_CERT.setFormLabel("clientCertificate");

2
services/src/main/java/org/keycloak/services/models/RoleModel.java → model/api/src/main/java/org/keycloak/models/RoleModel.java
View file

@ -1,4 +1,4 @@
package org.keycloak.services.models;
package org.keycloak.models;
/**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

2
services/src/main/java/org/keycloak/services/models/SocialLinkModel.java → model/api/src/main/java/org/keycloak/models/SocialLinkModel.java Normal file → Executable file
View file

@ -1,4 +1,4 @@
package org.keycloak.services.models;
package org.keycloak.models;
/**
* @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>

5
services/src/main/java/org/keycloak/services/models/UserCredentialModel.java → model/api/src/main/java/org/keycloak/models/UserCredentialModel.java
View file

@ -1,10 +1,13 @@
package org.keycloak.services.models;
package org.keycloak.models;
/**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
* @version $Revision: 1 $
*/
public class UserCredentialModel {
public static final String PASSWORD = "password";
public static final String TOTP = "totp";
public static final String CLIENT_CERT = "cert";
protected String type;
protected String value;

2
services/src/main/java/org/keycloak/services/models/UserModel.java → model/api/src/main/java/org/keycloak/models/UserModel.java
View file

@ -1,4 +1,4 @@
package org.keycloak.services.models;
package org.keycloak.models;
import java.util.Map;
import java.util.Set;

2
services/src/main/java/org/keycloak/services/models/utils/ArrayUtils.java → model/api/src/main/java/org/keycloak/models/utils/ArrayUtils.java Normal file → Executable file
View file

@ -1,4 +1,4 @@
package org.keycloak.services.models.utils;
package org.keycloak.models.utils;
import java.lang.reflect.Array;
import java.util.Arrays;

51
model/jpa/pom.xml Executable file
View file

@ -0,0 +1,51 @@
<?xml version="1.0"?>
<project>
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.0-alpha-1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>keycloak-model-jpa</artifactId>
<name>Keycloak Model JPA</name>
<description/>
<dependencies>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk16</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-core</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-model-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.hibernate.javax.persistence</groupId>
<artifactId>hibernate-jpa-2.0-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>
</plugins>
</build>
</project>

2
services/src/main/java/org/keycloak/services/models/jpa/entities/RealmEntity.java → model/jpa/src/main/java/org/keycloak/models/jpa/entities/RealmEntity.java
View file

@ -1,4 +1,4 @@
package org.keycloak.services.models.jpa.entities;
package org.keycloak.models.jpa.entities;
import javax.persistence.*;

2
services/src/main/java/org/keycloak/services/models/jpa/entities/RequiredCredentailEntity.java → model/jpa/src/main/java/org/keycloak/models/jpa/entities/RequiredCredentailEntity.java
View file

@ -1,4 +1,4 @@
package org.keycloak.services.models.jpa.entities;
package org.keycloak.models.jpa.entities;
import javax.persistence.Entity;

2
services/src/main/java/org/keycloak/services/models/jpa/entities/ResourceEntity.java → model/jpa/src/main/java/org/keycloak/models/jpa/entities/ResourceEntity.java
View file

@ -1,4 +1,4 @@
package org.keycloak.services.models.jpa.entities;
package org.keycloak.models.jpa.entities;
import javax.persistence.*;
import java.util.Collection;

2
services/src/main/java/org/keycloak/services/models/jpa/entities/RoleEntity.java → model/jpa/src/main/java/org/keycloak/models/jpa/entities/RoleEntity.java
View file

@ -1,4 +1,4 @@
package org.keycloak.services.models.jpa.entities;
package org.keycloak.models.jpa.entities;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;

2
services/src/main/java/org/keycloak/services/models/jpa/entities/ScopeMappingEntity.java → model/jpa/src/main/java/org/keycloak/models/jpa/entities/ScopeMappingEntity.java
View file

@ -1,4 +1,4 @@
package org.keycloak.services.models.jpa.entities;
package org.keycloak.models.jpa.entities;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;

2
services/src/main/java/org/keycloak/services/models/jpa/entities/UserEntity.java → model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserEntity.java
View file

@ -1,4 +1,4 @@
package org.keycloak.services.models.jpa.entities;
package org.keycloak.models.jpa.entities;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;

2
services/src/main/java/org/keycloak/services/models/jpa/entities/UserRoleMappingEntity.java → model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserRoleMappingEntity.java
View file

@ -1,4 +1,4 @@
package org.keycloak.services.models.jpa.entities;
package org.keycloak.models.jpa.entities;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;

81
model/picketlink/pom.xml Executable file
View file

@ -0,0 +1,81 @@
<?xml version="1.0"?>
<project>
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.0-alpha-1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>keycloak-model-picketlink</artifactId>
<name>Keycloak Model Picketlink</name>
<description/>
<dependencies>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk16</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-core</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-model-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-idm-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-common</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-idm-impl</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-idm-simple-schema</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-config</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.hibernate.javax.persistence</groupId>
<artifactId>hibernate-jpa-2.0-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>
</plugins>
</build>
</project>

12
services/src/main/java/org/keycloak/services/models/picketlink/ApplicationAdapter.java → model/picketlink/src/main/java/org/keycloak/models/picketlink/ApplicationAdapter.java
View file

@ -1,10 +1,10 @@
package org.keycloak.services.models.picketlink;
package org.keycloak.models.picketlink;
import org.keycloak.services.models.ApplicationModel;
import org.keycloak.services.models.RoleModel;
import org.keycloak.services.models.UserModel;
import org.keycloak.services.models.picketlink.mappings.ApplicationData;
import org.keycloak.services.models.picketlink.relationships.ScopeRelationship;
import org.keycloak.models.ApplicationModel;
import org.keycloak.models.RoleModel;
import org.keycloak.models.UserModel;
import org.keycloak.models.picketlink.mappings.ApplicationData;
import org.keycloak.models.picketlink.relationships.ScopeRelationship;
import org.picketlink.idm.IdentityManager;
import org.picketlink.idm.PartitionManager;
import org.picketlink.idm.RelationshipManager;

29
services/src/main/java/org/keycloak/services/models/picketlink/PicketlinkKeycloakSession.java → model/picketlink/src/main/java/org/keycloak/models/picketlink/PicketlinkKeycloakSession.java
View file

@ -1,14 +1,11 @@
package org.keycloak.services.models.picketlink;
package org.keycloak.models.picketlink;
import org.jboss.resteasy.spi.HttpRequest;
import org.jboss.resteasy.spi.NotImplementedYetException;
import org.jboss.resteasy.spi.ResteasyProviderFactory;
import org.keycloak.services.models.KeycloakSession;
import org.keycloak.services.models.KeycloakTransaction;
import org.keycloak.services.models.RealmModel;
import org.keycloak.services.models.UserModel;
import org.keycloak.services.models.picketlink.mappings.RealmData;
import org.keycloak.services.models.picketlink.relationships.RealmAdminRelationship;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.KeycloakTransaction;
import org.keycloak.models.RealmModel;
import org.keycloak.models.UserModel;
import org.keycloak.models.picketlink.mappings.RealmData;
import org.keycloak.models.picketlink.relationships.RealmAdminRelationship;
import org.picketlink.idm.PartitionManager;
import org.picketlink.idm.RelationshipManager;
import org.picketlink.idm.query.RelationshipQuery;
@ -25,7 +22,6 @@ import java.util.concurrent.atomic.AtomicLong;
public class PicketlinkKeycloakSession implements KeycloakSession {
public static ThreadLocal<EntityManager> currentEntityManager = new ThreadLocal<EntityManager>();
public static ThreadLocal<Exception> setWhere = new ThreadLocal<Exception>();
public static ThreadLocal<String> setFromPath = new ThreadLocal<String>();
protected PartitionManager partitionManager;
protected EntityManager entityManager;
@ -40,14 +36,8 @@ public class PicketlinkKeycloakSession implements KeycloakSession {
if (currentEntityManager.get() != null)
{
setWhere.get().printStackTrace();
String path = setFromPath.get();
if (path == null) path = "???";
throw new IllegalStateException("Thread local was leaked! from path: " + path);
}
HttpRequest request = ResteasyProviderFactory.getContextData(HttpRequest.class);
if (request != null) {
setFromPath.set(request.getUri().getPath());
throw new IllegalStateException("Thread local was leaked!");
}
currentEntityManager.set(entityManager);
setWhere.set(new Exception());
@ -104,13 +94,12 @@ public class PicketlinkKeycloakSession implements KeycloakSession {
@Override
public void deleteRealm(RealmModel realm) {
throw new NotImplementedYetException();
throw new RuntimeException("Not Implemented Yet");
}
@Override
public void close() {
setFromPath.set(null);
setWhere.set(null);
currentEntityManager.set(null);
if (entityManager.getTransaction().isActive()) entityManager.getTransaction().rollback();

6
services/src/main/java/org/keycloak/services/models/picketlink/PicketlinkKeycloakSessionFactory.java → model/picketlink/src/main/java/org/keycloak/models/picketlink/PicketlinkKeycloakSessionFactory.java
View file

@ -1,7 +1,7 @@
package org.keycloak.services.models.picketlink;
package org.keycloak.models.picketlink;
import org.keycloak.services.models.KeycloakSession;
import org.keycloak.services.models.KeycloakSessionFactory;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.KeycloakSessionFactory;
import org.picketlink.idm.PartitionManager;
import javax.persistence.EntityManagerFactory;

4
services/src/main/java/org/keycloak/services/models/picketlink/PicketlinkKeycloakTransaction.java → model/picketlink/src/main/java/org/keycloak/models/picketlink/PicketlinkKeycloakTransaction.java
View file

@ -1,6 +1,6 @@
package org.keycloak.services.models.picketlink;
package org.keycloak.models.picketlink;
import org.keycloak.services.models.KeycloakTransaction;
import org.keycloak.models.KeycloakTransaction;
import javax.persistence.EntityTransaction;

35
services/src/main/java/org/keycloak/services/models/picketlink/RealmAdapter.java → model/picketlink/src/main/java/org/keycloak/models/picketlink/RealmAdapter.java
View file

@ -1,22 +1,12 @@
package org.keycloak.services.models.picketlink;
package org.keycloak.models.picketlink;
import org.bouncycastle.openssl.PEMWriter;
import org.jboss.resteasy.logging.Logger;
import org.jboss.resteasy.security.PemUtils;
import org.keycloak.representations.idm.CredentialRepresentation;
import org.keycloak.services.managers.RealmManager;
import org.keycloak.services.models.KeycloakSession;
import org.keycloak.services.models.RealmModel;
import org.keycloak.services.models.RequiredCredentialModel;
import org.keycloak.services.models.ApplicationModel;
import org.keycloak.services.models.RoleModel;
import org.keycloak.services.models.SocialLinkModel;
import org.keycloak.services.models.UserCredentialModel;
import org.keycloak.services.models.UserModel;
import org.keycloak.services.models.picketlink.mappings.RealmData;
import org.keycloak.services.models.picketlink.mappings.ApplicationData;
import org.keycloak.services.models.picketlink.relationships.*;
import org.keycloak.services.models.picketlink.relationships.RequiredApplicationCredentialRelationship;
import org.keycloak.PemUtils;
import org.keycloak.models.*;
import org.keycloak.models.picketlink.mappings.RealmData;
import org.keycloak.models.picketlink.mappings.ApplicationData;
import org.keycloak.models.picketlink.relationships.*;
import org.keycloak.models.picketlink.relationships.RequiredApplicationCredentialRelationship;
import org.picketlink.idm.IdentityManager;
import org.picketlink.idm.PartitionManager;
import org.picketlink.idm.RelationshipManager;
@ -54,7 +44,6 @@ import java.util.Set;
* @version $Revision: 1 $
*/
public class RealmAdapter implements RealmModel {
protected static final Logger logger = Logger.getLogger(RealmManager.class);
protected RealmData realm;
protected volatile transient PublicKey publicKey;
@ -391,7 +380,6 @@ public class RealmAdapter implements RealmModel {
}
}
for (String cred : creds) {
logger.info("updating cred: " + cred);
if (!already.contains(cred)) {
addRequiredCredential(cred);
}
@ -483,14 +471,14 @@ public class RealmAdapter implements RealmModel {
@Override
public void updateCredential(UserModel user, UserCredentialModel cred) {
IdentityManager idm = getIdm();
if (cred.getType().equals(CredentialRepresentation.PASSWORD)) {
if (cred.getType().equals(UserCredentialModel.PASSWORD)) {
Password password = new Password(cred.getValue());
idm.updateCredential(((UserAdapter)user).getUser(), password);
} else if (cred.getType().equals(CredentialRepresentation.TOTP)) {
} else if (cred.getType().equals(UserCredentialModel.TOTP)) {
TOTPCredential totp = new TOTPCredential(cred.getValue());
totp.setDevice(cred.getDevice());
idm.updateCredential(((UserAdapter)user).getUser(), totp);
} else if (cred.getType().equals(CredentialRepresentation.CLIENT_CERT)) {
} else if (cred.getType().equals(UserCredentialModel.CLIENT_CERT)) {
X509Certificate cert = null;
try {
cert = org.keycloak.PemUtils.decodeCertificate(cred.getValue());
@ -608,7 +596,7 @@ public class RealmAdapter implements RealmModel {
@Override
public ApplicationModel addApplication(String name) {
ApplicationData applicationData = new ApplicationData(RealmManager.generateId());
ApplicationData applicationData = new ApplicationData(IdGenerator.generateId());
User resourceUser = new User(name);
idm.add(resourceUser);
applicationData.setResourceUser(resourceUser);
@ -704,7 +692,6 @@ public class RealmAdapter implements RealmModel {
@Override
public boolean isRealmAdmin(UserModel agent) {
RealmAdapter realmModel = (RealmAdapter)new RealmManager(session).defaultRealm();
RelationshipQuery<RealmAdminRelationship> query = getRelationshipManager().createRelationshipQuery(RealmAdminRelationship.class);
query.setParameter(RealmAdminRelationship.REALM, realm.getName());
query.setParameter(RealmAdminRelationship.ADMIN, ((UserAdapter)agent).getUser());

4
services/src/main/java/org/keycloak/services/models/picketlink/RoleAdapter.java → model/picketlink/src/main/java/org/keycloak/models/picketlink/RoleAdapter.java
View file

@ -1,6 +1,6 @@
package org.keycloak.services.models.picketlink;
package org.keycloak.models.picketlink;
import org.keycloak.services.models.RoleModel;
import org.keycloak.models.RoleModel;
import org.picketlink.idm.IdentityManager;
import org.picketlink.idm.model.Attribute;
import org.picketlink.idm.model.sample.Role;

6
services/src/main/java/org/keycloak/services/models/picketlink/UserAdapter.java → model/picketlink/src/main/java/org/keycloak/models/picketlink/UserAdapter.java
View file

@ -1,4 +1,4 @@
package org.keycloak.services.models.picketlink;
package org.keycloak.models.picketlink;
import java.util.Arrays;
import java.util.Collections;
@ -7,8 +7,8 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import org.keycloak.services.models.UserModel;
import org.keycloak.services.models.utils.ArrayUtils;
import org.keycloak.models.UserModel;
import org.keycloak.models.utils.ArrayUtils;
import org.picketlink.idm.IdentityManager;
import org.picketlink.idm.model.Attribute;
import org.picketlink.idm.model.sample.User;

2
services/src/main/java/org/keycloak/services/models/picketlink/mappings/ApplicationData.java → model/picketlink/src/main/java/org/keycloak/models/picketlink/mappings/ApplicationData.java
View file

@ -1,4 +1,4 @@
package org.keycloak.services.models.picketlink.mappings;
package org.keycloak.models.picketlink.mappings;
import org.picketlink.idm.model.AbstractPartition;
import org.picketlink.idm.model.annotation.AttributeProperty;

2
services/src/main/java/org/keycloak/services/models/picketlink/mappings/ApplicationEntity.java → model/picketlink/src/main/java/org/keycloak/models/picketlink/mappings/ApplicationEntity.java
View file

@ -1,4 +1,4 @@
package org.keycloak.services.models.picketlink.mappings;
package org.keycloak.models.picketlink.mappings;
import org.picketlink.idm.jpa.annotations.AttributeValue;
import org.picketlink.idm.jpa.annotations.OwnerReference;

2
services/src/main/java/org/keycloak/services/models/picketlink/mappings/RealmData.java → model/picketlink/src/main/java/org/keycloak/models/picketlink/mappings/RealmData.java
View file

@ -1,4 +1,4 @@
package org.keycloak.services.models.picketlink.mappings;
package org.keycloak.models.picketlink.mappings;
import org.picketlink.idm.model.AbstractPartition;
import org.picketlink.idm.model.annotation.AttributeProperty;

2
services/src/main/java/org/keycloak/services/models/picketlink/mappings/RealmEntity.java → model/picketlink/src/main/java/org/keycloak/models/picketlink/mappings/RealmEntity.java
View file

@ -1,4 +1,4 @@
package org.keycloak.services.models.picketlink.mappings;
package org.keycloak.models.picketlink.mappings;
import org.picketlink.idm.jpa.annotations.AttributeValue;
import org.picketlink.idm.jpa.annotations.OwnerReference;

2
services/src/main/java/org/keycloak/services/models/picketlink/relationships/OAuthClientRequiredCredentialRelationship.java → model/picketlink/src/main/java/org/keycloak/models/picketlink/relationships/OAuthClientRequiredCredentialRelationship.java
View file

@ -1,4 +1,4 @@
package org.keycloak.services.models.picketlink.relationships;
package org.keycloak.models.picketlink.relationships;
/**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

2
services/src/main/java/org/keycloak/services/models/picketlink/relationships/RealmAdminRelationship.java → model/picketlink/src/main/java/org/keycloak/models/picketlink/relationships/RealmAdminRelationship.java
View file

@ -1,4 +1,4 @@
package org.keycloak.services.models.picketlink.relationships;
package org.keycloak.models.picketlink.relationships;
import org.picketlink.idm.model.AbstractAttributedType;
import org.picketlink.idm.model.Attribute;

2
services/src/main/java/org/keycloak/services/models/picketlink/relationships/RequiredApplicationCredentialRelationship.java → model/picketlink/src/main/java/org/keycloak/models/picketlink/relationships/RequiredApplicationCredentialRelationship.java
View file

@ -1,4 +1,4 @@
package org.keycloak.services.models.picketlink.relationships;
package org.keycloak.models.picketlink.relationships;
/**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

2
services/src/main/java/org/keycloak/services/models/picketlink/relationships/RequiredCredentialRelationship.java → model/picketlink/src/main/java/org/keycloak/models/picketlink/relationships/RequiredCredentialRelationship.java
View file

@ -1,4 +1,4 @@
package org.keycloak.services.models.picketlink.relationships;
package org.keycloak.models.picketlink.relationships;
import org.picketlink.idm.model.AbstractAttributedType;
import org.picketlink.idm.model.Attribute;

2
services/src/main/java/org/keycloak/services/models/picketlink/relationships/ResourceRelationship.java → model/picketlink/src/main/java/org/keycloak/models/picketlink/relationships/ResourceRelationship.java
View file

@ -1,4 +1,4 @@
package org.keycloak.services.models.picketlink.relationships;
package org.keycloak.models.picketlink.relationships;
import org.picketlink.idm.model.AbstractAttributedType;
import org.picketlink.idm.model.Attribute;

2
services/src/main/java/org/keycloak/services/models/picketlink/relationships/ScopeRelationship.java → model/picketlink/src/main/java/org/keycloak/models/picketlink/relationships/ScopeRelationship.java
View file

@ -1,4 +1,4 @@
package org.keycloak.services.models.picketlink.relationships;
package org.keycloak.models.picketlink.relationships;
import org.picketlink.idm.model.AbstractAttributedType;
import org.picketlink.idm.model.Relationship;

2
services/src/main/java/org/keycloak/services/models/picketlink/relationships/SocialLinkRelationship.java → model/picketlink/src/main/java/org/keycloak/models/picketlink/relationships/SocialLinkRelationship.java Normal file → Executable file
View file

@ -1,4 +1,4 @@
package org.keycloak.services.models.picketlink.relationships;
package org.keycloak.models.picketlink.relationships;
import org.picketlink.idm.model.AbstractAttributedType;
import org.picketlink.idm.model.Attribute;

41
model/pom.xml Executable file
View file

@ -0,0 +1,41 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.0-alpha-1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<name>Examples</name>
<description/>
<modelVersion>4.0.0</modelVersion>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-model-pom</artifactId>
<packaging>pom</packaging>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.jboss.as.plugins</groupId>
<artifactId>jboss-as-maven-plugin</artifactId>
<version>7.1.1.Final</version>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
<modules>
<module>api</module>
<module>picketlink</module>
<module>jpa</module>
</modules>
</project>

1
pom.xml
View file

@ -55,6 +55,7 @@
<modules>
<module>core</module>
<module>model</module>
<module>services</module>
<module>integration</module>
<module>social</module>

10
services/pom.xml
View file

@ -24,6 +24,16 @@
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-model-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-model-picketlink</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-social-core</artifactId>

4
services/src/main/java/org/keycloak/services/FormService.java Normal file → Executable file
View file

@ -25,8 +25,8 @@ import java.net.URI;
import javax.ws.rs.core.MultivaluedMap;
import org.keycloak.services.models.RealmModel;
import org.keycloak.services.models.UserModel;
import org.keycloak.models.RealmModel;
import org.keycloak.models.UserModel;
import org.keycloak.services.resources.flows.FormFlows;
/**

4
services/src/main/java/org/keycloak/services/email/EmailSender.java Normal file → Executable file
View file

@ -38,8 +38,8 @@ import javax.ws.rs.core.UriInfo;
import org.jboss.resteasy.logging.Logger;
import org.keycloak.services.managers.AccessCodeEntry;
import org.keycloak.services.models.RealmModel;
import org.keycloak.services.models.UserModel;
import org.keycloak.models.RealmModel;
import org.keycloak.models.UserModel;
import org.keycloak.services.resources.AccountService;
import org.keycloak.services.resources.flows.Urls;

2
services/src/main/java/org/keycloak/services/filters/KeycloakSessionCleanupFilter.java
View file

@ -2,7 +2,7 @@ package org.keycloak.services.filters;
import org.jboss.resteasy.logging.Logger;
import org.jboss.resteasy.spi.ResteasyProviderFactory;
import org.keycloak.services.models.KeycloakSession;
import org.keycloak.models.KeycloakSession;
import javax.ws.rs.container.ContainerRequestContext;
import javax.ws.rs.container.ContainerResponseContext;

4
services/src/main/java/org/keycloak/services/filters/KeycloakSessionCreateFilter.java
View file

@ -2,8 +2,8 @@ package org.keycloak.services.filters;
import org.jboss.resteasy.logging.Logger;
import org.jboss.resteasy.spi.ResteasyProviderFactory;
import org.keycloak.services.models.KeycloakSession;
import org.keycloak.services.models.KeycloakSessionFactory;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.KeycloakSessionFactory;
import javax.ws.rs.container.ContainerRequestContext;
import javax.ws.rs.container.ContainerRequestFilter;

6
services/src/main/java/org/keycloak/services/filters/KeycloakSessionServletFilter.java
View file

@ -1,9 +1,9 @@
package org.keycloak.services.filters;
import org.jboss.resteasy.spi.ResteasyProviderFactory;
import org.keycloak.services.models.KeycloakSession;
import org.keycloak.services.models.KeycloakSessionFactory;
import org.keycloak.services.models.KeycloakTransaction;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.KeycloakSessionFactory;
import org.keycloak.models.KeycloakTransaction;
import javax.servlet.*;
import java.io.IOException;

6
services/src/main/java/org/keycloak/services/managers/AccessCodeEntry.java
View file

@ -1,9 +1,9 @@
package org.keycloak.services.managers;
import org.keycloak.representations.SkeletonKeyToken;
import org.keycloak.services.models.RoleModel;
import org.keycloak.services.models.UserModel;
import org.keycloak.services.models.UserModel.RequiredAction;
import org.keycloak.models.RoleModel;
import org.keycloak.models.UserModel;
import org.keycloak.models.UserModel.RequiredAction;
import javax.ws.rs.core.MultivaluedHashMap;
import javax.ws.rs.core.MultivaluedMap;

6
services/src/main/java/org/keycloak/services/managers/AuthenticationManager.java
View file

@ -9,9 +9,9 @@ import org.keycloak.RSATokenVerifier;
import org.keycloak.VerificationException;
import org.keycloak.representations.SkeletonKeyToken;
import org.keycloak.representations.idm.CredentialRepresentation;
import org.keycloak.services.models.RealmModel;
import org.keycloak.services.models.RequiredCredentialModel;
import org.keycloak.services.models.UserModel;
import org.keycloak.models.RealmModel;
import org.keycloak.models.RequiredCredentialModel;
import org.keycloak.models.UserModel;
import org.keycloak.services.resources.RealmsResource;
import org.keycloak.services.resources.SaasService;

4
services/src/main/java/org/keycloak/services/managers/RealmManager.java
View file

@ -1,9 +1,9 @@
package org.keycloak.services.managers;
import org.jboss.resteasy.logging.Logger;
import org.keycloak.models.*;
import org.keycloak.representations.idm.*;
import org.keycloak.services.models.*;
import org.keycloak.services.models.UserModel.RequiredAction;
import org.keycloak.models.UserModel.RequiredAction;
import java.security.KeyPair;
import java.security.KeyPairGenerator;

4
services/src/main/java/org/keycloak/services/managers/ResourceAdminManager.java
View file

@ -5,8 +5,8 @@ import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;
import org.jboss.resteasy.logging.Logger;
import org.keycloak.TokenIdGenerator;
import org.keycloak.representations.idm.admin.LogoutAction;
import org.keycloak.services.models.ApplicationModel;
import org.keycloak.services.models.RealmModel;
import org.keycloak.models.ApplicationModel;
import org.keycloak.models.RealmModel;
import javax.ws.rs.client.Entity;
import javax.ws.rs.core.Form;

2
services/src/main/java/org/keycloak/services/managers/ResourceManager.java
View file

@ -1,7 +1,7 @@
package org.keycloak.services.managers;
import org.keycloak.models.*;
import org.keycloak.representations.idm.*;
import org.keycloak.services.models.*;
/**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

8
services/src/main/java/org/keycloak/services/managers/TokenManager.java
View file

@ -5,10 +5,10 @@ import org.jboss.resteasy.jose.jws.JWSBuilder;
import org.jboss.resteasy.jwt.JsonSerialization;
import org.keycloak.representations.SkeletonKeyScope;
import org.keycloak.representations.SkeletonKeyToken;
import org.keycloak.services.models.ApplicationModel;
import org.keycloak.services.models.RealmModel;
import org.keycloak.services.models.RoleModel;
import org.keycloak.services.models.UserModel;
import org.keycloak.models.ApplicationModel;
import org.keycloak.models.RealmModel;
import org.keycloak.models.RoleModel;
import org.keycloak.models.UserModel;
import javax.ws.rs.core.MultivaluedMap;
import java.io.IOException;

6
services/src/main/java/org/keycloak/services/managers/UserManager.java
View file

@ -2,9 +2,9 @@ package org.keycloak.services.managers;
import org.keycloak.representations.idm.CredentialRepresentation;
import org.keycloak.representations.idm.UserRepresentation;
import org.keycloak.services.models.RealmModel;
import org.keycloak.services.models.UserCredentialModel;
import org.keycloak.services.models.UserModel;
import org.keycloak.models.RealmModel;
import org.keycloak.models.UserCredentialModel;
import org.keycloak.models.UserModel;
import java.util.Map;

8
services/src/main/java/org/keycloak/services/resources/AccountService.java
View file

@ -46,10 +46,10 @@ import org.keycloak.services.managers.AccessCodeEntry;
import org.keycloak.services.managers.AuthenticationManager;
import org.keycloak.services.managers.TokenManager;
import org.keycloak.services.messages.Messages;
import org.keycloak.services.models.RealmModel;
import org.keycloak.services.models.UserCredentialModel;
import org.keycloak.services.models.UserModel;
import org.keycloak.services.models.UserModel.RequiredAction;
import org.keycloak.models.RealmModel;
import org.keycloak.models.UserCredentialModel;
import org.keycloak.models.UserModel;
import org.keycloak.models.UserModel.RequiredAction;
import org.keycloak.services.resources.flows.Flows;
import org.keycloak.services.resources.flows.FormFlows;
import org.keycloak.services.validation.Validation;

10
services/src/main/java/org/keycloak/services/resources/KeycloakApplication.java
View file

@ -2,11 +2,11 @@ package org.keycloak.services.resources;
import org.keycloak.SkeletonKeyContextResolver;
import org.keycloak.services.managers.TokenManager;
import org.keycloak.services.models.KeycloakSessionFactory;
import org.keycloak.services.models.picketlink.PicketlinkKeycloakSession;
import org.keycloak.services.models.picketlink.PicketlinkKeycloakSessionFactory;
import org.keycloak.services.models.picketlink.mappings.ApplicationEntity;
import org.keycloak.services.models.picketlink.mappings.RealmEntity;
import org.keycloak.models.KeycloakSessionFactory;
import org.keycloak.models.picketlink.PicketlinkKeycloakSession;
import org.keycloak.models.picketlink.PicketlinkKeycloakSessionFactory;
import org.keycloak.models.picketlink.mappings.ApplicationEntity;
import org.keycloak.models.picketlink.mappings.RealmEntity;
import org.keycloak.social.SocialRequestManager;
import org.picketlink.idm.PartitionManager;
import org.picketlink.idm.config.IdentityConfigurationBuilder;

2
services/src/main/java/org/keycloak/services/resources/PublicRealmResource.java
View file

@ -3,7 +3,7 @@ package org.keycloak.services.resources;
import org.jboss.resteasy.annotations.cache.NoCache;
import org.jboss.resteasy.logging.Logger;
import org.keycloak.representations.idm.PublishedRealmRepresentation;
import org.keycloak.services.models.RealmModel;
import org.keycloak.models.RealmModel;
import javax.ws.rs.GET;
import javax.ws.rs.Path;

4
services/src/main/java/org/keycloak/services/resources/RealmsResource.java
View file

@ -3,8 +3,8 @@ package org.keycloak.services.resources;
import org.jboss.resteasy.logging.Logger;
import org.keycloak.services.managers.RealmManager;
import org.keycloak.services.managers.TokenManager;
import org.keycloak.services.models.KeycloakSession;
import org.keycloak.services.models.RealmModel;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.RealmModel;
import javax.ws.rs.NotFoundException;
import javax.ws.rs.Path;

3
services/src/main/java/org/keycloak/services/resources/SaasService.java
View file

@ -5,13 +5,13 @@ import org.jboss.resteasy.logging.Logger;
import org.jboss.resteasy.spi.HttpRequest;
import org.jboss.resteasy.spi.HttpResponse;
import org.jboss.resteasy.spi.NotImplementedYetException;
import org.keycloak.models.*;
import org.keycloak.representations.idm.CredentialRepresentation;
import org.keycloak.representations.idm.UserRepresentation;
import org.keycloak.services.managers.AuthenticationManager;
import org.keycloak.services.managers.AuthenticationManager.AuthenticationStatus;
import org.keycloak.services.managers.RealmManager;
import org.keycloak.services.messages.Messages;
import org.keycloak.services.models.*;
import org.keycloak.services.resources.admin.RealmsAdminResource;
import org.keycloak.services.resources.flows.Flows;
import org.keycloak.services.validation.Validation;
@ -23,7 +23,6 @@ import javax.ws.rs.core.*;
import java.net.URI;
import java.util.LinkedList;
import java.util.List;
import java.util.StringTokenizer;
/**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

4
services/src/main/java/org/keycloak/services/resources/SocialResource.java
View file

@ -32,7 +32,6 @@ import java.util.UUID;
import javax.imageio.spi.ServiceRegistry;
import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
import javax.ws.rs.NotFoundException;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
@ -52,11 +51,10 @@ import org.jboss.resteasy.logging.Logger;
import org.jboss.resteasy.specimpl.MultivaluedMapImpl;
import org.jboss.resteasy.spi.HttpRequest;
import org.jboss.resteasy.spi.HttpResponse;
import org.keycloak.models.*;
import org.keycloak.services.managers.AuthenticationManager;
import org.keycloak.services.managers.RealmManager;
import org.keycloak.services.managers.TokenManager;
import org.keycloak.services.messages.Messages;
import org.keycloak.services.models.*;
import org.keycloak.services.resources.flows.Flows;
import org.keycloak.services.resources.flows.OAuthFlows;
import org.keycloak.services.resources.flows.PageFlows;

5
services/src/main/java/org/keycloak/services/resources/TokenService.java
View file

@ -8,6 +8,7 @@ import org.jboss.resteasy.jwt.JsonSerialization;
import org.jboss.resteasy.logging.Logger;
import org.jboss.resteasy.spi.HttpRequest;
import org.jboss.resteasy.spi.HttpResponse;
import org.keycloak.models.*;
import org.keycloak.representations.AccessTokenResponse;
import org.keycloak.representations.SkeletonKeyToken;
import org.keycloak.representations.idm.CredentialRepresentation;
@ -18,8 +19,7 @@ import org.keycloak.services.managers.RealmManager;
import org.keycloak.services.managers.ResourceAdminManager;
import org.keycloak.services.managers.TokenManager;
import org.keycloak.services.messages.Messages;
import org.keycloak.services.models.*;
import org.keycloak.services.models.UserModel.RequiredAction;
import org.keycloak.models.UserModel.RequiredAction;
import org.keycloak.services.resources.flows.Flows;
import org.keycloak.services.resources.flows.OAuthFlows;
import org.keycloak.services.validation.Validation;
@ -46,7 +46,6 @@ import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.StringTokenizer;
/**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

4
services/src/main/java/org/keycloak/services/resources/Transaction.java
View file

@ -1,8 +1,8 @@
package org.keycloak.services.resources;
import org.jboss.resteasy.spi.ResteasyProviderFactory;
import org.keycloak.services.models.KeycloakSession;
import org.keycloak.services.models.KeycloakTransaction;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.KeycloakTransaction;
/**
* Meant to be used as an inner class wrapper (I forget the pattern name, its been awhile).

2
services/src/main/java/org/keycloak/services/resources/admin/ApplicationResource.java
View file

@ -2,11 +2,11 @@ package org.keycloak.services.resources.admin;
import org.jboss.resteasy.annotations.cache.NoCache;
import org.jboss.resteasy.logging.Logger;
import org.keycloak.models.*;
import org.keycloak.representations.idm.ApplicationRepresentation;
import org.keycloak.representations.idm.RoleRepresentation;
import org.keycloak.services.managers.RealmManager;
import org.keycloak.services.managers.ResourceManager;
import org.keycloak.services.models.*;
import javax.ws.rs.*;
import javax.ws.rs.core.Context;

8
services/src/main/java/org/keycloak/services/resources/admin/ApplicationsResource.java
View file

@ -5,10 +5,10 @@ import org.jboss.resteasy.logging.Logger;
import org.keycloak.representations.idm.ApplicationRepresentation;
import org.keycloak.services.managers.RealmManager;
import org.keycloak.services.managers.ResourceManager;
import org.keycloak.services.models.ApplicationModel;
import org.keycloak.services.models.KeycloakSession;
import org.keycloak.services.models.RealmModel;
import org.keycloak.services.models.UserModel;
import org.keycloak.models.ApplicationModel;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.RealmModel;
import org.keycloak.models.UserModel;
import javax.ws.rs.*;
import javax.ws.rs.container.ResourceContext;

11
services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java
View file

@ -4,12 +4,11 @@ import org.jboss.resteasy.annotations.cache.NoCache;
import org.jboss.resteasy.logging.Logger;
import org.keycloak.representations.idm.RealmRepresentation;
import org.keycloak.representations.idm.RoleRepresentation;
import org.keycloak.representations.idm.UserRepresentation;
import org.keycloak.services.managers.RealmManager;
import org.keycloak.services.models.KeycloakSession;
import org.keycloak.services.models.RealmModel;
import org.keycloak.services.models.RoleModel;
import org.keycloak.services.models.UserModel;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.RealmModel;
import org.keycloak.models.RoleModel;
import org.keycloak.models.UserModel;
import javax.ws.rs.*;
import javax.ws.rs.container.ResourceContext;
@ -17,9 +16,7 @@ import javax.ws.rs.core.Context;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

6
services/src/main/java/org/keycloak/services/resources/admin/RealmsAdminResource.java
View file

@ -4,9 +4,9 @@ import org.jboss.resteasy.annotations.cache.NoCache;
import org.jboss.resteasy.logging.Logger;
import org.keycloak.representations.idm.RealmRepresentation;
import org.keycloak.services.managers.RealmManager;
import org.keycloak.services.models.KeycloakSession;
import org.keycloak.services.models.RealmModel;
import org.keycloak.services.models.UserModel;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.RealmModel;
import org.keycloak.models.UserModel;
import org.keycloak.services.resources.SaasService;
import javax.ws.rs.*;

2
services/src/main/java/org/keycloak/services/resources/admin/UsersResource.java
View file

@ -2,9 +2,9 @@ package org.keycloak.services.resources.admin;
import org.jboss.resteasy.annotations.cache.NoCache;
import org.jboss.resteasy.logging.Logger;
import org.keycloak.models.*;
import org.keycloak.representations.idm.*;
import org.keycloak.services.managers.RealmManager;
import org.keycloak.services.models.*;
import javax.ws.rs.*;
import javax.ws.rs.container.ResourceContext;

2
services/src/main/java/org/keycloak/services/resources/flows/Flows.java
View file

@ -24,7 +24,7 @@ package org.keycloak.services.resources.flows;
import org.jboss.resteasy.spi.HttpRequest;
import org.keycloak.services.managers.AuthenticationManager;
import org.keycloak.services.managers.TokenManager;
import org.keycloak.services.models.RealmModel;
import org.keycloak.models.RealmModel;
import javax.ws.rs.core.UriInfo;

6
services/src/main/java/org/keycloak/services/resources/flows/FormFlows.java
View file

@ -29,9 +29,9 @@ import org.jboss.resteasy.spi.ResteasyUriInfo;
import org.keycloak.services.FormService;
import org.keycloak.services.email.EmailSender;
import org.keycloak.services.managers.AccessCodeEntry;
import org.keycloak.services.models.RealmModel;
import org.keycloak.services.models.UserModel;
import org.keycloak.services.models.UserModel.RequiredAction;
import org.keycloak.models.RealmModel;
import org.keycloak.models.UserModel;
import org.keycloak.models.UserModel.RequiredAction;
import org.picketlink.idm.model.sample.Realm;
import javax.imageio.spi.ServiceRegistry;

8
services/src/main/java/org/keycloak/services/resources/flows/OAuthFlows.java
View file

@ -30,10 +30,10 @@ import org.keycloak.services.managers.AccessCodeEntry;
import org.keycloak.services.managers.AuthenticationManager;
import org.keycloak.services.managers.RealmManager;
import org.keycloak.services.managers.TokenManager;
import org.keycloak.services.models.RealmModel;
import org.keycloak.services.models.RoleModel;
import org.keycloak.services.models.UserModel;
import org.keycloak.services.models.UserModel.RequiredAction;
import org.keycloak.models.RealmModel;
import org.keycloak.models.RoleModel;
import org.keycloak.models.UserModel;
import org.keycloak.models.UserModel.RequiredAction;
import org.keycloak.services.resources.TokenService;
import javax.ws.rs.core.Response;

12
services/src/test/java/org/keycloak/services/managers/AuthenticationManagerTest.java Normal file → Executable file
View file

@ -11,12 +11,12 @@ import org.junit.Before;
import org.junit.Test;
import org.keycloak.representations.idm.CredentialRepresentation;
import org.keycloak.services.managers.AuthenticationManager.AuthenticationStatus;
import org.keycloak.services.models.KeycloakSession;
import org.keycloak.services.models.KeycloakSessionFactory;
import org.keycloak.services.models.RealmModel;
import org.keycloak.services.models.UserCredentialModel;
import org.keycloak.services.models.UserModel;
import org.keycloak.services.models.UserModel.RequiredAction;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.KeycloakSessionFactory;
import org.keycloak.models.RealmModel;
import org.keycloak.models.UserCredentialModel;
import org.keycloak.models.UserModel;
import org.keycloak.models.UserModel.RequiredAction;
import org.keycloak.services.resources.KeycloakApplication;
import org.picketlink.idm.credential.util.TimeBasedOTP;

35
services/src/test/java/org/keycloak/services/models/utils/ArrayUtilsTest.java
View file

@ -1,35 +0,0 @@
package org.keycloak.services.models.utils;
import org.junit.Assert;
import org.junit.Test;
public class ArrayUtilsTest {
@Test
public void add() {
String[] a = new String[] { "a" };
a = ArrayUtils.add(a, "b");
Assert.assertArrayEquals(new String[] { "a", "b" }, a);
a = ArrayUtils.add(a, "c");
Assert.assertArrayEquals(new String[] { "a", "b", "c" }, a);
}
@Test
public void remove() {
String[] a = new String[] { "a", "b", "c", "d" };
a = ArrayUtils.remove(a, "b");
Assert.assertArrayEquals(new String[] { "a", "c", "d" }, a);
a = ArrayUtils.remove(a, "d");
Assert.assertArrayEquals(new String[] { "a", "c" }, a);
a = ArrayUtils.remove(a, "a");
Assert.assertArrayEquals(new String[] { "c" }, a);
a = ArrayUtils.remove(a, "c");
Assert.assertArrayEquals(new String[] {}, a);
}
}

18
services/src/test/java/org/keycloak/test/AdapterTest.java
View file

@ -8,20 +8,18 @@ import org.junit.Test;
import org.junit.runners.MethodSorters;
import org.keycloak.representations.idm.CredentialRepresentation;
import org.keycloak.services.managers.RealmManager;
import org.keycloak.services.models.KeycloakSession;
import org.keycloak.services.models.KeycloakSessionFactory;
import org.keycloak.services.models.RealmModel;
import org.keycloak.services.models.RequiredCredentialModel;
import org.keycloak.services.models.RoleModel;
import org.keycloak.services.models.UserModel;
import org.keycloak.services.models.UserCredentialModel;
import org.keycloak.services.models.UserModel.RequiredAction;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.KeycloakSessionFactory;
import org.keycloak.models.RealmModel;
import org.keycloak.models.RequiredCredentialModel;
import org.keycloak.models.RoleModel;
import org.keycloak.models.UserModel;
import org.keycloak.models.UserCredentialModel;
import org.keycloak.models.UserModel.RequiredAction;
import org.keycloak.services.resources.KeycloakApplication;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
import java.util.StringTokenizer;

16
services/src/test/java/org/keycloak/test/ImportTest.java
View file

@ -9,14 +9,14 @@ import org.junit.runners.MethodSorters;
import org.keycloak.representations.idm.CredentialRepresentation;
import org.keycloak.representations.idm.RealmRepresentation;
import org.keycloak.services.managers.RealmManager;
import org.keycloak.services.models.KeycloakSession;
import org.keycloak.services.models.KeycloakSessionFactory;
import org.keycloak.services.models.RealmModel;
import org.keycloak.services.models.RequiredCredentialModel;
import org.keycloak.services.models.ApplicationModel;
import org.keycloak.services.models.RoleModel;
import org.keycloak.services.models.SocialLinkModel;
import org.keycloak.services.models.UserModel;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.KeycloakSessionFactory;
import org.keycloak.models.RealmModel;
import org.keycloak.models.RequiredCredentialModel;
import org.keycloak.models.ApplicationModel;
import org.keycloak.models.RoleModel;
import org.keycloak.models.SocialLinkModel;
import org.keycloak.models.UserModel;
import org.keycloak.services.resources.KeycloakApplication;
import org.keycloak.services.resources.SaasService;

4
services/src/test/java/org/keycloak/test/InstallationManager.java
View file

@ -2,9 +2,7 @@ package org.keycloak.test;
import org.keycloak.representations.idm.CredentialRepresentation;
import org.keycloak.services.managers.RealmManager;
import org.keycloak.services.models.RealmModel;
import org.keycloak.services.models.RequiredCredentialModel;
import org.keycloak.services.resources.SaasService;
import org.keycloak.models.RealmModel;
import org.keycloak.services.resources.SaasService;
/**

8
services/src/test/java/org/keycloak/test/ModelTest.java Normal file → Executable file
View file

@ -9,10 +9,10 @@ import org.junit.Before;
import org.junit.Test;
import org.keycloak.representations.idm.RealmRepresentation;
import org.keycloak.services.managers.RealmManager;
import org.keycloak.services.models.KeycloakSession;
import org.keycloak.services.models.KeycloakSessionFactory;
import org.keycloak.services.models.RealmModel;
import org.keycloak.services.models.RoleModel;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.KeycloakSessionFactory;
import org.keycloak.models.RealmModel;
import org.keycloak.models.RoleModel;
import org.keycloak.services.resources.KeycloakApplication;
public class ModelTest extends AbstractKeycloakServerTest {

4
services/src/test/java/org/keycloak/test/RealmCreationTest.java
View file

@ -9,8 +9,8 @@ import org.keycloak.representations.idm.RealmRepresentation;
import org.keycloak.representations.idm.UserRepresentation;
import org.keycloak.services.managers.AuthenticationManager;
import org.keycloak.services.managers.RealmManager;
import org.keycloak.services.models.KeycloakSession;
import org.keycloak.services.models.RealmModel;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.RealmModel;
import javax.ws.rs.NotAuthorizedException;
import javax.ws.rs.client.Entity;

4
services/src/test/resources/META-INF/persistence.xml
View file

@ -18,8 +18,8 @@
<class>org.picketlink.idm.jpa.model.sample.simple.X509CredentialTypeEntity</class>
<class>org.picketlink.idm.jpa.model.sample.simple.OTPCredentialTypeEntity</class>
<class>org.picketlink.idm.jpa.model.sample.simple.AttributeTypeEntity</class>
<class>org.keycloak.services.models.picketlink.mappings.RealmEntity</class>
<class>org.keycloak.services.models.picketlink.mappings.ApplicationEntity</class>
<class>org.keycloak.models.picketlink.mappings.RealmEntity</class>
<class>org.keycloak.models.picketlink.mappings.ApplicationEntity</class>
<exclude-unlisted-classes>true</exclude-unlisted-classes>

6
testsuite/src/test/java/org/keycloak/testsuite/actions/RequiredActionEmailVerificationTest.java Normal file → Executable file
View file

@ -33,9 +33,9 @@ import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
import org.keycloak.services.managers.RealmManager;
import org.keycloak.services.models.RealmModel;
import org.keycloak.services.models.UserModel;
import org.keycloak.services.models.UserModel.RequiredAction;
import org.keycloak.models.RealmModel;
import org.keycloak.models.UserModel;
import org.keycloak.models.UserModel.RequiredAction;
import org.keycloak.testsuite.pages.AppPage;
import org.keycloak.testsuite.pages.AppPage.RequestType;
import org.keycloak.testsuite.pages.LoginPage;

6
testsuite/src/test/java/org/keycloak/testsuite/actions/RequiredActionMultipleActionsTest.java Normal file → Executable file
View file

@ -26,9 +26,9 @@ import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
import org.keycloak.services.managers.RealmManager;
import org.keycloak.services.models.RealmModel;
import org.keycloak.services.models.UserModel;
import org.keycloak.services.models.UserModel.RequiredAction;
import org.keycloak.models.RealmModel;
import org.keycloak.models.UserModel;
import org.keycloak.models.UserModel.RequiredAction;
import org.keycloak.testsuite.pages.AppPage;
import org.keycloak.testsuite.pages.AppPage.RequestType;
import org.keycloak.testsuite.pages.LoginPage;

6
testsuite/src/test/java/org/keycloak/testsuite/actions/RequiredActionResetPasswordTest.java Normal file → Executable file
View file

@ -26,9 +26,9 @@ import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
import org.keycloak.services.managers.RealmManager;
import org.keycloak.services.models.RealmModel;
import org.keycloak.services.models.UserModel;
import org.keycloak.services.models.UserModel.RequiredAction;
import org.keycloak.models.RealmModel;
import org.keycloak.models.UserModel;
import org.keycloak.models.UserModel.RequiredAction;
import org.keycloak.testsuite.OAuthClient;
import org.keycloak.testsuite.pages.AppPage;
import org.keycloak.testsuite.pages.AppPage.RequestType;

6
testsuite/src/test/java/org/keycloak/testsuite/actions/RequiredActionTotpSetupTest.java Normal file → Executable file
View file

@ -27,9 +27,9 @@ import org.junit.Rule;
import org.junit.Test;
import org.keycloak.representations.idm.CredentialRepresentation;
import org.keycloak.services.managers.RealmManager;
import org.keycloak.services.models.RealmModel;
import org.keycloak.services.models.UserModel;
import org.keycloak.services.models.UserModel.RequiredAction;
import org.keycloak.models.RealmModel;
import org.keycloak.models.UserModel;
import org.keycloak.models.UserModel.RequiredAction;
import org.keycloak.testsuite.pages.AppPage;
import org.keycloak.testsuite.pages.AppPage.RequestType;
import org.keycloak.testsuite.pages.LoginConfigTotpPage;

6
testsuite/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateProfileTest.java Normal file → Executable file
View file

@ -26,9 +26,9 @@ import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
import org.keycloak.services.managers.RealmManager;
import org.keycloak.services.models.RealmModel;
import org.keycloak.services.models.UserModel;
import org.keycloak.services.models.UserModel.RequiredAction;
import org.keycloak.models.RealmModel;
import org.keycloak.models.UserModel;
import org.keycloak.models.UserModel.RequiredAction;
import org.keycloak.testsuite.pages.AppPage;
import org.keycloak.testsuite.pages.AppPage.RequestType;
import org.keycloak.testsuite.pages.LoginPage;

6
testsuite/src/test/java/org/keycloak/testsuite/forms/AccountTest.java Normal file → Executable file
View file

@ -28,9 +28,9 @@ import org.junit.Rule;
import org.junit.Test;
import org.keycloak.representations.idm.CredentialRepresentation;
import org.keycloak.services.managers.RealmManager;
import org.keycloak.services.models.RealmModel;
import org.keycloak.services.models.UserCredentialModel;
import org.keycloak.services.models.UserModel;
import org.keycloak.models.RealmModel;
import org.keycloak.models.UserCredentialModel;
import org.keycloak.models.UserModel;
import org.keycloak.testsuite.OAuthClient;
import org.keycloak.testsuite.pages.AccountPasswordPage;
import org.keycloak.testsuite.pages.AccountTotpPage;

6
testsuite/src/test/java/org/keycloak/testsuite/forms/LoginTotpTest.java Normal file → Executable file
View file

@ -30,9 +30,9 @@ import org.junit.Rule;
import org.junit.Test;
import org.keycloak.representations.idm.CredentialRepresentation;
import org.keycloak.services.managers.RealmManager;
import org.keycloak.services.models.RealmModel;
import org.keycloak.services.models.UserCredentialModel;
import org.keycloak.services.models.UserModel;
import org.keycloak.models.RealmModel;
import org.keycloak.models.UserCredentialModel;
import org.keycloak.models.UserModel;
import org.keycloak.testsuite.pages.AppPage;
import org.keycloak.testsuite.pages.AppPage.RequestType;
import org.keycloak.testsuite.pages.LoginPage;

10
testsuite/src/test/java/org/keycloak/testsuite/rule/KeycloakRule.java Normal file → Executable file
View file

@ -42,11 +42,11 @@ import org.keycloak.representations.idm.CredentialRepresentation;
import org.keycloak.representations.idm.RealmRepresentation;
import org.keycloak.services.filters.KeycloakSessionServletFilter;
import org.keycloak.services.managers.RealmManager;
import org.keycloak.services.models.KeycloakSession;
import org.keycloak.services.models.KeycloakSessionFactory;
import org.keycloak.services.models.RealmModel;
import org.keycloak.services.models.RoleModel;
import org.keycloak.services.models.UserModel;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.KeycloakSessionFactory;
import org.keycloak.models.RealmModel;
import org.keycloak.models.RoleModel;
import org.keycloak.models.UserModel;
import org.keycloak.services.resources.KeycloakApplication;
import org.keycloak.services.resources.SaasService;
import org.keycloak.testsuite.ApplicationServlet;

2
testsuite/src/test/java/org/keycloak/testsuite/social/SocialLoginTest.java Normal file → Executable file
View file

@ -27,7 +27,7 @@ import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
import org.keycloak.services.managers.RealmManager;
import org.keycloak.services.models.RealmModel;
import org.keycloak.models.RealmModel;
import org.keycloak.testsuite.DummySocialServlet;
import org.keycloak.testsuite.pages.AppPage;
import org.keycloak.testsuite.pages.LoginPage;

4
testsuite/src/test/resources/META-INF/persistence.xml
View file

@ -18,8 +18,8 @@
<class>org.picketlink.idm.jpa.model.sample.simple.X509CredentialTypeEntity</class>
<class>org.picketlink.idm.jpa.model.sample.simple.OTPCredentialTypeEntity</class>
<class>org.picketlink.idm.jpa.model.sample.simple.AttributeTypeEntity</class>
<class>org.keycloak.services.models.picketlink.mappings.RealmEntity</class>
<class>org.keycloak.services.models.picketlink.mappings.ApplicationEntity</class>
<class>org.keycloak.models.picketlink.mappings.RealmEntity</class>
<class>org.keycloak.models.picketlink.mappings.ApplicationEntity</class>
<exclude-unlisted-classes>true</exclude-unlisted-classes>