From 847735bd9b3d522cd1acdd37044a8012d8edc5e8 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sun, 25 Jun 2023 11:46:36 +0200 Subject: [PATCH] Add open content session from CMS session --- org.argeo.cms/src/org/argeo/cms/acr/ContentUtils.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/org.argeo.cms/src/org/argeo/cms/acr/ContentUtils.java b/org.argeo.cms/src/org/argeo/cms/acr/ContentUtils.java index 0513a0d3e..bf5954411 100644 --- a/org.argeo.cms/src/org/argeo/cms/acr/ContentUtils.java +++ b/org.argeo.cms/src/org/argeo/cms/acr/ContentUtils.java @@ -16,6 +16,7 @@ import org.argeo.api.acr.ContentRepository; import org.argeo.api.acr.ContentSession; import org.argeo.api.acr.DName; import org.argeo.api.cms.CmsAuth; +import org.argeo.api.cms.CmsSession; import org.argeo.api.cms.directory.CmsDirectory; import org.argeo.api.cms.directory.CmsUserManager; import org.argeo.api.cms.directory.HierarchyUnit; @@ -176,7 +177,7 @@ public class ContentUtils { } } - public static ContentSession openDataAdminSession(ContentRepository repository) { + public static ContentSession openDataAdminSession(ContentRepository contentRepository) { LoginContext loginContext; try { loginContext = CmsAuth.DATA_ADMIN.newLoginContext(); @@ -189,12 +190,16 @@ public class ContentUtils { ClassLoader currentCl = Thread.currentThread().getContextClassLoader(); try { Thread.currentThread().setContextClassLoader(ContentUtils.class.getClassLoader()); - return CurrentSubject.callAs(loginContext.getSubject(), () -> repository.get()); + return CurrentSubject.callAs(loginContext.getSubject(), () -> contentRepository.get()); } finally { Thread.currentThread().setContextClassLoader(currentCl); } } + public static ContentSession openSession(ContentRepository contentRepository, CmsSession cmsSession) { + return CurrentSubject.callAs(cmsSession.getSubject(), () -> contentRepository.get()); + } + /** * Constructs a relative path between a base path and a given path. * -- 2.30.2