X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui%2Fsrc%2Forg%2Fargeo%2Fcms%2Fwidgets%2Fauth%2FCmsLogin.java;h=4af348059fa30fe528a676eda78336f8090aa866;hb=5330a39edafd14df2e6cdc57aae4e9393ebca75c;hp=76263c1f2a5d514c3c5533008802679a71802f3a;hpb=a9731453273884138ca48036fe6fe49da729c49b;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.ui/src/org/argeo/cms/widgets/auth/CmsLogin.java b/org.argeo.cms.ui/src/org/argeo/cms/widgets/auth/CmsLogin.java
index 76263c1f2..4af348059 100644
--- a/org.argeo.cms.ui/src/org/argeo/cms/widgets/auth/CmsLogin.java
+++ b/org.argeo.cms.ui/src/org/argeo/cms/widgets/auth/CmsLogin.java
@@ -13,14 +13,12 @@ import javax.security.auth.callback.LanguageCallback;
 import javax.security.auth.callback.NameCallback;
 import javax.security.auth.callback.PasswordCallback;
 import javax.security.auth.callback.UnsupportedCallbackException;
-import javax.security.auth.login.FailedLoginException;
 import javax.security.auth.login.LoginContext;
 import javax.security.auth.login.LoginException;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.cms.CmsMsg;
-import org.argeo.cms.auth.CurrentUser;
 import org.argeo.cms.auth.HttpRequestCallback;
 import org.argeo.cms.i18n.LocaleUtils;
 import org.argeo.cms.ui.CmsStyles;
@@ -80,7 +78,7 @@ public class CmsLogin implements CmsStyles, CallbackHandler {
 	}
 
 	protected boolean isAnonymous() {
-		return CurrentUser.isAnonymous(cmsView.getLoginContext().getSubject());
+		return cmsView.isAnonymous();
 	}
 
 	public final void createUi(Composite parent) {
@@ -247,14 +245,16 @@ public class CmsLogin implements CmsStyles, CallbackHandler {
 
 	protected boolean login() {
 		// Subject subject = cmsView.getLoginContext().getSubject();
-		LoginContext loginContext = cmsView.getLoginContext();
+		// LoginContext loginContext = cmsView.getLoginContext();
 		try {
 			//
 			// LOGIN
 			//
-			loginContext.logout();
-			loginContext = new LoginContext(NodeConstants.LOGIN_CONTEXT_USER, this);
+			// loginContext.logout();
+			LoginContext loginContext = new LoginContext(NodeConstants.LOGIN_CONTEXT_USER, this);
 			loginContext.login();
+			cmsView.authChange(loginContext);
+			return true;
 		} catch (LoginException e) {
 			if (log.isTraceEnabled())
 				log.warn("Login failed: " + e.getMessage(), e);
@@ -273,8 +273,6 @@ public class CmsLogin implements CmsStyles, CallbackHandler {
 		// log.error("Cannot login", e);
 		// return false;
 		// }
-		cmsView.authChange(loginContext);
-		return true;
 	}
 
 	protected void logout() {