X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fauth%2FCmsSessionImpl.java;h=3a23870bd0703a37608311c694d70a80ee82f672;hb=b95462873703848193e56fcbe997693630db6121;hp=dfedfab1968f02a474bc073f3c7f15914ee810c2;hpb=6254373e6005cf77f218ab5b8c54fdc72bb97ca4;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 dfedfab19..3a23870bd 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
@@ -21,11 +21,12 @@ import org.argeo.api.cms.CmsAuth;
 import org.argeo.api.cms.CmsConstants;
 import org.argeo.api.cms.CmsLog;
 import org.argeo.api.cms.CmsSession;
+import org.argeo.api.uuid.UuidIdentified;
 import org.argeo.cms.internal.runtime.CmsContextImpl;
 import org.osgi.service.useradmin.Authorization;
 
 /** Default CMS session implementation. */
-public class CmsSessionImpl implements CmsSession, Serializable {
+public class CmsSessionImpl implements CmsSession, Serializable, UuidIdentified {
 	private static final long serialVersionUID = 1867719354246307225L;
 	private final static CmsLog log = CmsLog.getLog(CmsSessionImpl.class);
 
@@ -76,9 +77,9 @@ public class CmsSessionImpl implements CmsSession, Serializable {
 		try {
 			LoginContext lc;
 			if (isAnonymous()) {
-				lc = new LoginContext(CmsAuth.LOGIN_CONTEXT_ANONYMOUS, getSubject());
+				lc = CmsAuth.ANONYMOUS.newLoginContext(getSubject());
 			} else {
-				lc = new LoginContext(CmsAuth.LOGIN_CONTEXT_USER, getSubject());
+				lc = CmsAuth.USER.newLoginContext(getSubject());
 			}
 			lc.logout();
 		} catch (LoginException e) {
@@ -128,7 +129,7 @@ public class CmsSessionImpl implements CmsSession, Serializable {
 	}
 
 	@Override
-	public UUID getUuid() {
+	public UUID uuid() {
 		return uuid;
 	}
 
@@ -175,6 +176,21 @@ public class CmsSessionImpl implements CmsSession, Serializable {
 		views.put(uid, view);
 	}
 
+	/*
+	 * OBJECT METHODS
+	 */
+
+	@Override
+	public boolean equals(Object o) {
+		return UuidIdentified.equals(this, o);
+	}
+
+	@Override
+	public int hashCode() {
+		return UuidIdentified.hashCode(this);
+	}
+
+	@Override
 	public String toString() {
 		return "CMS Session " + userDn + " localId=" + localSessionId + ", uuid=" + uuid;
 	}