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 
126434 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      121906 jvonka: Nodes (File/Folder) API - hopefully fix CMIS test fallout (from noAuth changes)
      RA-750, RA-755


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126780 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2016-05-11 11:18:44 +00:00
parent 0d077586da
commit f56cf7e3f2
1 changed files with 259 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
source/java/org/alfresco/rest/api/PublicApiDeclarativeRegistry.java
View File

@@ -65,6 +65,12 @@ import org.springframework.extensions.webscripts.WebScriptRequest;
import org.springframework.extensions.webscripts.WebScriptResponse; import org.springframework.extensions.webscripts.WebScriptResponse;
import org.springframework.http.HttpMethod; import org.springframework.http.HttpMethod;
/**
*
* @author steveglover
* @author janv
* @since PublicApi1.0
*/
public class PublicApiDeclarativeRegistry extends DeclarativeRegistry public class PublicApiDeclarativeRegistry extends DeclarativeRegistry
{ {
private WebScript getNetworksWebScript; private WebScript getNetworksWebScript;
@@ -99,36 +105,37 @@ public class PublicApiDeclarativeRegistry extends DeclarativeRegistry
*/ */
public Match findWebScript(String method, String uri) public Match findWebScript(String method, String uri)
{ {
if(method.equalsIgnoreCase("get") && uri.equals(PublicApiTenantWebScriptServletRequest.NETWORKS_PATH)) Match match = null;
HttpMethod httpMethod = HttpMethod.valueOf(method);
if (httpMethod.equals(HttpMethod.GET))
{
if (uri.equals(PublicApiTenantWebScriptServletRequest.NETWORKS_PATH))
{ {
Map<String, String> templateVars = new HashMap<String, String>(); Map<String, String> templateVars = new HashMap<String, String>();
templateVars.put("apiScope", "public"); templateVars.put("apiScope", "public");
templateVars.put("apiVersion", "1"); templateVars.put("apiVersion", "1");
templateVars.put("apiName", "networks"); templateVars.put("apiName", "networks");
Match match = new Match("", templateVars, "", getNetworksWebScript); match = new Match("", templateVars, "", getNetworksWebScript);
return match;
} }
else if(method.equalsIgnoreCase("get") && uri.equals(PublicApiTenantWebScriptServletRequest.NETWORK_PATH)) else if (uri.equals(PublicApiTenantWebScriptServletRequest.NETWORK_PATH))
{ {
Map<String, String> templateVars = new HashMap<String, String>(); Map<String, String> templateVars = new HashMap<String, String>();
templateVars.put("apiScope", "public"); templateVars.put("apiScope", "public");
templateVars.put("apiVersion", "1"); templateVars.put("apiVersion", "1");
templateVars.put("apiName", "network"); templateVars.put("apiName", "network");
Match match = new Match("", templateVars, "", getNetworkWebScript); match = new Match("", templateVars, "", getNetworkWebScript);
return match;
} }
else else
{
Match match = super.findWebScript(method, uri);
HttpMethod httpMethod = HttpMethod.valueOf(method);
if (httpMethod.equals(HttpMethod.GET))
{ {
// TODO - review (experimental) // TODO - review (experimental)
match = super.findWebScript(method, uri);
// noAuth currently only exposed for GET
Map<String, String> templateVars = match.getTemplateVars(); Map<String, String> templateVars = match.getTemplateVars();
if (templateVars.get("apiName") != null)
{
// NOTE: noAuth currently only exposed for GET
Api api = determineApi(templateVars); Api api = determineApi(templateVars);
// TODO can we avoid locating resource more than once ? // TODO can we avoid locating resource more than once ?
@@ -162,7 +169,7 @@ public class PublicApiDeclarativeRegistry extends DeclarativeRegistry
{ {
final WebScript webScript = match.getWebScript(); final WebScript webScript = match.getWebScript();
// hack ! - is there a better way (to dynamically override "requiredAuthentication") or handle noAuth check earlier ? // TODO is there a better way (to dynamically override "requiredAuthentication") or handle noAuth check earlier ?
WebScript noAuthWebScriptWrapper = new WebScript() WebScript noAuthWebScriptWrapper = new WebScript()
{ {
@Override @Override
@@ -360,16 +367,21 @@ public class PublicApiDeclarativeRegistry extends DeclarativeRegistry
} }
}; };
// override match with noAuth
match = new Match(match.getTemplate(), match.getTemplateVars(), match.getPath(), noAuthWebScriptWrapper); match = new Match(match.getTemplate(), match.getTemplateVars(), match.getPath(), noAuthWebScriptWrapper);
} }
}
}
}
else
{
match = super.findWebScript(method, uri);
} }
return match; return match;
} }
}
// note: same as ApiWebscript // note: same as ApiWebscript (apiName must not be null)
private Api determineApi(Map<String, String> templateVars) private Api determineApi(Map<String, String> templateVars)
{ {
String apiScope = templateVars.get("apiScope"); String apiScope = templateVars.get("apiScope");