X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fauth%2FCmsAuthUtils.java;h=6abaf71f262ac676d33efb5eff0968039c9378c1;hb=0bd819f841b28c7eb869362e67cf424a9e99f862;hp=9e00ed458ac0011480f034589e3297b8e89eb7c5;hpb=4e548693acc16f97b74eaaa95d6841054a172b85;p=lgpl%2Fargeo-commons.git 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 9e00ed458..6abaf71f2 100644 --- a/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java +++ b/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java @@ -24,7 +24,7 @@ import org.argeo.api.cms.CmsSessionId; import org.argeo.api.cms.DataAdminPrincipal; import org.argeo.cms.internal.auth.CmsSessionImpl; import org.argeo.cms.internal.auth.ImpliedByPrincipal; -import org.argeo.cms.internal.http.WebCmsSessionImpl; +import org.argeo.cms.internal.auth.RemoteCmsSessionImpl; import org.argeo.cms.internal.runtime.CmsContextImpl; import org.argeo.osgi.useradmin.AuthenticatingUser; import org.osgi.service.useradmin.Authorization; @@ -34,8 +34,8 @@ class CmsAuthUtils { // Standard final static String SHARED_STATE_NAME = AuthenticatingUser.SHARED_STATE_NAME; final static String SHARED_STATE_PWD = AuthenticatingUser.SHARED_STATE_PWD; - final static String HEADER_AUTHORIZATION = "Authorization"; - final static String HEADER_WWW_AUTHENTICATE = "WWW-Authenticate"; +// final static String HEADER_AUTHORIZATION = "Authorization"; +// final static String HEADER_WWW_AUTHENTICATE = "WWW-Authenticate"; // Argeo specific final static String SHARED_STATE_HTTP_REQUEST = "org.argeo.cms.auth.http.request"; @@ -151,7 +151,7 @@ class CmsAuthUtils { currentLocalSession.close(); // new CMS session UUID cmsSessionUuid = CmsContextImpl.getCmsContext().getUuidFactory().timeUUID(); - cmsSession = new WebCmsSessionImpl(cmsSessionUuid, subject, authorization, locale, request); + cmsSession = new RemoteCmsSessionImpl(cmsSessionUuid, subject, authorization, locale, request); CmsContextImpl.getCmsContext().registerCmsSession(cmsSession); } else if (!authorization.getName().equals(currentLocalSession.getAuthorization().getName())) { throw new IllegalStateException("Inconsistent user " + authorization.getName() @@ -176,7 +176,7 @@ class CmsAuthUtils { } else { // new CMS session UUID cmsSessionUuid = CmsContextImpl.getCmsContext().getUuidFactory().timeUUID(); - cmsSession = new WebCmsSessionImpl(cmsSessionUuid, subject, authorization, locale, request); + cmsSession = new RemoteCmsSessionImpl(cmsSessionUuid, subject, authorization, locale, request); CmsContextImpl.getCmsContext().registerCmsSession(cmsSession); }