Started UserSessionProvider

model/api/src/main/java/org/keycloak/models/ClientModel.java

@@ -75,7 +75,4 @@ public interface ClientModel {
 
     void setNotBefore(int notBefore);
 
-    Set<UserSessionModel> getUserSessions();
-
-    int getActiveUserSessions();
 }

model/api/src/main/java/org/keycloak/models/KeycloakSession.java

@@ -23,7 +23,9 @@ public interface KeycloakSession {
 
     <T extends Provider> Set<T> getAllProviders(Class<T> clazz);
 
-    ModelProvider getModel();
+    ModelProvider model();
+
+    UserSessionProvider sessions();
 
     void close();
 

model/api/src/main/java/org/keycloak/models/ModelProvider.java

@@ -31,26 +31,11 @@ public interface ModelProvider extends Provider {
     Set<SocialLinkModel> getSocialLinks(UserModel user, RealmModel realm);
     SocialLinkModel getSocialLink(UserModel user, String socialProvider, RealmModel realm);
 
-
     RoleModel getRoleById(String id, RealmModel realm);
     ApplicationModel getApplicationById(String id, RealmModel realm);
     OAuthClientModel getOAuthClientById(String id, RealmModel realm);
     List<RealmModel> getRealms();
     boolean removeRealm(String id);
 
-    UsernameLoginFailureModel getUserLoginFailure(String username, RealmModel realm);
-    UsernameLoginFailureModel addUserLoginFailure(String username, RealmModel realm);
-    List<UsernameLoginFailureModel> getAllUserLoginFailures(RealmModel realm);
-
-    UserSessionModel createUserSession(RealmModel realm, UserModel user, String ipAddress);
-    UserSessionModel getUserSession(String id, RealmModel realm);
-    List<UserSessionModel> getUserSessions(UserModel user, RealmModel realm);
-    Set<UserSessionModel> getUserSessions(RealmModel realm, ClientModel client);
-    int getActiveUserSessions(RealmModel realm, ClientModel client);
-    void removeUserSession(UserSessionModel session);
-    void removeUserSessions(RealmModel realm, UserModel user);
-    void removeExpiredUserSessions(RealmModel realm);
-    void removeUserSessions(RealmModel realm);
-
     void close();
 }

model/api/src/main/java/org/keycloak/models/RealmModel.java

@@ -165,10 +165,6 @@ public interface RealmModel extends RoleContainerModel {
 
     void setUpdateProfileOnInitialSocialLogin(boolean updateProfileOnInitialSocialLogin);
 
-    UsernameLoginFailureModel getUserLoginFailure(String username);
-    UsernameLoginFailureModel addUserLoginFailure(String username);
-    List<UsernameLoginFailureModel> getAllUserLoginFailures();
-
     List<UserModel> getUsers();
 
     List<UserModel> searchForUser(String search);
@@ -245,19 +241,6 @@ public interface RealmModel extends RoleContainerModel {
 
     void setMasterAdminApp(ApplicationModel app);
 
-    UserSessionModel createUserSession(UserModel user, String ipAddress);
-
-    UserSessionModel getUserSession(String id);
-
-    List<UserSessionModel> getUserSessions(UserModel user);
-
-    void removeUserSession(UserSessionModel session);
-
-    void removeUserSessions(UserModel user);
-
-    void removeExpiredUserSessions();
-
     ClientModel findClientById(String id);
 
-    void removeUserSessions();
 }

model/api/src/main/java/org/keycloak/models/UserSessionProvider.java

@@ -0,0 +1,37 @@
+package org.keycloak.models;
+
+import org.keycloak.provider.Provider;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+ * @version $Revision: 1 $
+ */
+public interface UserSessionProvider extends Provider {
+
+    KeycloakTransaction getTransaction();
+
+    UserSessionModel createUserSession(RealmModel realm, UserModel user, String ipAddress);
+    UserSessionModel getUserSession(RealmModel realm, String id);
+    List<UserSessionModel> getUserSessions(RealmModel realm, UserModel user);
+    Set<UserSessionModel> getUserSessions(RealmModel realm, ClientModel client);
+    int getActiveUserSessions(RealmModel realm, ClientModel client);
+    void removeUserSession(RealmModel realm, UserSessionModel session);
+    void removeUserSessions(RealmModel realm, UserModel user);
+    void removeExpiredUserSessions(RealmModel realm);
+    void removeUserSessions(RealmModel realm);
+
+    UsernameLoginFailureModel getUserLoginFailure(RealmModel realm, String username);
+    UsernameLoginFailureModel addUserLoginFailure(RealmModel realm, String username);
+    List<UsernameLoginFailureModel> getAllUserLoginFailures(RealmModel realm);
+
+    void onRealmRemoved(RealmModel realm);
+    void onClientRemoved(RealmModel realm, ClientModel client);
+    void onUserRemoved(RealmModel realm, UserModel user);
+
+    void close();
+
+}

model/api/src/main/java/org/keycloak/models/UserSessionProviderFactory.java

@@ -0,0 +1,10 @@
+package org.keycloak.models;
+
+import org.keycloak.provider.ProviderFactory;
+
+/**
+ * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+ * @version $Revision: 1 $
+ */
+public interface UserSessionProviderFactory extends ProviderFactory<UserSessionProvider> {
+}

model/api/src/main/java/org/keycloak/models/UserSessionSpi.java

@@ -0,0 +1,27 @@
+package org.keycloak.models;
+
+import org.keycloak.provider.Provider;
+import org.keycloak.provider.ProviderFactory;
+import org.keycloak.provider.Spi;
+
+/**
+ * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
+ */
+public class UserSessionSpi implements Spi {
+
+    @Override
+    public String getName() {
+        return "userSessions";
+    }
+
+    @Override
+    public Class<? extends Provider> getProviderClass() {
+        return UserSessionProvider.class;
+    }
+
+    @Override
+    public Class<? extends ProviderFactory> getProviderFactoryClass() {
+        return UserSessionProviderFactory.class;
+    }
+
+}

model/api/src/main/resources/META-INF/services/org.keycloak.provider.Spi

@@ -1 +1,2 @@
-org.keycloak.models.ModelSpi
+org.keycloak.models.ModelSpi
+org.keycloak.models.UserSessionSpi