feat: Update news articles delete rights - EXO-70484 - Meeds-io/MIPs#119

(#21)
Meeds-io · Apr 24, 2024 · e0f759f · e0f759f
1 parent 4d39f8f
commit e0f759f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 15 deletions.
diff --git a/content-service/src/main/java/io/meeds/news/service/impl/NewsServiceImpl.java b/content-service/src/main/java/io/meeds/news/service/impl/NewsServiceImpl.java
@@ -47,7 +47,6 @@
 import org.exoplatform.commons.search.index.IndexingService;
 import org.exoplatform.commons.utils.CommonsUtils;
 import org.exoplatform.container.PortalContainer;
-import org.exoplatform.portal.config.UserACL;
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
 import org.exoplatform.services.security.ConversationState;
@@ -179,8 +178,6 @@ public class NewsServiceImpl implements NewsService {
 
   private final IdentityManager      identityManager;
 
-  private final UserACL              userACL;
-
   private final ActivityManager      activityManager;
 
   private final WikiService          wikiService;
@@ -192,7 +189,6 @@ public NewsServiceImpl(SpaceService spaceService,
                          NewsTargetingService newsTargetingService,
                          IndexingService indexingService,
                          IdentityManager identityManager,
-                         UserACL userACL,
                          ActivityManager activityManager,
                          WikiService wikiService,
                          UploadService uploadService) {
@@ -204,7 +200,6 @@ public NewsServiceImpl(SpaceService spaceService,
     this.newsTargetingService = newsTargetingService;
     this.indexingService = indexingService;
     this.identityManager = identityManager;
-    this.userACL = userACL;
     this.activityManager = activityManager;
     this.wikiService = wikiService;
   }
@@ -1092,13 +1087,11 @@ private Long saveArticleIllustration(String articleUploadId, Long oldArticleIllu
   }
 
   private boolean canDeleteNews(Identity currentIdentity, String posterId, String spaceId) {
-    if (currentIdentity == null) {
+    Space space = spaceId == null ? null : spaceService.getSpaceById(spaceId);
+    if (space == null) {
       return false;
     }
-    String authenticatedUser = currentIdentity.getUserId();
-    Space currentSpace = spaceService.getSpaceById(spaceId);
-    return authenticatedUser.equals(posterId) || userACL.isSuperUser() || spaceService.isSuperManager(authenticatedUser)
-        || spaceService.isManager(currentSpace, authenticatedUser);
+    return spaceService.canRedactOnSpace(space, currentIdentity);
   }
 
   private boolean isMemberOfsharedInSpaces(News news, String username) {

diff --git a/content-service/src/test/java/io/meeds/news/service/impl/NewsServiceImplTest.java b/content-service/src/test/java/io/meeds/news/service/impl/NewsServiceImplTest.java
@@ -58,7 +58,6 @@
 import org.exoplatform.commons.search.index.IndexingService;
 import org.exoplatform.commons.utils.CommonsUtils;
 import org.exoplatform.container.PortalContainer;
-import org.exoplatform.portal.config.UserACL;
 import org.exoplatform.services.security.Identity;
 import org.exoplatform.social.core.manager.ActivityManager;
 import org.exoplatform.social.core.manager.IdentityManager;
@@ -119,8 +118,6 @@ public class NewsServiceImplTest {
 
   private NewsService                                newsService;
 
-  private UserACL                                    userACL;
-
   private static final MockedStatic<CommonsUtils>    COMMONS_UTILS    = mockStatic(CommonsUtils.class);
 
   private static final MockedStatic<PortalContainer> PORTAL_CONTAINER = mockStatic(PortalContainer.class);
@@ -129,15 +126,13 @@ public class NewsServiceImplTest {
 
   @Before
   public void setUp() {
-    userACL = CommonsUtils.getService(UserACL.class);
     this.newsService = new NewsServiceImpl(spaceService,
                                            noteService,
                                            metadataService,
                                            fileService,
                                            newsTargetingService,
                                            indexingService,
                                            identityManager,
-                                           userACL,
                                            activityManager,
                                            wikiService,
                                            uploadService);