Remove dependency between 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 2f6325d279ccf687f82370771c8b5237746e3e19..450abd3cf6fd1ab736185593a413a90e5cd301ce 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/auth/CurrentUser.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/CurrentUser.java
@@ -32,7 +32,6 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.cms.CmsException;
 import org.argeo.cms.internal.auth.CmsSessionImpl;
-import org.argeo.eclipse.ui.specific.UiContext;
 import org.argeo.node.NodeConstants;
 import org.osgi.service.useradmin.Authorization;
 
@@ -42,7 +41,8 @@ import org.osgi.service.useradmin.Authorization;
  */
 public final class CurrentUser {
        private final static Log log = LogFactory.getLog(CurrentUser.class);
-//     private final static BundleContext bc = FrameworkUtil.getBundle(CurrentUser.class).getBundleContext();
+       // private final static BundleContext bc =
+       // FrameworkUtil.getBundle(CurrentUser.class).getBundleContext();
        /*
         * CURRENT USER API
         */
@@ -124,28 +124,42 @@ public final class CurrentUser {
                String username = getUsername(subject);
                return username == null || username.equalsIgnoreCase(NodeConstants.ROLE_ANONYMOUS);
        }
+
+       public CmsSession getCmsSession() {
+               Subject subject = currentSubject();
+               CmsSessionId cmsSessionId = subject.getPrivateCredentials(CmsSessionId.class).iterator().next();
+               return CmsSessionImpl.getByUuid(cmsSessionId.getUuid());
+       }
+
        /*
         * HELPERS
         */
-
        private static Subject currentSubject() {
-               CmsAuthenticated cmsView = getNodeAuthenticated();
-               if (cmsView != null)
-                       return cmsView.getSubject();
-               Subject subject = Subject.getSubject(AccessController.getContext());
+               // CmsAuthenticated cmsView = getNodeAuthenticated();
+               // if (cmsView != null)
+               // return cmsView.getSubject();
+               Subject subject = getAccessControllerSubject();
                if (subject != null)
                        return subject;
                throw new CmsException("Cannot find related subject");
        }
 
+       private static Subject getAccessControllerSubject() {
+               return Subject.getSubject(AccessController.getContext());
+       }
+
+       // public static boolean isAuthenticated() {
+       // return getAccessControllerSubject() != null;
+       // }
+
        /**
         * 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>
         */
-       private static CmsAuthenticated getNodeAuthenticated() {
-               return UiContext.getData(CmsAuthenticated.KEY);
-       }
+       // private static CmsAuthenticated getNodeAuthenticated() {
+       // return UiContext.getData(CmsAuthenticated.KEY);
+       // }
 
        private static Authorization getAuthorization(Subject subject) {
                return subject.getPrivateCredentials(Authorization.class).iterator().next();
@@ -157,30 +171,8 @@ public final class CurrentUser {
                        nodeSessionId = subject.getPrivateCredentials(CmsSessionId.class).iterator().next().getUuid();
                else
                        return false;
-               CmsSessionImpl cmsSession = (CmsSessionImpl) CmsSessionImpl.getByUuid(nodeSessionId.toString());
+               CmsSessionImpl cmsSession = CmsSessionImpl.getByUuid(nodeSessionId.toString());
                cmsSession.close();
-               // Collection<ServiceReference<CmsSession>> srs;
-               // try {
-               // srs = bc.getServiceReferences(CmsSession.class, "(" +
-               // CmsSession.SESSION_UUID + "=" + nodeSessionId + ")");
-               // } catch (InvalidSyntaxException e) {
-               // throw new CmsException("Cannot retrieve CMS session #" +
-               // nodeSessionId, e);
-               // }
-               //
-               // if (srs.size() == 0) {
-               // // if (log.isTraceEnabled())
-               // // log.warn("No CMS web session found for http session " +
-               // // nodeSessionId);
-               // return false;
-               // } else if (srs.size() > 1)
-               // throw new CmsException(srs.size() + " CMS web sessions found for http
-               // session " + nodeSessionId);
-               //
-               // WebCmsSessionImpl cmsSession = (WebCmsSessionImpl)
-               // bc.getService(srs.iterator().next());
-//             cmsSession.cleanUp();
-               // subject.getPrivateCredentials().removeAll(subject.getPrivateCredentials(CmsSessionId.class));
                if (log.isDebugEnabled())
                        log.debug("Logged out CMS session " + cmsSession.getUuid());
                return true;