X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fauth%2FCmsAuthUtils.java;h=1efb93afdd36b9ad1432f4976d4351c48dfa2277;hb=ddc70245fe7413b7341205914c91015600726b4a;hp=4998c89ff818fea5beb1877f583ebf87b6c9f4a9;hpb=85015a7cbfe5343c88477d828fa2f8fb754a65cd;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 4998c89ff..1efb93afd 100644 --- a/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java +++ b/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java @@ -141,7 +141,9 @@ class CmsAuthUtils { if (currentLocalSessionAnonymous) { currentLocalSession.close(); // new CMS session - cmsSession = new WebCmsSessionImpl(subject, authorization, locale, request); + UUID cmsSessionUuid = CmsContextImpl.getCmsContext().getUuidFactory().timeUUID(); + cmsSession = new WebCmsSessionImpl(cmsSessionUuid, subject, authorization, locale, request); + CmsContextImpl.getCmsContext().registerCmsSession(cmsSession); } else if (!authorization.getName().equals(currentLocalSession.getAuthorization().getName())) { throw new IllegalStateException("Inconsistent user " + authorization.getName() + " for existing CMS session " + currentLocalSession); @@ -162,7 +164,8 @@ class CmsAuthUtils { } } else { // new CMS session - cmsSession = new WebCmsSessionImpl(subject, authorization, locale, request); + UUID cmsSessionUuid = CmsContextImpl.getCmsContext().getUuidFactory().timeUUID(); + cmsSession = new WebCmsSessionImpl(cmsSessionUuid, subject, authorization, locale, request); CmsContextImpl.getCmsContext().registerCmsSession(cmsSession); } @@ -181,7 +184,8 @@ class CmsAuthUtils { } else { CmsSessionImpl cmsSession = CmsContextImpl.getCmsContext().getCmsSessionByLocalId(SINGLE_USER_LOCAL_ID); if (cmsSession == null) { - cmsSession = new CmsSessionImpl(subject, authorization, locale, SINGLE_USER_LOCAL_ID); + UUID cmsSessionUuid = CmsContextImpl.getCmsContext().getUuidFactory().timeUUID(); + cmsSession = new CmsSessionImpl(cmsSessionUuid, subject, authorization, locale, SINGLE_USER_LOCAL_ID); CmsContextImpl.getCmsContext().registerCmsSession(cmsSession); } CmsSessionId nodeSessionId = new CmsSessionId(cmsSession.getUuid());