X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Futil%2FUserMenu.java;h=73567886b0f7986575f58f9c7626b68247a3233f;hb=170c56881f05f1028c35e6fe8c6e69dfd764c30e;hp=622ce1c31ead869dbc97fe62ad0165af1fe9488a;hpb=0aace113e5cd3c265f2a1c7aeec5bac565fe581a;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 622ce1c31..73567886b 100644 --- a/org.argeo.cms/src/org/argeo/cms/util/UserMenu.java +++ b/org.argeo.cms/src/org/argeo/cms/util/UserMenu.java @@ -11,8 +11,7 @@ import javax.security.auth.callback.UnsupportedCallbackException; import javax.security.auth.login.LoginContext; import javax.security.auth.login.LoginException; -import org.argeo.ArgeoException; -import org.argeo.cms.CmsLogin; +import org.argeo.cms.CmsException; import org.argeo.cms.CmsMsg; import org.argeo.cms.CmsSession; import org.argeo.cms.CmsStyles; @@ -28,29 +27,30 @@ import org.eclipse.swt.events.TraverseEvent; import org.eclipse.swt.events.TraverseListener; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Composite; 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 { private static final long serialVersionUID = -5788157651532106301L; - - private CmsLogin cmsLogin; - // private String username = null; private Text username, password; - public UserMenu(CmsLogin cmsLogin, Control source) { + public UserMenu(Control source) { super(source.getDisplay(), SWT.NO_TRIM | SWT.BORDER | SWT.ON_TOP); - this.cmsLogin = cmsLogin; - setData(RWT.CUSTOM_VARIANT, CMS_USER_MENU); - String username = SecurityContextHolder.getContext() - .getAuthentication().getName(); - if (username.equals("anonymous")) { + Authentication authentication = SecurityContextHolder.getContext() + .getAuthentication(); + if (authentication == null) + throw new CmsException("No authentication available"); + + String username = authentication.getName(); + if (username.equals(KernelHeader.USERNAME_ANONYMOUS)) { username = null; anonymousUi(); } else { @@ -70,11 +70,8 @@ public class UserMenu extends Shell implements CmsStyles, CallbackHandler { close(); dispose(); } - }); - open(); - } protected void userUi() { @@ -89,8 +86,8 @@ public class UserMenu extends Shell implements CmsStyles, CallbackHandler { l.setLayoutData(CmsUtils.fillWidth()); l.setText("" + username + ""); - final CmsSession cmsSession = (CmsSession) getDisplay().getData( - CmsSession.KEY); + specificUserUi(this); + l = new Label(this, SWT.NONE); l.setData(RWT.CUSTOM_VARIANT, CMS_USER_MENU_ITEM); l.setText(CmsMsg.logout.lead()); @@ -102,46 +99,49 @@ public class UserMenu extends Shell implements CmsStyles, CallbackHandler { private static final long serialVersionUID = 6444395812777413116L; public void mouseDown(MouseEvent e) { - Subject subject = new Subject(); - try { - new ArgeoLoginContext(KernelHeader.LOGIN_CONTEXT_USER, - subject).logout(); - new ArgeoLoginContext(KernelHeader.LOGIN_CONTEXT_ANONYMOUS, - subject).login(); - } catch (LoginException e1) { - throw new ArgeoException("Cannot authenticate anonymous", - e1); - } - // SecurityContextHolder.getContext().setAuthentication(null); - // HttpSession httpSession = RWT.getRequest().getSession(); - // httpSession.removeAttribute(SPRING_SECURITY_CONTEXT_KEY); - close(); - dispose(); - cmsSession.authChange(); + logout(); } }); } + protected String getUsername() { + String username = SecurityContextHolder.getContext() + .getAuthentication().getName(); + return username; + } + + /** To be overridden */ + protected void specificUserUi(Composite parent) { + + } + protected void anonymousUi() { + setLayout(CmsUtils.noSpaceGridLayout()); + + // We need a composite for the traversal + Composite c = new Composite(this, SWT.NONE); + c.setLayout(new GridLayout()); + c.setLayoutData(CmsUtils.fillAll()); + Integer textWidth = 150; setData(RWT.CUSTOM_VARIANT, CMS_USER_MENU); - setLayout(new GridLayout(2, false)); - new Label(this, SWT.NONE).setText(CmsMsg.username.lead()); - username = new Text(this, SWT.BORDER); + // new Label(this, SWT.NONE).setText(CmsMsg.username.lead()); + username = new Text(c, SWT.BORDER); + username.setMessage(CmsMsg.username.lead()); username.setData(RWT.CUSTOM_VARIANT, CMS_LOGIN_DIALOG_USERNAME); GridData gd = CmsUtils.fillWidth(); gd.widthHint = textWidth; username.setLayoutData(gd); - new Label(this, SWT.NONE).setText(CmsMsg.password.lead()); - password = new Text(this, SWT.BORDER | SWT.PASSWORD); + // new Label(this, SWT.NONE).setText(CmsMsg.password.lead()); + password = new Text(c, SWT.BORDER | SWT.PASSWORD); + password.setMessage(CmsMsg.password.lead()); password.setData(RWT.CUSTOM_VARIANT, CMS_LOGIN_DIALOG_PASSWORD); gd = CmsUtils.fillWidth(); gd.widthHint = textWidth; password.setLayoutData(gd); - // Listeners TraverseListener tl = new TraverseListener() { private static final long serialVersionUID = -1158892811534971856L; @@ -150,29 +150,58 @@ public class UserMenu extends Shell implements CmsStyles, CallbackHandler { login(); } }; + c.addTraverseListener(tl); username.addTraverseListener(tl); password.addTraverseListener(tl); + setTabList(new Control[] { c }); + c.setTabList(new Control[] { username, password }); + c.setFocus(); } protected void login() { CmsSession cmsSession = (CmsSession) getDisplay().getData( CmsSession.KEY); - - Subject subject = new Subject(); + Subject subject = cmsSession.getSubject(); try { + // + // LOGIN + // new ArgeoLoginContext(KernelHeader.LOGIN_CONTEXT_ANONYMOUS, subject) .logout(); LoginContext loginContext = new ArgeoLoginContext( KernelHeader.LOGIN_CONTEXT_USER, subject, this); loginContext.login(); } catch (LoginException e1) { - throw new ArgeoException("Cannot authenticate anonymous", e1); + try { + new ArgeoLoginContext(KernelHeader.LOGIN_CONTEXT_ANONYMOUS, + subject).login(); + } catch (LoginException e) { + throw new CmsException("Cannot authenticate anonymous", e1); + } + throw new CmsException("Cannot authenticate", e1); } + close(); + dispose(); + cmsSession.authChange(); + } - // cmsLogin.logInWithPassword(username, password); + protected void logout() { + final CmsSession cmsSession = (CmsSession) getDisplay().getData( + CmsSession.KEY); + Subject subject = cmsSession.getSubject(); + try { + // + // LOGOUT + // + new ArgeoLoginContext(KernelHeader.LOGIN_CONTEXT_USER, subject) + .logout(); + new ArgeoLoginContext(KernelHeader.LOGIN_CONTEXT_ANONYMOUS, subject) + .login(); + } catch (LoginException e1) { + throw new CmsException("Cannot authenticate anonymous", e1); + } close(); dispose(); - // refreshUi(source.getParent()); cmsSession.authChange(); } @@ -181,12 +210,6 @@ public class UserMenu extends Shell implements CmsStyles, CallbackHandler { UnsupportedCallbackException { ((NameCallback) callbacks[0]).setName(username.getText()); ((PasswordCallback) callbacks[1]).setPassword(password.getTextChars()); - // while (!isDisposed()) - // try { - // Thread.sleep(500); - // } catch (InterruptedException e) { - // // silent - // } } }