import java.util.Locale;
-import javax.security.auth.Subject;
-import javax.security.auth.login.CredentialNotFoundException;
import javax.security.auth.login.LoginContext;
import javax.security.auth.login.LoginException;
import javax.servlet.http.HttpServletRequest;
import org.argeo.cms.CmsException;
-import org.argeo.cms.auth.AuthConstants;
import org.argeo.cms.auth.CurrentUser;
-import org.argeo.cms.auth.HttpRequestCallbackHandler;
import org.argeo.cms.ui.CmsImageManager;
import org.argeo.cms.ui.CmsView;
import org.argeo.cms.ui.UxContext;
import org.argeo.cms.widgets.auth.CmsLogin;
import org.argeo.cms.widgets.auth.CmsLoginShell;
import org.argeo.eclipse.ui.specific.UiContext;
-import org.argeo.node.NodeAuthenticated;
+import org.argeo.node.NodeConstants;
+import org.argeo.node.security.NodeAuthenticated;
import org.eclipse.rap.rwt.RWT;
import org.eclipse.rap.rwt.application.EntryPoint;
import org.eclipse.swt.events.SelectionListener;
public class LoginEntryPoint implements EntryPoint, CmsView {
// private final static Log log = LogFactory.getLog(WorkbenchLogin.class);
- private final Subject subject = new Subject();
+ // private final Subject subject = new Subject();
private LoginContext loginContext;
private UxContext uxContext = null;
public int createUI() {
final Display display = createDisplay();
UiContext.setData(NodeAuthenticated.KEY, this);
+ CmsLoginShell loginShell = createCmsLoginShell();
try {
// try pre-auth
- loginContext = new LoginContext(AuthConstants.LOGIN_CONTEXT_USER,
- subject, new HttpRequestCallbackHandler(getRequest()));
+ loginContext = new LoginContext(NodeConstants.LOGIN_CONTEXT_USER, loginShell);
loginContext.login();
- } catch (CredentialNotFoundException e) {
- CmsLoginShell loginShell = createCmsLoginShell();
+ } catch (LoginException e) {
+ loginShell.createUi();
loginShell.open();
while (!loginShell.getShell().isDisposed()) {
- // try {
if (!display.readAndDispatch())
display.sleep();
- // } catch (Exception e1) {
- // try {
- // Thread.sleep(3000);
- // } catch (InterruptedException e2) {
- // // silent
- // }
- // ErrorFeedback.show("Login failed", e1);
- // return -1;
- // }
}
- } catch (LoginException e) {
- throw new CmsException("Cannot log in", e);
}
if (CurrentUser.getUsername() == null)
}
@Override
- protected void extendsCredentialsBlock(Composite credentialsBlock,
- Locale selectedLocale,
+ protected void extendsCredentialsBlock(Composite credentialsBlock, Locale selectedLocale,
SelectionListener loginSelectionListener) {
- LoginEntryPoint.this.extendsCredentialsBlock(credentialsBlock,
- selectedLocale, loginSelectionListener);
+ LoginEntryPoint.this.extendsCredentialsBlock(credentialsBlock, selectedLocale, loginSelectionListener);
}
};
login.defaultCreateContents(parent);
}
- protected void extendsCredentialsBlock(Composite credentialsBlock,
- Locale selectedLocale, SelectionListener loginSelectionListener) {
+ protected void extendsCredentialsBlock(Composite credentialsBlock, Locale selectedLocale,
+ SelectionListener loginSelectionListener) {
}
}
}
- @Override
- public final Subject getSubject() {
- return subject;
- }
-
@Override
public void exception(Throwable e) {
// TODO Auto-generated method stub
}
+ @Override
+ public LoginContext getLoginContext() {
+ return loginContext;
+ }
+
@Override
public CmsImageManager getImageManager() {
// TODO Auto-generated method stub
public UxContext getUxContext() {
return uxContext;
}
-
-}
+}
\ No newline at end of file