Merge remote-tracking branch 'origin/merge-to-testing' into testing

[lgpl/argeo-commons.git] / org.argeo.api.cms / src / org / argeo / api / cms / CmsSession.java

diff --git a/org.argeo.api.cms/src/org/argeo/api/cms/CmsSession.java b/org.argeo.api.cms/src/org/argeo/api/cms/CmsSession.java
index ea9d10ba24d1573ed74df47bf9049e07969f7ed1..dda1dac1f7fa118ae4247b93e21bf7963c11e689 100644 (file)
--- a/org.argeo.api.cms/src/org/argeo/api/cms/CmsSession.java
+++ b/org.argeo.api.cms/src/org/argeo/api/cms/CmsSession.java
@@ -5,7 +5,6 @@ import java.util.Locale;
 import java.util.UUID;
 import java.util.function.Consumer;
 
-import javax.naming.ldap.LdapName;
 import javax.security.auth.Subject;
 
 /** An authenticated user session. */
@@ -18,7 +17,7 @@ public interface CmsSession {
 
        String getUserRole();
 
-       LdapName getUserDn();
+       String getUserDn();
 
        String getLocalId();
 
@@ -40,4 +39,8 @@ public interface CmsSession {
        void registerView(String uid, Object view);
 
        void addOnCloseCallback(Consumer<CmsSession> onClose);
+
+       public static boolean hasCmsSession(Subject subject) {
+               return !subject.getPrivateCredentials(CmsSessionId.class).isEmpty();
+       }
 }