X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fauth%2FCmsSessionImpl.java;h=aa3a6ad17dd3e61fa4bd4dc751c6533a2a1f8b4a;hb=600afe220ae3bad9b2904f7a6d5529168e5c0f1b;hp=4e9b4e07293188b62e31d4fcdf383e71f90ee613;hpb=b7683883512d924a039a43c2e1102290aa49f64d;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/auth/CmsSessionImpl.java b/org.argeo.cms/src/org/argeo/cms/internal/auth/CmsSessionImpl.java
index 4e9b4e072..aa3a6ad17 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/auth/CmsSessionImpl.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/auth/CmsSessionImpl.java
@@ -5,13 +5,17 @@ import java.security.AccessControlContext;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.time.ZonedDateTime;
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Hashtable;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
+import java.util.function.Consumer;
 
 import javax.crypto.SecretKey;
 import javax.naming.InvalidNameException;
@@ -21,11 +25,10 @@ import javax.security.auth.login.LoginContext;
 import javax.security.auth.login.LoginException;
 import javax.security.auth.x500.X500Principal;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.argeo.api.NodeConstants;
+import org.argeo.api.cms.CmsAuth;
+import org.argeo.api.cms.CmsLog;
 import org.argeo.api.cms.CmsSession;
-import org.argeo.api.security.NodeSecurityUtils;
+import org.argeo.cms.security.NodeSecurityUtils;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.InvalidSyntaxException;
@@ -37,7 +40,7 @@ import org.osgi.service.useradmin.Authorization;
 public class CmsSessionImpl implements CmsSession, Serializable {
 	private static final long serialVersionUID = 1867719354246307225L;
 	private final static BundleContext bc = FrameworkUtil.getBundle(CmsSessionImpl.class).getBundleContext();
-	private final static Log log = LogFactory.getLog(CmsSessionImpl.class);
+	private final static CmsLog log = CmsLog.getLog(CmsSessionImpl.class);
 
 	// private final Subject initialSubject;
 	private transient AccessControlContext accessControlContext;
@@ -55,6 +58,8 @@ public class CmsSessionImpl implements CmsSession, Serializable {
 
 	private Map<String, Object> views = new HashMap<>();
 
+	private List<Consumer<CmsSession>> onCloseCallbacks = Collections.synchronizedList(new ArrayList<>());
+
 	public CmsSessionImpl(Subject initialSubject, Authorization authorization, Locale locale, String localSessionId) {
 		this.creationTime = ZonedDateTime.now();
 		this.locale = locale;
@@ -93,12 +98,16 @@ public class CmsSessionImpl implements CmsSession, Serializable {
 		end = ZonedDateTime.now();
 		serviceRegistration.unregister();
 
+		for (Consumer<CmsSession> onClose : onCloseCallbacks) {
+			onClose.accept(this);
+		}
+
 		try {
 			LoginContext lc;
 			if (isAnonymous()) {
-				lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_ANONYMOUS, getSubject());
+				lc = new LoginContext(CmsAuth.LOGIN_CONTEXT_ANONYMOUS, getSubject());
 			} else {
-				lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_USER, getSubject());
+				lc = new LoginContext(CmsAuth.LOGIN_CONTEXT_USER, getSubject());
 			}
 			lc.logout();
 		} catch (LoginException e) {
@@ -109,6 +118,11 @@ public class CmsSessionImpl implements CmsSession, Serializable {
 		log.debug("Closed " + this);
 	}
 
+	@Override
+	public void addOnCloseCallback(Consumer<CmsSession> onClose) {
+		onCloseCallbacks.add(onClose);
+	}
+
 	public Subject getSubject() {
 		return Subject.getSubject(accessControlContext);
 	}