Improve user profile

[lgpl/argeo-commons.git] / security / runtime / org.argeo.security.core / src / main / java / org / argeo / security / jcr / SecureThreadBoundSession.java

diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/jcr/SecureThreadBoundSession.java b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/jcr/SecureThreadBoundSession.java
index dce6e549683281b8179be8868b6788c370c61df5..44b0fa3457df7c9b3caef483877700f1ae7b494a 100644 (file)
--- a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/jcr/SecureThreadBoundSession.java
+++ b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/jcr/SecureThreadBoundSession.java
@@ -7,7 +7,6 @@ import org.apache.commons.logging.LogFactory;
 import org.argeo.jcr.spring.ThreadBoundSession;
 import org.springframework.security.Authentication;
 import org.springframework.security.context.SecurityContextHolder;
-import org.springframework.security.userdetails.UserDetails;
 
 /**
  * Thread bounded JCR session factory which checks authentication and is
@@ -23,14 +22,14 @@ public class SecureThreadBoundSession extends ThreadBoundSession {
                                .getAuthentication();
                if (authentication != null) {
                        String userID = session.getUserID();
-                       UserDetails userDetails = (UserDetails) authentication.getDetails();
-                       if (userDetails != null) {
-                               String currentUserName = userDetails.getUsername();
+                       String currentUserName = authentication.getName();
+                       if (currentUserName != null) {
                                if (!userID.equals(currentUserName)) {
                                        log.warn("Current session has user ID " + userID
                                                        + " while logged is user is " + currentUserName
                                                        + "(authentication=" + authentication + ")"
                                                        + ". Re-login.");
+                                       // TODO throw an exception
                                        return login();
                                }
                        }