mariusz.pacek/keycloak
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed model methods from KeycloakSession

Browse Source
This commit is contained in:
Stian Thorgersen committed 2014-07-08 15:27:42 +01:00
1 parent 8dc293f629
commit ad6d52cb0f
32 files changed
+196 -381
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

services/src/main/java/org/keycloak/services/DefaultKeycloakSession.java
+4 -160
View File
@@ -1,24 +1,14 @@
package org.keycloak.services;
import org.keycloak.models.ApplicationModel;
import org.keycloak.models.ClientModel;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.KeycloakTransaction;
import org.keycloak.models.ModelProvider;
import org.keycloak.models.OAuthClientModel;
import org.keycloak.models.RealmModel;
import org.keycloak.models.RoleModel;
import org.keycloak.models.SocialLinkModel;
import org.keycloak.models.UserModel;
import org.keycloak.models.UserSessionModel;
import org.keycloak.models.UsernameLoginFailureModel;
import org.keycloak.models.cache.CacheModelProvider;
import org.keycloak.provider.Provider;
import org.keycloak.provider.ProviderFactory;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -27,8 +17,8 @@ import java.util.Set;
*/
public class DefaultKeycloakSession implements KeycloakSession {
private DefaultKeycloakSessionFactory factory;
private Map<Integer, Provider> providers = new HashMap<Integer, Provider>();
private final DefaultKeycloakSessionFactory factory;
private final Map<Integer, Provider> providers = new HashMap<Integer, Provider>();
private final ModelProvider model;
public DefaultKeycloakSession(DefaultKeycloakSessionFactory factory) {
@@ -85,154 +75,8 @@ public class DefaultKeycloakSession implements KeycloakSession {
return providers;
}
@Override
public RealmModel createRealm(String name) {
return model.createRealm(name);
}
@Override
public RealmModel createRealm(String id, String name) {
return model.createRealm(id, name);
}
@Override
public RealmModel getRealm(String id) {
return model.getRealm(id);
}
@Override
public RealmModel getRealmByName(String name) {
return model.getRealmByName(name);
}
@Override
public UserModel getUserById(String id, RealmModel realm) {
return model.getUserById(id, realm);
}
@Override
public UserModel getUserByUsername(String username, RealmModel realm) {
return model.getUserByUsername(username, realm);
}
@Override
public UserModel getUserByEmail(String email, RealmModel realm) {
return model.getUserByEmail(email, realm);
}
@Override
public UserModel getUserBySocialLink(SocialLinkModel socialLink, RealmModel realm) {
return model.getUserBySocialLink(socialLink, realm);
}
@Override
public List<UserModel> getUsers(RealmModel realm) {
return model.getUsers(realm);
}
@Override
public List<UserModel> searchForUser(String search, RealmModel realm) {
return model.searchForUser(search, realm);
}
@Override
public List<UserModel> searchForUserByAttributes(Map<String, String> attributes, RealmModel realm) {
return model.searchForUserByAttributes(attributes, realm);
}
@Override
public Set<SocialLinkModel> getSocialLinks(UserModel user, RealmModel realm) {
return model.getSocialLinks(user, realm);
}
@Override
public SocialLinkModel getSocialLink(UserModel user, String socialProvider, RealmModel realm) {
return model.getSocialLink(user, socialProvider, realm);
}
@Override
public RoleModel getRoleById(String id, RealmModel realm) {
return model.getRoleById(id, realm);
}
@Override
public ApplicationModel getApplicationById(String id, RealmModel realm) {
return model.getApplicationById(id, realm);
}
@Override
public OAuthClientModel getOAuthClientById(String id, RealmModel realm) {
return model.getOAuthClientById(id, realm);
}
@Override
public List<RealmModel> getRealms() {
return model.getRealms();
}
@Override
public boolean removeRealm(String id) {
return model.removeRealm(id);
}
@Override
public UsernameLoginFailureModel getUserLoginFailure(String username, RealmModel realm) {
return model.getUserLoginFailure(username, realm);
}
@Override
public UsernameLoginFailureModel addUserLoginFailure(String username, RealmModel realm) {
return model.addUserLoginFailure(username, realm);
}
@Override
public List<UsernameLoginFailureModel> getAllUserLoginFailures(RealmModel realm) {
return model.getAllUserLoginFailures(realm);
}
@Override
public UserSessionModel createUserSession(RealmModel realm, UserModel user, String ipAddress) {
return model.createUserSession(realm, user, ipAddress);
}
@Override
public UserSessionModel getUserSession(String id, RealmModel realm) {
return model.getUserSession(id, realm);
}
@Override
public List<UserSessionModel> getUserSessions(UserModel user, RealmModel realm) {
return model.getUserSessions(user, realm);
}
@Override
public Set<UserSessionModel> getUserSessions(RealmModel realm, ClientModel client) {
return model.getUserSessions(realm, client);
}
@Override
public int getActiveUserSessions(RealmModel realm, ClientModel client) {
return model.getActiveUserSessions(realm, client);
}
@Override
public void removeUserSession(UserSessionModel session) {
model.removeUserSession(session);
}
@Override
public void removeUserSessions(RealmModel realm, UserModel user) {
model.removeUserSessions(realm, user);
}
@Override
public void removeExpiredUserSessions(RealmModel realm) {
model.removeExpiredUserSessions(realm);
}
@Override
public void removeUserSessions(RealmModel realm) {
model.removeUserSessions(realm);
public ModelProvider getModel() {
return model;
}
public void close() {
services/src/main/java/org/keycloak/services/managers/ApplianceBootstrap.java
+2 -1
View File
@@ -8,6 +8,7 @@ import org.keycloak.models.AuthenticationProviderModel;
import org.keycloak.models.Constants;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.KeycloakSessionFactory;
import org.keycloak.models.ModelProvider;
import org.keycloak.models.RealmModel;
import org.keycloak.models.RoleModel;
import org.keycloak.models.UserCredentialModel;
@@ -39,7 +40,7 @@ public class ApplianceBootstrap {
public void bootstrap(KeycloakSession session, String contextPath) {
String adminRealmName = Config.getAdminRealm();
if (session.getRealm(adminRealmName) != null) {
if (session.getModel().getRealm(adminRealmName) != null) {
return;
}
services/src/main/java/org/keycloak/services/managers/BruteForceProtector.java
+1 -1
View File
@@ -128,7 +128,7 @@ public class BruteForceProtector implements Runnable {
}
protected RealmModel getRealmModel(KeycloakSession session, LoginEvent event) {
RealmModel realm = session.getRealm(event.realmId);
RealmModel realm = session.getModel().getRealm(event.realmId);
if (realm == null) return null;
return realm;
}
services/src/main/java/org/keycloak/services/managers/RealmManager.java
+8 -5
View File
@@ -10,6 +10,7 @@ import org.keycloak.models.ClientModel;
import org.keycloak.Config;
import org.keycloak.models.Constants;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.ModelProvider;
import org.keycloak.models.OAuthClientModel;
import org.keycloak.models.PasswordPolicy;
import org.keycloak.models.RealmModel;
@@ -53,6 +54,7 @@ public class RealmManager {
protected static final Logger logger = Logger.getLogger(RealmManager.class);
protected KeycloakSession session;
protected ModelProvider model;
protected String contextPath = "";
public String getContextPath() {
@@ -65,6 +67,7 @@ public class RealmManager {
public RealmManager(KeycloakSession session) {
this.session = session;
this.model = session.getModel();
}
public RealmModel getKeycloakAdminstrationRealm() {
@@ -72,11 +75,11 @@ public class RealmManager {
}
public RealmModel getRealm(String id) {
return session.getRealm(id);
return model.getRealm(id);
}
public RealmModel getRealmByName(String name) {
return session.getRealmByName(name);
return model.getRealmByName(name);
}
public RealmModel createRealm(String name) {
@@ -85,7 +88,7 @@ public class RealmManager {
public RealmModel createRealm(String id, String name) {
if (id == null) id = KeycloakModelUtils.generateId();
RealmModel realm = session.createRealm(id, name);
RealmModel realm = model.createRealm(id, name);
realm.setName(name);
// setup defaults
@@ -143,7 +146,7 @@ public class RealmManager {
}
public boolean removeRealm(RealmModel realm) {
boolean removed = session.removeRealm(realm.getId());
boolean removed = model.removeRealm(realm.getId());
if (removed) {
getKeycloakAdminstrationRealm().removeApplication(realm.getMasterAdminApp().getId());
}
@@ -244,7 +247,7 @@ public class RealmManager {
RoleModel createRealmRole = realm.addRole(AdminRoles.CREATE_REALM);
adminRole.addCompositeRole(createRealmRole);
} else {
adminRealm = session.getRealmByName(Config.getAdminRealm());
adminRealm = model.getRealmByName(Config.getAdminRealm());
adminRole = adminRealm.getRole(AdminRoles.ADMIN);
}
services/src/main/java/org/keycloak/services/resources/admin/AdminConsole.java
+2 -1
View File
@@ -12,6 +12,7 @@ import org.keycloak.models.AdminRoles;
import org.keycloak.models.ApplicationModel;
import org.keycloak.models.Constants;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.ModelProvider;
import org.keycloak.models.RealmModel;
import org.keycloak.models.RoleModel;
import org.keycloak.models.UserModel;
@@ -224,7 +225,7 @@ public class AdminConsole {
}
private void addMasterRealmAccess(RealmModel masterRealm, UserModel user, Map<String, Set<String>> realmAdminAccess) {
List<RealmModel> realms = session.getRealms();
List<RealmModel> realms = session.getModel().getRealms();
for (RealmModel realm : realms) {
ApplicationModel realmAdminApp = realm.getMasterAdminApp();
Set<RoleModel> roles = realmAdminApp.getRoles();
services/src/main/java/org/keycloak/services/resources/admin/RealmsAdminResource.java
+1 -1
View File
@@ -87,7 +87,7 @@ public class RealmsAdminResource {
RealmManager realmManager = new RealmManager(session);
List<RealmRepresentation> reps = new ArrayList<RealmRepresentation>();
if (auth.getRealm().equals(realmManager.getKeycloakAdminstrationRealm())) {
List<RealmModel> realms = session.getRealms();
List<RealmModel> realms = session.getModel().getRealms();
for (RealmModel realm : realms) {
addRealmRep(reps, realm, realm.getMasterAdminApp());
}
services/src/main/java/org/keycloak/services/scheduled/ClearExpiredAuditEvents.java
+1 -1
View File
@@ -13,7 +13,7 @@ public class ClearExpiredAuditEvents implements ScheduledTask {
public void run(KeycloakSession session) {
AuditProvider audit = session.getProvider(AuditProvider.class);
if (audit != null) {
for (RealmModel realm : session.getRealms()) {
for (RealmModel realm : session.getModel().getRealms()) {
if (realm.isAuditEnabled() && realm.getAuditExpiration() > 0) {
long olderThan = System.currentTimeMillis() - realm.getAuditExpiration() * 1000;
audit.clear(realm.getId(), olderThan);
services/src/main/java/org/keycloak/services/scheduled/ClearExpiredUserSessions.java
+1 -1
View File
@@ -10,7 +10,7 @@ public class ClearExpiredUserSessions implements ScheduledTask {
@Override
public void run(KeycloakSession session) {
for (RealmModel realm : session.getRealms()) {
for (RealmModel realm : session.getModel().getRealms()) {
realm.removeExpiredUserSessions();
}
}