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

Merged HEAD (5.2) to 5.2.N (5.2.1)

Browse Source 
126495 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122697 jvonka: (Quick) Shared Links API - first-cut for shared links api tests (+ve & -ve)
      - also tweaks to REST api test 'fwk' (harness)
      RA-773, RA-708, RA-776, RA-750, RA-829, RA-775


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126839 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2016-05-11 11:44:55 +00:00
parent a6f75435a2
commit b6eec668c7
6 changed files with 401 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
source/java/org/alfresco/rest/api/impl/QuickShareLinksImpl.java
View File

@@ -128,16 +128,24 @@ public class QuickShareLinksImpl implements QuickShareLinks, InitializingBean
{
checkEnabled();
Pair<String, NodeRef> pair = quickShareService.getTenantNodeRefFromSharedId(sharedId);
String networkTenantDomain = pair.getFirst();
return TenantUtil.runAsSystemTenant(new TenantUtil.TenantRunAsWork<QuickShareLink>()
try
{
public QuickShareLink doWork() throws Exception
Pair<String, NodeRef> pair = quickShareService.getTenantNodeRefFromSharedId(sharedId);
String networkTenantDomain = pair.getFirst();
return TenantUtil.runAsSystemTenant(new TenantUtil.TenantRunAsWork<QuickShareLink>()
{
return getQuickShareInfo(sharedId);
}
}, networkTenantDomain);
public QuickShareLink doWork() throws Exception
{
return getQuickShareInfo(sharedId);
}
}, networkTenantDomain);
}
catch (InvalidSharedIdException ex)
{
logger.warn("Unable to find: " + sharedId);
throw new EntityNotFoundException("Unable to find: " + sharedId);
}
}
/**
@@ -203,21 +211,21 @@ public class QuickShareLinksImpl implements QuickShareLinks, InitializingBean
checkEnabled();
checkValidShareId(sharedId);
NodeRef nodeRef = quickShareService.getTenantNodeRefFromSharedId(sharedId).getSecond();
String currentUser = AuthenticationUtil.getFullyAuthenticatedUser();
// TODO site check - see ACE-XXX
//String siteName = getSiteName(nodeRef);
String sharedBy = (String) nodeService.getProperty(nodeRef, QuickShareModel.PROP_QSHARE_SHAREDBY);
if ((!currentUser.equals(sharedBy)) && (!authorityService.isAdminAuthority(currentUser)))
{
throw new PermissionDeniedException("Can't perform unshare action: " + sharedId);
}
try
{
NodeRef nodeRef = quickShareService.getTenantNodeRefFromSharedId(sharedId).getSecond();
String currentUser = AuthenticationUtil.getFullyAuthenticatedUser();
// TODO site check - see ACE-XXX
//String siteName = getSiteName(nodeRef);
String sharedBy = (String) nodeService.getProperty(nodeRef, QuickShareModel.PROP_QSHARE_SHAREDBY);
if ((!currentUser.equals(sharedBy)) && (!authorityService.isAdminAuthority(currentUser)))
{
throw new PermissionDeniedException("Can't perform unshare action: " + sharedId);
}
quickShareService.unshareContent(sharedId);
}
catch (InvalidSharedIdException ex)
@@ -317,7 +325,7 @@ public class QuickShareLinksImpl implements QuickShareLinks, InitializingBean
try
{
Map<String, Object> map = (Map<String, Object>) quickShareService.getMetaData(sharedId).get("item");
Map<String, Object> map = (Map<String, Object>)quickShareService.getMetaData(sharedId).get("item");
NodeRef nodeRef = new NodeRef((String) map.get("nodeRef"));