Improve Security

[lgpl/argeo-commons.git] / security / runtime / org.argeo.security.core / src / main / java / org / argeo / security / ArgeoSecurityService.java

diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ArgeoSecurityService.java b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ArgeoSecurityService.java
index 732ec72c2c8caacf20737344a3e1ffdd4f80d11e..76933e0e566d670f0b1254700edb36af5a11a866 100644 (file)
--- a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ArgeoSecurityService.java
+++ b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ArgeoSecurityService.java
@@ -16,30 +16,11 @@
 
 package org.argeo.security;
 
-import java.util.List;
 
 /**
  * High level access to the user referential (independent from the underlying
  * storage).
  */
-public interface ArgeoSecurityService {
-       public ArgeoUser getCurrentUser();
-
-       public void newUser(ArgeoUser argeoUser);
-
-       public void updateUser(ArgeoUser user);
-
-       public void updateUserPassword(String username, String password);
-
-       public void updateCurrentUserPassword(String oldPassword, String newPassword);
-
-       public void newRole(String role);
-
-       public ArgeoSecurityDao getSecurityDao();
-
-       public Runnable wrapWithSystemAuthentication(final Runnable runnable);
-       
-       /** List users having this role (except the super user). */
-       public List<ArgeoUser> listUsersInRole(String role);
-
+public interface ArgeoSecurityService extends CurrentUserService,
+               UserAdminService {
 }