X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2FCmsUserManager.java;h=9af578c962ab8370b0d7ceb9dc72f4024f88eb1b;hb=eb4324be6ac9cdff15828a21ee7d3f6ca2f19fb9;hp=39d4be622f9a09219c633e3dea94b5193b789e50;hpb=b7c2f2cc2f6f74762031567e9e636ff277ebc7c7;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/CmsUserManager.java b/org.argeo.cms/src/org/argeo/cms/CmsUserManager.java
index 39d4be622..9af578c96 100644
--- a/org.argeo.cms/src/org/argeo/cms/CmsUserManager.java
+++ b/org.argeo.cms/src/org/argeo/cms/CmsUserManager.java
@@ -1,23 +1,25 @@
 package org.argeo.cms;
 
+import java.time.ZonedDateTime;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
-import javax.jcr.Node;
 import javax.security.auth.Subject;
-import javax.transaction.UserTransaction;
 
+import org.argeo.osgi.useradmin.UserDirectory;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.service.useradmin.Role;
 import org.osgi.service.useradmin.User;
-import org.osgi.service.useradmin.UserAdmin;
 
 /**
  * Provide method interfaces to manage user concepts without accessing directly
  * the userAdmin.
  */
 public interface CmsUserManager {
-
+	public Map<String, String> getKnownBaseDns(boolean onlyWritable);
+	public Set<UserDirectory> getUserDirectories();
+	
 	// CurrentUser
 	/** Returns the e-mail of the current logged in user */
 	public String getMyMail();
@@ -73,15 +75,19 @@ public interface CmsUserManager {
 
 	void addAuthToken(String userDn, String token, Integer hours, String... roles);
 
+	void addAuthToken(String userDn, String token, ZonedDateTime expiryDate, String... roles);
+
 	void expireAuthToken(String token);
 
 	void expireAuthTokens(Subject subject);
+	
+	UserDirectory getDirectory(Role role);
 
-	User createUserFromPerson(Node person);
+//	User createUserFromPerson(Node person);
 
-	@Deprecated
-	public UserAdmin getUserAdmin();
-
-	@Deprecated
-	public UserTransaction getUserTransaction();
+//	@Deprecated
+//	public UserAdmin getUserAdmin();
+//
+//	@Deprecated
+//	public UserTransaction getUserTransaction();
 }
\ No newline at end of file