Rename packages in order to make future stable documentation clearer.

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / auth / CurrentUser.java

diff --git a/org.argeo.cms/src/org/argeo/cms/auth/CurrentUser.java b/org.argeo.cms/src/org/argeo/cms/auth/CurrentUser.java
index 450abd3cf6fd1ab736185593a413a90e5cd301ce..e1425015c1838965df660d6d982238bdacb65ea6 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/auth/CurrentUser.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/CurrentUser.java
@@ -20,19 +20,19 @@ import java.security.Principal;
 import java.security.PrivilegedAction;
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
-import java.security.acl.Group;
 import java.util.HashSet;
+import java.util.Locale;
 import java.util.Set;
 import java.util.UUID;
 
 import javax.security.auth.Subject;
 import javax.security.auth.x500.X500Principal;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.NodeConstants;
 import org.argeo.cms.CmsException;
 import org.argeo.cms.internal.auth.CmsSessionImpl;
-import org.argeo.node.NodeConstants;
+import org.argeo.cms.internal.auth.ImpliedByPrincipal;
+import org.argeo.cms.internal.kernel.Activator;
 import org.osgi.service.useradmin.Authorization;
 
 /**
@@ -40,7 +40,7 @@ import org.osgi.service.useradmin.Authorization;
  * context.
  */
 public final class CurrentUser {
-       private final static Log log = LogFactory.getLog(CurrentUser.class);
+       // private final static Log log = LogFactory.getLog(CurrentUser.class);
        // private final static BundleContext bc =
        // FrameworkUtil.getBundle(CurrentUser.class).getBundleContext();
        /*
@@ -50,16 +50,15 @@ public final class CurrentUser {
        /**
         * Technical username of the currently authenticated user.
         * 
-        * @return the authenticated username or null if not authenticated /
-        *         anonymous
+        * @return the authenticated username or null if not authenticated / anonymous
         */
        public static String getUsername() {
                return getUsername(currentSubject());
        }
 
        /**
-        * Human readable name of the currently authenticated user (typically first
-        * name and last name).
+        * Human readable name of the currently authenticated user (typically first name
+        * and last name).
         */
        public static String getDisplayName() {
                return getDisplayName(currentSubject());
@@ -70,6 +69,11 @@ public final class CurrentUser {
                return isAnonymous(currentSubject());
        }
 
+       /** Locale of the current user */
+       public final static Locale locale() {
+               return locale(currentSubject());
+       }
+
        /** Roles of the currently logged-in user */
        public final static Set<String> roles() {
                return roles(currentSubject());
@@ -111,12 +115,21 @@ public final class CurrentUser {
        public final static Set<String> roles(Subject subject) {
                Set<String> roles = new HashSet<String>();
                roles.add(getUsername(subject));
-               for (Principal group : subject.getPrincipals(Group.class)) {
+               for (Principal group : subject.getPrincipals(ImpliedByPrincipal.class)) {
                        roles.add(group.getName());
                }
                return roles;
        }
 
+       public final static Locale locale(Subject subject) {
+               Set<Locale> locales = subject.getPublicCredentials(Locale.class);
+               if (locales.isEmpty()) {
+                       Locale defaultLocale = Activator.getNodeState().getDefaultLocale();
+                       return defaultLocale;
+               } else
+                       return locales.iterator().next();
+       }
+
        /** Whether this user is currently authenticated. */
        public static boolean isAnonymous(Subject subject) {
                if (subject == null)
@@ -154,8 +167,8 @@ public final class CurrentUser {
 
        /**
         * The node authenticated component (typically a CMS view) related to this
-        * display, or null if none is available from this call. <b>Not API: Only
-        * for low-level access.</b>
+        * display, or null if none is available from this call. <b>Not API: Only for
+        * low-level access.</b>
         */
        // private static CmsAuthenticated getNodeAuthenticated() {
        // return UiContext.getData(CmsAuthenticated.KEY);
@@ -173,8 +186,8 @@ public final class CurrentUser {
                        return false;
                CmsSessionImpl cmsSession = CmsSessionImpl.getByUuid(nodeSessionId.toString());
                cmsSession.close();
-               if (log.isDebugEnabled())
-                       log.debug("Logged out CMS session " + cmsSession.getUuid());
+               // if (log.isDebugEnabled())
+               // log.debug("Logged out CMS session " + cmsSession.getUuid());
                return true;
        }