inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

REPO-1305: Delete a group

Browse Source 
- first version

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@134676 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Cristian Turlica
2017-01-20 13:46:59 +00:00
parent debae96be4
commit 688a068f2a
6 changed files with 165 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
source/java/org/alfresco/rest/api/impl/GroupsImpl.java
View File

@@ -30,6 +30,7 @@ import org.alfresco.query.PagingRequest;
import org.alfresco.query.PagingResults;
import org.alfresco.repo.security.authority.AuthorityDAO;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.authority.AuthorityException;
import org.alfresco.repo.security.authority.AuthorityInfo;
import org.alfresco.repo.security.authority.UnknownAuthorityException;
import org.alfresco.rest.antlr.WhereClauseParser;
@@ -138,7 +139,7 @@ public class GroupsImpl implements Groups
public Group update(String groupId, Group group, Parameters parameters)
{
validateGroupId(groupId);
validateGroupId(groupId, false);
validateGroup(group, true);
authorityService.setAuthorityDisplayName(groupId, group.getDisplayName());
@@ -525,9 +526,31 @@ public class GroupsImpl implements Groups
}
}
public void delete(String groupId, Parameters parameters)
{
// Get cascade param - default false (if not provided).
boolean cascade = Boolean.valueOf(parameters.getParameter(PARAM_CASCADE));
try
{
authorityService.deleteAuthority(groupId, cascade);
}
catch (AuthorityException ae)
{
if (ae.getMsgId().equals("Trying to modify a fixed authority"))
{
throw new ConstraintViolatedException("Trying to modify a fixed authority");
}
else
{
throw ae;
}
}
}
public CollectionWithPagingInfo<GroupMember> getGroupMembers(String groupId, final Parameters parameters)
{
validateGroupId(groupId);
validateGroupId(groupId, false);
Paging paging = parameters.getPaging();
@@ -646,14 +669,14 @@ public class GroupsImpl implements Groups
return groupMember;
}
private void validateGroupId(String groupId)
private void validateGroupId(String groupId, boolean inferPrefix)
{
if (groupId == null || groupId.isEmpty())
{
throw new InvalidArgumentException("groupId is null or empty");
}
if (!groupAuthorityExists(groupId))
if (!groupAuthorityExists(groupId, inferPrefix))
{
throw new EntityNotFoundException(groupId);
}
@@ -702,14 +725,19 @@ public class GroupsImpl implements Groups
}
}
private boolean groupAuthorityExists(String shortName)
private boolean groupAuthorityExists(String authorityName)
{
return authorityExists(AuthorityType.GROUP, shortName);
return groupAuthorityExists(authorityName, true);
}
private boolean authorityExists(AuthorityType authorityType, String shortName)
private boolean groupAuthorityExists(String authorityName, boolean inferPrefix)
{
String name = authorityService.getName(authorityType, shortName);
return authorityExists(AuthorityType.GROUP, authorityName, inferPrefix);
}
private boolean authorityExists(AuthorityType authorityType, String authorityName, boolean inferPrefix)
{
String name = inferPrefix ? authorityService.getName(authorityType, authorityName) : authorityName;
return (name != null && authorityService.authorityExists(name));
}