Split CMS and CMS UI

[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 8aa08728b79846eace2b4e970c6223de4ef5fa34..1ec52f057523cbe9aacade8a5ca55e1362acf390 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/auth/CurrentUser.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/CurrentUser.java
@@ -26,7 +26,7 @@ import javax.security.auth.x500.X500Principal;
 
 import org.argeo.cms.CmsException;
 import org.argeo.cms.CmsView;
-import org.argeo.cms.util.CmsUtils;
+import org.argeo.eclipse.ui.specific.UiContext;
 import org.osgi.service.useradmin.Authorization;
 
 /** Static utilities */
@@ -49,12 +49,11 @@ public final class CurrentUser {
 
        public static boolean isAnonymous(Subject subject) {
                String username = getUsername(subject);
-               return username == null
-                               || username.equalsIgnoreCase(AuthConstants.ROLE_ANONYMOUS);
+               return username == null || username.equalsIgnoreCase(AuthConstants.ROLE_ANONYMOUS);
        }
 
        private static Subject currentSubject() {
-               CmsView cmsView = CmsUtils.getCmsView();
+               CmsView cmsView = getCmsView();
                if (cmsView != null)
                        return cmsView.getSubject();
                Subject subject = Subject.getSubject(AccessController.getContext());
@@ -63,14 +62,21 @@ public final class CurrentUser {
                throw new CmsException("Cannot find related subject");
        }
 
+       /**
+        * The CMS view related to this display, or null if none is available from
+        * this call.
+        */
+       private static CmsView getCmsView() {
+               return UiContext.getData(CmsView.KEY);
+       }
+
        public final static String getUsername(Subject subject) {
                // Subject subject = Subject.getSubject(AccessController.getContext());
                // if (subject == null)
                // return null;
                if (subject.getPrincipals(X500Principal.class).size() != 1)
                        return null;
-               Principal principal = subject.getPrincipals(X500Principal.class)
-                               .iterator().next();
+               Principal principal = subject.getPrincipals(X500Principal.class).iterator().next();
                return principal.getName();
 
        }
@@ -80,8 +86,7 @@ public final class CurrentUser {
        }
 
        private static Authorization getAuthorization(Subject subject) {
-               return subject.getPrivateCredentials(Authorization.class).iterator()
-                               .next();
+               return subject.getPrivateCredentials(Authorization.class).iterator().next();
        }
 
        public final static Set<String> roles() {
@@ -90,8 +95,7 @@ public final class CurrentUser {
 
        public final static Set<String> roles(Subject subject) {
                Set<String> roles = new HashSet<String>();
-               X500Principal userPrincipal = subject
-                               .getPrincipals(X500Principal.class).iterator().next();
+               X500Principal userPrincipal = subject.getPrincipals(X500Principal.class).iterator().next();
                roles.add(userPrincipal.getName());
                for (Principal group : subject.getPrincipals(Group.class)) {
                        roles.add(group.getName());