Internationalize login

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / util / UserMenu.java

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 e44cada498ea99d09c64047ced0e1c9f3c9fbf05..73567886b0f7986575f58f9c7626b68247a3233f 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/util/UserMenu.java
+++ b/org.argeo.cms/src/org/argeo/cms/util/UserMenu.java
@@ -11,7 +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.CmsException;
 import org.argeo.cms.CmsMsg;
 import org.argeo.cms.CmsSession;
 import org.argeo.cms.CmsStyles;
@@ -32,6 +32,7 @@ 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 */
@@ -43,9 +44,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);
 
-               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 {
@@ -111,19 +116,27 @@ public class UserMenu extends Shell implements CmsStyles, CallbackHandler {
        }
 
        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;
@@ -137,8 +150,12 @@ 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() {
@@ -155,7 +172,13 @@ public class UserMenu extends Shell implements CmsStyles, CallbackHandler {
                                        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();
@@ -175,7 +198,7 @@ public class UserMenu extends Shell implements CmsStyles, CallbackHandler {
                        new ArgeoLoginContext(KernelHeader.LOGIN_CONTEXT_ANONYMOUS, subject)
                                        .login();
                } catch (LoginException e1) {
-                       throw new ArgeoException("Cannot authenticate anonymous", e1);
+                       throw new CmsException("Cannot authenticate anonymous", e1);
                }
                close();
                dispose();