X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fhttp%2FWebCmsSessionImpl.java;h=4b4a77641ce6a3c0d11adbb26da85e55fac7c740;hb=eb4324be6ac9cdff15828a21ee7d3f6ca2f19fb9;hp=3d5e3fe4c612d65781e5fe8196078dc4c05cafcb;hpb=b45e59192a4bb34a6b38a9bfa416b3dc3f6b7892;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/http/WebCmsSessionImpl.java b/org.argeo.cms/src/org/argeo/cms/internal/http/WebCmsSessionImpl.java
index 3d5e3fe4c..4b4a77641 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/http/WebCmsSessionImpl.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/http/WebCmsSessionImpl.java
@@ -1,37 +1,30 @@
 package org.argeo.cms.internal.http;
 
+import java.util.Locale;
+import java.util.UUID;
+
 import javax.security.auth.Subject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
 
-import org.argeo.cms.auth.CmsSession;
+import org.argeo.cms.auth.RemoteAuthRequest;
+import org.argeo.cms.auth.RemoteAuthSession;
 import org.argeo.cms.internal.auth.CmsSessionImpl;
 import org.osgi.service.useradmin.Authorization;
 
+/** CMS session implementation in a web context. */
 public class WebCmsSessionImpl extends CmsSessionImpl {
-	// private final static Log log =
-	// LogFactory.getLog(WebCmsSessionImpl.class);
-
-	private HttpSession httpSession;
+	private static final long serialVersionUID = -5178883380637048025L;
+	private RemoteAuthSession httpSession;
 
-	public WebCmsSessionImpl(Subject initialSubject, Authorization authorization, HttpServletRequest request) {
-		super(initialSubject, authorization, request.getSession(false).getId());
-		httpSession = request.getSession(false);
+	public WebCmsSessionImpl(UUID uuid, Subject initialSubject, Authorization authorization, Locale locale,
+			RemoteAuthRequest request) {
+		super(uuid, initialSubject, authorization, locale, request.getSession().getId());
+		httpSession = request.getSession();
 	}
 
 	@Override
 	public boolean isValid() {
 		if (isClosed())
 			return false;
-		try {// test http session
-			httpSession.getCreationTime();
-			return true;
-		} catch (IllegalStateException ise) {
-			return false;
-		}
-	}
-
-	public static CmsSession getCmsSession(HttpServletRequest request) {
-		return CmsSessionImpl.getByLocalId(request.getSession(false).getId());
+		return httpSession.isValid();
 	}
 }