X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Futil%2FUserMenu.java;h=1c35600012d9c47e33d031e376bb1d98d627310f;hb=93a457cf047cebb0170abd0f37a9b4291a2ae3e9;hp=ad47d1850b34fb3d767d5aaa60e804e629dcd454;hpb=5919d9b34f86dd14afc65547cb5a8ccc083d6482;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/util/UserMenu.java b/org.argeo.cms/src/org/argeo/cms/util/UserMenu.java
index ad47d1850..1c3560001 100644
--- a/org.argeo.cms/src/org/argeo/cms/util/UserMenu.java
+++ b/org.argeo.cms/src/org/argeo/cms/util/UserMenu.java
@@ -32,8 +32,6 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
 
 /** The site-related user menu */
 public class UserMenu extends Shell implements CmsStyles, CallbackHandler {
@@ -44,13 +42,13 @@ public class UserMenu extends Shell implements CmsStyles, CallbackHandler {
 		super(source.getDisplay(), SWT.NO_TRIM | SWT.BORDER | SWT.ON_TOP);
 		setData(RWT.CUSTOM_VARIANT, CMS_USER_MENU);
 
-		Authentication authentication = SecurityContextHolder.getContext()
-				.getAuthentication();
-		if (authentication == null)
-			throw new CmsException("No authentication available");
+		// Authentication authentication = SecurityContextHolder.getContext()
+		// .getAuthentication();
+		// if (authentication == null)
+		// throw new CmsException("No authentication available");
 
-		String username = authentication.getName();
-		if (username.equals(KernelHeader.USERNAME_ANONYMOUS)) {
+		String username = CurrentUserUtils.getUsername();
+		if (username.equalsIgnoreCase(KernelHeader.ROLE_ANONYMOUS)) {
 			username = null;
 			anonymousUi();
 		} else {
@@ -107,11 +105,11 @@ public class UserMenu extends Shell implements CmsStyles, CallbackHandler {
 		});
 	}
 
-	protected String getUsername() {
-		String username = SecurityContextHolder.getContext()
-				.getAuthentication().getName();
-		return username;
-	}
+	// protected String getUsername() {
+	// // String username = SecurityContextHolder.getContext()
+	// // .getAuthentication().getName();
+	// return CurrentUserUtils.getUsername();
+	// }
 
 	/** To be overridden */
 	protected void specificUserUi(Composite parent) {