X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Futil%2FUserMenuLink.java;h=704f90980af02273efb39f43d57af113296cff18;hb=0a7d938324d33848ac7dc4ef4007c73a714171ee;hp=0dbb4ac5adf0429e678a1947f2ca4a339e08056f;hpb=93a457cf047cebb0170abd0f37a9b4291a2ae3e9;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/util/UserMenuLink.java b/org.argeo.cms/src/org/argeo/cms/util/UserMenuLink.java
index 0dbb4ac5a..704f90980 100644
--- a/org.argeo.cms/src/org/argeo/cms/util/UserMenuLink.java
+++ b/org.argeo.cms/src/org/argeo/cms/util/UserMenuLink.java
@@ -4,7 +4,8 @@ import javax.jcr.Node;
 
 import org.argeo.cms.CmsMsg;
 import org.argeo.cms.CmsStyles;
-import org.argeo.cms.KernelHeader;
+import org.argeo.cms.auth.AuthConstants;
+import org.argeo.cms.auth.CurrentUser;
 import org.eclipse.swt.events.DisposeEvent;
 import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.events.MouseEvent;
@@ -22,13 +23,14 @@ public class UserMenuLink extends MenuLink {
 
 	@Override
 	public Control createUi(Composite parent, Node context) {
-		// String username = SecurityContextHolder.getContext()
-		// .getAuthentication().getName();
-		String username = CurrentUserUtils.getUsername();
-		if (username.equalsIgnoreCase(KernelHeader.ROLE_ANONYMOUS))
+		String username = CurrentUser.getUsername(CmsUtils.getCmsView()
+				.getSubject());
+		if (username.equalsIgnoreCase(AuthConstants.ROLE_ANONYMOUS))
 			setLabel(CmsMsg.login.lead());
-		else
-			setLabel(username);
+		else {
+			setLabel(CurrentUser.getDisplayName(CmsUtils.getCmsView()
+					.getSubject()));
+		}
 		Label link = (Label) ((Composite) super.createUi(parent, context))
 				.getChildren()[0];
 		link.addMouseListener(new UserMenuLinkController());