Skip to content

Merge Meeds-io/MIPs#240 #683

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sofyenne merged 2 commits into from
Feb 16, 2026
Merged

Merge Meeds-io/MIPs#240 #683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
000a664
feat: Retrieve Memberships from User ACL instead of OrganizationServi…
boubaker Jan 29, 2026
d908dda
feat: Remove unused import - MEED-10244 - Meeds-io/MIPs#240
sofyenne Feb 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 8 additions & 34 deletions content-service/src/main/java/io/meeds/content/link/plugin/LinkSettingTranslationPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,13 @@
*/
package io.meeds.content.link.plugin;

import java.util.List;

import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import org.exoplatform.commons.exception.ObjectNotFoundException;
import org.exoplatform.portal.config.UserACL;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
import org.exoplatform.services.organization.OrganizationService;
import org.exoplatform.services.security.Identity;
import org.exoplatform.services.security.IdentityRegistry;
import org.exoplatform.services.security.MembershipEntry;

import io.meeds.content.link.model.LinkSetting;
import io.meeds.content.link.service.LinkService;
Expand All @@ -42,21 +36,18 @@
@Component
public class LinkSettingTranslationPlugin extends TranslationPlugin {

public static final String LINK_SETTINGS_OBJECT_TYPE = "link-settings";

private static final Log LOG = ExoLogger.getLogger(LinkSettingTranslationPlugin.class);
public static final String LINK_SETTINGS_OBJECT_TYPE = "link-settings";

@Autowired
protected LinkService linkService;
private static final Log LOG = ExoLogger.getLogger(LinkSettingTranslationPlugin.class);

@Autowired
protected IdentityRegistry identityRegistry;
protected LinkService linkService;

@Autowired
protected OrganizationService organizationService;
protected TranslationService translationService;

@Autowired
protected TranslationService translationService;
protected UserACL userAcl;

@PostConstruct
public void init() {
Expand All @@ -72,7 +63,7 @@ public String getObjectType() {
public boolean hasAccessPermission(String linkSettingId, String username) throws ObjectNotFoundException {
try {
LinkSetting linkSetting = linkService.getLinkSettingById(Long.parseLong(linkSettingId));
return linkSetting != null && linkService.hasAccessPermission(linkSetting.getName(), getIdentity(username));
return linkSetting != null && linkService.hasAccessPermission(linkSetting.getName(), userAcl.getUserIdentity(username));
} catch (Exception e) {
LOG.warn("Error checking access permission on link setting with id {} for user {}", linkSettingId, username, e);
return false;
Expand All @@ -83,7 +74,7 @@ public boolean hasAccessPermission(String linkSettingId, String username) throws
public boolean hasEditPermission(String linkSettingId, String username) throws ObjectNotFoundException {
try {
LinkSetting linkSetting = linkService.getLinkSettingById(Long.parseLong(linkSettingId));
return linkSetting != null && linkService.hasEditPermission(linkSetting.getName(), getIdentity(username));
return linkSetting != null && linkService.hasEditPermission(linkSetting.getName(), userAcl.getUserIdentity(username));
} catch (Exception e) {
LOG.warn("Error checking edit permission on link setting with id {} for user {}", linkSettingId, username, e);
return false;
Expand All @@ -100,21 +91,4 @@ public long getSpaceId(String linkSettingId) throws ObjectNotFoundException {
return 0;
}

private Identity getIdentity(String username) throws Exception {
if (StringUtils.isBlank(username)) {
return null;
}
Identity aclIdentity = identityRegistry.getIdentity(username);
if (aclIdentity == null) {
List<MembershipEntry> entries = organizationService.getMembershipHandler()
.findMembershipsByUser(username)
.stream()
.map(membership -> new MembershipEntry(membership.getGroupId(),
membership.getMembershipType()))
.toList();
aclIdentity = new Identity(username, entries);
identityRegistry.register(aclIdentity);
}
return aclIdentity;
}
}
36 changes: 5 additions & 31 deletions content-service/src/main/java/io/meeds/content/link/plugin/LinkTranslationPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,13 @@
*/
package io.meeds.content.link.plugin;

import java.util.List;

import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import org.exoplatform.commons.exception.ObjectNotFoundException;
import org.exoplatform.portal.config.UserACL;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
import org.exoplatform.services.organization.OrganizationService;
import org.exoplatform.services.security.Identity;
import org.exoplatform.services.security.IdentityRegistry;
import org.exoplatform.services.security.MembershipEntry;

import io.meeds.content.link.model.LinkSetting;
import io.meeds.content.link.service.LinkService;
Expand All @@ -50,13 +44,10 @@ public class LinkTranslationPlugin extends TranslationPlugin {
private LinkService linkService;

@Autowired
private IdentityRegistry identityRegistry;

@Autowired
private OrganizationService organizationService;
private TranslationService translationService;

@Autowired
private TranslationService translationService;
protected UserACL userAcl;

@PostConstruct
public void init() {
Expand All @@ -72,7 +63,7 @@ public String getObjectType() {
public boolean hasAccessPermission(String linkId, String username) throws ObjectNotFoundException {
try {
LinkSetting linkSetting = linkService.getLinkSettingByLinkId(Long.parseLong(linkId));
return linkSetting != null && linkService.hasAccessPermission(linkSetting.getName(), getIdentity(username));
return linkSetting != null && linkService.hasAccessPermission(linkSetting.getName(), userAcl.getUserIdentity(username));
} catch (Exception e) {
LOG.warn("Error checking access permission on link with id {} for user {}", linkId, username, e);
return false;
Expand All @@ -83,7 +74,7 @@ public boolean hasAccessPermission(String linkId, String username) throws Object
public boolean hasEditPermission(String linkId, String username) throws ObjectNotFoundException {
try {
LinkSetting linkSetting = linkService.getLinkSettingByLinkId(Long.parseLong(linkId));
return linkSetting != null && linkService.hasEditPermission(linkSetting.getName(), getIdentity(username));
return linkSetting != null && linkService.hasEditPermission(linkSetting.getName(), userAcl.getUserIdentity(username));
} catch (Exception e) {
LOG.warn("Error checking edit permission on link with id {} for user {}", linkId, username, e);
return false;
Expand All @@ -100,21 +91,4 @@ public long getSpaceId(String linkId) throws ObjectNotFoundException {
return 0;
}

private Identity getIdentity(String username) throws Exception {
if (StringUtils.isBlank(username)) {
return null;
}
Identity aclIdentity = identityRegistry.getIdentity(username);
if (aclIdentity == null) {
List<MembershipEntry> entries = organizationService.getMembershipHandler()
.findMembershipsByUser(username)
.stream()
.map(membership -> new MembershipEntry(membership.getGroupId(),
membership.getMembershipType()))
.toList();
aclIdentity = new Identity(username, entries);
identityRegistry.register(aclIdentity);
}
return aclIdentity;
}
}
42 changes: 7 additions & 35 deletions ...ent-service/src/main/java/io/meeds/content/news/plugin/NewsListViewTranslationPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,41 +18,27 @@
*/
package io.meeds.content.news.plugin;

import java.util.List;

import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import org.exoplatform.commons.api.settings.SettingService;
import org.exoplatform.commons.api.settings.SettingValue;
import org.exoplatform.commons.exception.ObjectNotFoundException;
import org.exoplatform.container.ExoContainerContext;
import org.exoplatform.services.organization.OrganizationService;
import org.exoplatform.portal.config.UserACL;
import org.exoplatform.services.security.Identity;
import org.exoplatform.services.security.IdentityRegistry;
import org.exoplatform.services.security.MembershipEntry;

import io.meeds.content.news.utils.NewsUtils;
import io.meeds.social.cms.service.CMSService;
import io.meeds.social.translation.plugin.TranslationPlugin;
import io.meeds.social.translation.service.TranslationService;

import jakarta.annotation.PostConstruct;
import lombok.Setter;

@Component
public class NewsListViewTranslationPlugin extends TranslationPlugin {

public static final String NEWS_LIST_VIEW_OBJECT_TYPE = "newsListView";


@Setter
private IdentityRegistry identityRegistry;

@Autowired
private OrganizationService organizationService;

@Autowired
private TranslationService translationService;

Expand All @@ -62,9 +48,11 @@ public class NewsListViewTranslationPlugin extends TranslationPlugin {
@Autowired
private SettingService settingService;

@Autowired
private UserACL userAcl;

@PostConstruct
public void init() {
setIdentityRegistry(ExoContainerContext.getService(IdentityRegistry.class));
translationService.addPlugin(this);
}

Expand All @@ -90,8 +78,9 @@ public boolean hasEditPermission(String objectId, String username) {
NewsUtils.NEWS_LIST_VIEW_SCOPE,
objectId);
String settingName = settingNameValue != null ? settingNameValue.getValue().toString() : null;
return getIdentity(username) != null
&& (cmsService.hasEditPermission(getIdentity(username), "newsListViewPortlet", settingName));
Identity userAclIdentity = userAcl.getUserIdentity(username);
return userAclIdentity != null
&& (cmsService.hasEditPermission(userAclIdentity, "newsListViewPortlet", settingName));
} catch (Exception e) {
return false;
}
Expand All @@ -107,21 +96,4 @@ public long getSpaceId(String objectId) throws ObjectNotFoundException {
return 0;
}

private Identity getIdentity(String username) throws Exception {
if (StringUtils.isBlank(username)) {
return null;
}
Identity aclIdentity = identityRegistry.getIdentity(username);
if (aclIdentity == null) {
List<MembershipEntry> entries = organizationService.getMembershipHandler()
.findMembershipsByUser(username)
.stream()
.map(membership -> new MembershipEntry(membership.getGroupId(),
membership.getMembershipType()))
.toList();
aclIdentity = new Identity(username, entries);
identityRegistry.register(aclIdentity);
}
return aclIdentity;
}
}