inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-21 18:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.1-MC1 (5.1.0) to HEAD (5.1)

Browse Source 
119083 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      118660 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         118618 gjames: RA-607 BCRYPT Improved the logging


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119924 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jean-Pierre Huynh
2015-12-10 10:22:01 +00:00
parent 921dbb04ae
commit e0ff2eacee
1 changed files with 40 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
source/java/org/alfresco/rest/api/impl/SitesImpl.java
View File

@@ -276,14 +276,15 @@ public class SitesImpl implements Sites
{ {
SiteMember siteMember = null; SiteMember siteMember = null;
personId = people.validatePerson(personId); personId = people.validatePerson(personId);
SiteInfo siteInfo = validateSite(siteId); SiteInfo siteInfo = validateSite(siteId);
if(siteInfo == null) if(siteInfo == null)
{ {
// site does not exist // site does not exist
throw new RelationshipResourceNotFoundException(personId, siteId); logger.debug("Site does not exist: "+siteId);
} throw new RelationshipResourceNotFoundException(personId, siteId);
siteId = siteInfo.getShortName(); }
siteId = siteInfo.getShortName();
logger.debug("Getting member role for "+siteId+ " person "+personId); logger.debug("Getting member role for "+siteId+ " person "+personId);
String role = siteService.getMembersRole(siteId, personId); String role = siteService.getMembersRole(siteId, personId);
@@ -300,33 +301,37 @@ public class SitesImpl implements Sites
return siteMember; return siteMember;
} }
public SiteMember addSiteMember(String siteId, SiteMember siteMember) public SiteMember addSiteMember(String siteId, SiteMember siteMember)
{ {
String personId = people.validatePerson(siteMember.getPersonId()); String personId = people.validatePerson(siteMember.getPersonId());
SiteInfo siteInfo = validateSite(siteId); SiteInfo siteInfo = validateSite(siteId);
if(siteInfo == null) if(siteInfo == null)
{ {
// site does not exist // site does not exist
throw new EntityNotFoundException(siteId); logger.debug("addSiteMember: site does not exist "+siteId+ " person "+personId);
} throw new EntityNotFoundException(siteId);
// set the site id to the short name (to deal with case sensitivity issues with using the siteId from the url) }
siteId = siteInfo.getShortName(); // set the site id to the short name (to deal with case sensitivity issues with using the siteId from the url)
siteId = siteInfo.getShortName();
String role = siteMember.getRole();
if(role == null)
{
logger.debug("addSiteMember: Must provide a role "+siteMember);
throw new InvalidArgumentException("Must provide a role");
}
if(siteService.isMember(siteId, personId))
{
logger.debug("addSiteMember: "+ personId + " is already a member of site " + siteId);
throw new ConstraintViolatedException(personId + " is already a member of site " + siteId);
}
String role = siteMember.getRole(); if(!siteService.canAddMember(siteId, personId, role))
if(role == null) {
{ logger.debug("addSiteMember: PermissionDeniedException "+siteId+ " person "+personId+ " role "+role);
throw new InvalidArgumentException("Must provide a role"); throw new PermissionDeniedException();
} }
if(siteService.isMember(siteId, personId))
{
throw new ConstraintViolatedException(personId + " is already a member of site " + siteId);
}
if(!siteService.canAddMember(siteId, personId, role))
{
throw new PermissionDeniedException();
}
try try
{ {
@@ -334,6 +339,7 @@ public class SitesImpl implements Sites
} }
catch (UnknownAuthorityException e) catch (UnknownAuthorityException e)
{ {
logger.debug("addSiteMember: UnknownAuthorityException "+siteId+ " person "+personId+ " role "+role);
throw new InvalidArgumentException("Unknown role '" + role + "'"); throw new InvalidArgumentException("Unknown role '" + role + "'");
} }
return siteMember; return siteMember;