X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Futil%2FUserMenu.java;h=a654dddd4054f7aa27b318352afe65d892a0ec29;hb=6ed2ce8f490e2fc020e67f530f8c08e250b7b6dd;hp=3fef6792b610a4c48a0f66fd518ba2c73fbd6454;hpb=ff718212e89b0ea05087aabe147859efedf186f9;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 3fef6792b..a654dddd4 100644
--- a/org.argeo.cms/src/org/argeo/cms/util/UserMenu.java
+++ b/org.argeo.cms/src/org/argeo/cms/util/UserMenu.java
@@ -1,237 +1,48 @@
package org.argeo.cms.util;
-import static org.argeo.cms.KernelHeader.ACCESS_CONTROL_CONTEXT;
-import static org.argeo.cms.KernelHeader.LOGIN_CONTEXT_ANONYMOUS;
-import static org.argeo.cms.KernelHeader.LOGIN_CONTEXT_USER;
-
-import java.io.IOException;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-import javax.security.auth.Subject;
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.NameCallback;
-import javax.security.auth.callback.PasswordCallback;
-import javax.security.auth.callback.UnsupportedCallbackException;
-import javax.security.auth.login.LoginContext;
-import javax.security.auth.login.LoginException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
import org.argeo.cms.CmsException;
-import org.argeo.cms.CmsMsg;
-import org.argeo.cms.CmsSession;
-import org.argeo.cms.CmsStyles;
-import org.argeo.cms.KernelHeader;
-import org.argeo.cms.auth.ArgeoLoginContext;
-import org.eclipse.rap.rwt.RWT;
+import org.argeo.cms.widgets.auth.CmsLoginShell;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
import org.eclipse.swt.events.ShellAdapter;
import org.eclipse.swt.events.ShellEvent;
-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.Display;
import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
/** The site-related user menu */
-public class UserMenu extends Shell implements CmsStyles, CallbackHandler {
- private static final long serialVersionUID = -5788157651532106301L;
- private Text username, password;
+public class UserMenu extends CmsLoginShell {
+ private final Control source;
public UserMenu(Control source) {
- 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");
-
- String username = CurrentUserUtils.getUsername();
- if (username.equalsIgnoreCase(KernelHeader.ROLE_ANONYMOUS)) {
- username = null;
- anonymousUi();
- } else {
- userUi();
- }
+ super(CmsUtils.getCmsView());
+ if (source == null)
+ throw new CmsException("Source control cannot be null.");
+ this.source = source;
+ open();
+ }
- pack();
- layout();
- setLocation(source.toDisplay(source.getSize().x - getSize().x,
- source.getSize().y));
+ @Override
+ protected Shell createShell() {
+ return new Shell(Display.getCurrent(), SWT.NO_TRIM | SWT.BORDER
+ | SWT.ON_TOP);
+ }
- addShellListener(new ShellAdapter() {
+ @Override
+ public void open() {
+ Shell shell = getShell();
+ shell.pack();
+ shell.layout();
+ shell.setLocation(source.toDisplay(source.getSize().x
+ - shell.getSize().x, source.getSize().y));
+ shell.addShellListener(new ShellAdapter() {
private static final long serialVersionUID = 5178980294808435833L;
@Override
public void shellDeactivated(ShellEvent e) {
- close();
- dispose();
- }
- });
- open();
- }
-
- protected void userUi() {
- setLayout(CmsUtils.noSpaceGridLayout());
- Composite c = new Composite(this, SWT.NONE);
- c.setLayout(new GridLayout());
- c.setLayoutData(CmsUtils.fillAll());
-
- // String username = SecurityContextHolder.getContext()
- // .getAuthentication().getName();
- //
- // Label l = new Label(c, SWT.NONE);
- // l.setData(RWT.CUSTOM_VARIANT, CMS_USER_MENU_ITEM);
- // l.setData(RWT.MARKUP_ENABLED, true);
- // l.setLayoutData(CmsUtils.fillWidth());
- // l.setText("" + username + "");
-
- specificUserUi(c);
-
- Label l = new Label(c, SWT.NONE);
- l.setData(RWT.CUSTOM_VARIANT, CMS_USER_MENU_ITEM);
- l.setText(CmsMsg.logout.lead());
- GridData lData = CmsUtils.fillWidth();
- lData.widthHint = 120;
- l.setLayoutData(lData);
-
- l.addMouseListener(new MouseAdapter() {
- private static final long serialVersionUID = 6444395812777413116L;
-
- public void mouseDown(MouseEvent e) {
- logout();
+ closeShell();
}
});
- }
-
- // protected String getUsername() {
- // // String username = SecurityContextHolder.getContext()
- // // .getAuthentication().getName();
- // return CurrentUserUtils.getUsername();
- // }
-
- /** 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 = 120;
- setData(RWT.CUSTOM_VARIANT, CMS_USER_MENU);
-
- // 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(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);
-
- TraverseListener tl = new TraverseListener() {
- private static final long serialVersionUID = -1158892811534971856L;
-
- public void keyTraversed(TraverseEvent e) {
- if (e.detail == SWT.TRAVERSE_RETURN)
- 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 = cmsSession.getSubject();
- try {
- //
- // LOGIN
- //
- new ArgeoLoginContext(LOGIN_CONTEXT_ANONYMOUS, subject).logout();
- LoginContext loginContext = new ArgeoLoginContext(
- LOGIN_CONTEXT_USER, subject, this);
- loginContext.login();
-
- // save context in session
- final HttpSession httpSession = RWT.getRequest().getSession();
- Subject.doAs(subject, new PrivilegedAction() {
-
- @Override
- public Void run() {
- httpSession.setAttribute(ACCESS_CONTROL_CONTEXT,
- AccessController.getContext());
- return null;
- }
- });
- } catch (LoginException e1) {
- try {
- new ArgeoLoginContext(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();
- }
-
- protected void logout() {
- final CmsSession cmsSession = (CmsSession) getDisplay().getData(
- CmsSession.KEY);
- Subject subject = cmsSession.getSubject();
- try {
- //
- // LOGOUT
- //
- new ArgeoLoginContext(LOGIN_CONTEXT_USER, subject).logout();
- new ArgeoLoginContext(LOGIN_CONTEXT_ANONYMOUS, subject).login();
-
- HttpServletRequest httpRequest = RWT.getRequest();
- HttpSession httpSession = httpRequest.getSession();
- httpSession.setAttribute(ACCESS_CONTROL_CONTEXT, null);
- } catch (LoginException e1) {
- throw new CmsException("Cannot authenticate anonymous", e1);
- }
- close();
- dispose();
- cmsSession.navigateTo("~");
- cmsSession.authChange();
- }
-
- @Override
- public void handle(Callback[] callbacks) throws IOException,
- UnsupportedCallbackException {
- ((NameCallback) callbacks[0]).setName(username.getText());
- ((PasswordCallback) callbacks[1]).setPassword(password.getTextChars());
+ super.open();
}
}