X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Facr%2FCmsContentRepository.java;h=2b4de14da254ba933ab409f01dc9464cf3e7a503;hb=54df376a9c2dd458a82eaa09bfbb718fe699dd0d;hp=3e01aee8b235ff9d1d0a94d30174d1afa6d6e6f4;hpb=4c7e1885b8bf3c93fa0919ace122e3f289a925ea;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/acr/CmsContentRepository.java b/org.argeo.cms/src/org/argeo/cms/acr/CmsContentRepository.java
index 3e01aee8b..2b4de14da 100644
--- a/org.argeo.cms/src/org/argeo/cms/acr/CmsContentRepository.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/CmsContentRepository.java
@@ -13,9 +13,11 @@ import org.argeo.api.acr.spi.ProvidedRepository;
 import org.argeo.api.cms.CmsAuth;
 import org.argeo.api.cms.CmsSession;
 import org.argeo.api.cms.CmsState;
+import org.argeo.api.cms.DataAdminPrincipal;
 import org.argeo.api.uuid.UuidFactory;
 import org.argeo.cms.auth.CurrentUser;
 import org.argeo.cms.internal.runtime.CmsContextImpl;
+import org.argeo.cms.util.CurrentSubject;
 
 /**
  * Multi-session {@link ProvidedRepository}, integrated with a CMS.
@@ -40,12 +42,19 @@ public class CmsContentRepository extends AbstractContentRepository {
 
 	@Override
 	public ContentSession get(Locale locale) {
-		// Subject subject = Subject.getSubject(AccessController.getContext());
+		if (!CmsSession.hasCmsSession(CurrentSubject.current())) {
+			if (DataAdminPrincipal.isDataAdmin(CurrentSubject.current())) {
+				// TODO open multiple data admin sessions?
+				return getSystemSession();
+			}
+			throw new IllegalStateException("Caller must be authenticated");
+		}
+
 		CmsSession cmsSession = CurrentUser.getCmsSession();
 		CmsContentSession contentSession = userSessions.get(cmsSession);
 		if (contentSession == null) {
 			final CmsContentSession newContentSession = new CmsContentSession(this, cmsSession.getUuid(),
-					cmsSession.getSubject(), locale);
+					cmsSession.getSubject(), locale, uuidFactory);
 			cmsSession.addOnCloseCallback((c) -> {
 				newContentSession.close();
 				userSessions.remove(cmsSession);
@@ -65,8 +74,8 @@ public class CmsContentRepository extends AbstractContentRepository {
 			throw new RuntimeException("Could not login as data admin", e1);
 		} finally {
 		}
-		return new CmsContentSession(this, getCmsState().getUuid(), loginContext.getSubject(),
-				Locale.getDefault());
+		return new CmsContentSession(this, getCmsState().getUuid(), loginContext.getSubject(), Locale.getDefault(),
+				uuidFactory);
 	}
 
 	protected CmsState getCmsState() {