Introduce CMS E4

[lgpl/argeo-commons.git] / org.argeo.cms.ui / src / org / argeo / cms / widgets / auth / CmsLogin.java

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 f25ad19e2398b3cc5d900cd6b03b04814b07cfe5..e450bfa075040bb0f30926dfb1cd6225faa42711 100644 (file)
--- 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
@@ -7,6 +7,7 @@ import java.io.IOException;
 import java.util.List;
 import java.util.Locale;
 
+import javax.security.auth.Subject;
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.callback.LanguageCallback;
@@ -19,7 +20,6 @@ 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;
@@ -58,6 +58,9 @@ public class CmsLogin implements CmsStyles, CallbackHandler {
 
        private final CmsView cmsView;
 
+       // optional subject to be set explicitly
+       private Subject subject = null;
+
        public CmsLogin(CmsView cmsView) {
                this.cmsView = cmsView;
                defaultLocale = Activator.getNodeState().getDefaultLocale();
@@ -79,7 +82,7 @@ public class CmsLogin implements CmsStyles, CallbackHandler {
        }
 
        protected boolean isAnonymous() {
-               return CurrentUser.isAnonymous(cmsView.getSubject());
+               return cmsView.isAnonymous();
        }
 
        public final void createUi(Composite parent) {
@@ -150,7 +153,6 @@ public class CmsLogin implements CmsStyles, CallbackHandler {
 
                Integer textWidth = 120;
                CmsUtils.style(parent, CMS_USER_MENU);
-
                // new Label(this, SWT.NONE).setText(CmsMsg.username.lead());
                usernameT = new Text(credentialsBlock, SWT.BORDER);
                usernameT.setMessage(username.lead(locale));
@@ -189,8 +191,7 @@ public class CmsLogin implements CmsStyles, CallbackHandler {
        }
 
        /**
-        * To be overridden in order to provide custome login button and other
-        * links.
+        * To be overridden in order to provide custom login button and other links.
         */
        protected void extendsCredentialsBlock(Composite credentialsBlock, Locale selectedLocale,
                        SelectionListener loginSelectionListener) {
@@ -245,14 +246,15 @@ public class CmsLogin implements CmsStyles, CallbackHandler {
        }
 
        protected boolean login() {
+               // TODO use CmsVie in order to retrieve subject?
                // Subject subject = cmsView.getLoginContext().getSubject();
-//             LoginContext loginContext = cmsView.getLoginContext();
+               // LoginContext loginContext = cmsView.getLoginContext();
                try {
                        //
                        // LOGIN
                        //
-//                     loginContext.logout();
-                       LoginContext loginContext = new LoginContext(NodeConstants.LOGIN_CONTEXT_USER, this);
+                       // loginContext.logout();
+                       LoginContext loginContext = new LoginContext(NodeConstants.LOGIN_CONTEXT_USER, subject, this);
                        loginContext.login();
                        cmsView.authChange(loginContext);
                        return true;
@@ -291,9 +293,24 @@ public class CmsLogin implements CmsStyles, CallbackHandler {
                        else if (callback instanceof HttpRequestCallback) {
                                ((HttpRequestCallback) callback).setRequest(UiContext.getHttpRequest());
                                ((HttpRequestCallback) callback).setResponse(UiContext.getHttpResponse());
-                       } else if (callback instanceof LanguageCallback && localeChoice != null)
-                               ((LanguageCallback) callback).setLocale(localeChoice.getSelectedLocale());
+                       } else if (callback instanceof LanguageCallback) {
+                               Locale toUse = null;
+                               if (localeChoice != null)
+                                       toUse = localeChoice.getSelectedLocale();
+                               else if (defaultLocale != null)
+                                       toUse = defaultLocale;
+
+                               if (toUse != null) {
+                                       ((LanguageCallback) callback).setLocale(toUse);
+                                       UiContext.setLocale(toUse);
+                               }
+
+                       }
                }
        }
 
+       public void setSubject(Subject subject) {
+               this.subject = subject;
+       }
+
 }