Major refactoring of Argeo CMS UI

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

diff --git a/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java b/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java
index 4c09650d4b0546bdc5c6220a23f23de99903cf95..e854f5adfcd213bfbf31e2de2f97f3c44247727c 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java
@@ -14,6 +14,8 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
 import org.argeo.api.NodeConstants;
+import org.argeo.api.cms.CmsSession;
+import org.argeo.api.cms.CmsSessionId;
 import org.argeo.api.security.AnonymousPrincipal;
 import org.argeo.api.security.DataAdminPrincipal;
 import org.argeo.api.security.NodeSecurityUtils;
@@ -186,7 +188,7 @@ class CmsAuthUtils {
                }
        }
 
-       public static CmsSession cmsSessionFromHttpSession(BundleContext bc, String httpSessionId) {
+       public static CmsSessionImpl cmsSessionFromHttpSession(BundleContext bc, String httpSessionId) {
                Authorization authorization = null;
                Collection<ServiceReference<CmsSession>> sr;
                try {
@@ -195,9 +197,9 @@ class CmsAuthUtils {
                } catch (InvalidSyntaxException e) {
                        throw new IllegalArgumentException("Cannot get CMS session for id " + httpSessionId, e);
                }
-               CmsSession cmsSession;
+               CmsSessionImpl cmsSession;
                if (sr.size() == 1) {
-                       cmsSession = bc.getService(sr.iterator().next());
+                       cmsSession = (CmsSessionImpl) bc.getService(sr.iterator().next());
 //                     locale = cmsSession.getLocale();
                        authorization = cmsSession.getAuthorization();
                        if (authorization.getName() == null)