From 8601a413b41b39a4ec5c56c4c00d10fb946f2e0b Mon Sep 17 00:00:00 2001 From: Lucio Lelii Date: Wed, 14 Sep 2016 14:32:05 +0000 Subject: [PATCH] git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-access/ckan-connector@131356 82a268e6-3cf1-43bd-a215-b396298e98cf --- .settings/org.eclipse.core.resources.prefs | 6 ++++++ pom.xml | 2 +- .../gcube/data/access/ckanconnector/ConnectorManager.java | 4 ++-- .../data/access/ckanconnector/OrganizationManager.java | 6 +++--- 4 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 .settings/org.eclipse.core.resources.prefs diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..29abf99 --- /dev/null +++ b/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,6 @@ +eclipse.preferences.version=1 +encoding//src/main/java=UTF-8 +encoding//src/main/resources=UTF-8 +encoding//src/test/java=UTF-8 +encoding//src/test/resources=UTF-8 +encoding/=UTF-8 diff --git a/pom.xml b/pom.xml index 13f5f83..9189ab2 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.gcube.data.access ckan-connector - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT war ckan connector a ckan connector for automatic login diff --git a/src/main/java/org/gcube/data/access/ckanconnector/ConnectorManager.java b/src/main/java/org/gcube/data/access/ckanconnector/ConnectorManager.java index a5e4cd8..10d1326 100644 --- a/src/main/java/org/gcube/data/access/ckanconnector/ConnectorManager.java +++ b/src/main/java/org/gcube/data/access/ckanconnector/ConnectorManager.java @@ -78,10 +78,10 @@ public class ConnectorManager { @GET public Response connect(@PathParam(value = "pathInfo") String path, @Context HttpServletRequest req, @QueryParam(value="listOfVres") String vres ) { try{ - if (AuthorizationProvider.instance.get()==null || AuthorizationProvider.instance.get().getUserName() == null ) return Response.status(Status.UNAUTHORIZED).build(); + if (AuthorizationProvider.instance.get()==null || AuthorizationProvider.instance.get().getClient() == null ) return Response.status(Status.UNAUTHORIZED).build(); log.info("passed path is {}",path); String ckanKey = context.getInitParameter("ckanKey"); - String originalUserName = AuthorizationProvider.instance.get().getUserName(); + String originalUserName = AuthorizationProvider.instance.get().getClient().getId(); String changedUserName = originalUserName.replace(".", "_"); int internalPort = Integer.parseInt(context.getInitParameter("internalPort")); String localhostName = "http://127.0.0.1:"+internalPort; diff --git a/src/main/java/org/gcube/data/access/ckanconnector/OrganizationManager.java b/src/main/java/org/gcube/data/access/ckanconnector/OrganizationManager.java index 68c86c0..9377116 100644 --- a/src/main/java/org/gcube/data/access/ckanconnector/OrganizationManager.java +++ b/src/main/java/org/gcube/data/access/ckanconnector/OrganizationManager.java @@ -35,7 +35,7 @@ public class OrganizationManager { public Response create(@PathParam("name") String organizationName) { log.info("create called"); try{ - if (AuthorizationProvider.instance.get()==null || AuthorizationProvider.instance.get().getUserName() == null ) return Response.status(Status.UNAUTHORIZED).build(); + if (AuthorizationProvider.instance.get()==null || AuthorizationProvider.instance.get().getClient() == null ) return Response.status(Status.UNAUTHORIZED).build(); String ckanKey = context.getInitParameter("ckanKey"); int internalPort = Integer.parseInt(context.getInitParameter("internalPort")); @@ -46,7 +46,7 @@ public class OrganizationManager { org.setTitle(organizationName); ckanClient.createOrganization(org); - log.info("create organizzation {} called from user {} in scope {}",organizationName, AuthorizationProvider.instance.get().getUserName(), ScopeProvider.instance.get()); + log.info("create organizzation {} called from user {} in scope {}",organizationName, AuthorizationProvider.instance.get().getClient().getId(), ScopeProvider.instance.get()); return Response.ok().build(); }catch(Exception e){ log.error("error trying to create organization "+organizationName,e); @@ -60,7 +60,7 @@ public class OrganizationManager { public String get(@PathParam("name") String organizationName) { log.info("get called with name {}", organizationName); - if (AuthorizationProvider.instance.get()==null || AuthorizationProvider.instance.get().getUserName() == null ) throw new WebApplicationException("user authentication needed",Response.Status.UNAUTHORIZED); + if (AuthorizationProvider.instance.get()==null || AuthorizationProvider.instance.get().getClient() == null ) throw new WebApplicationException("user authentication needed",Response.Status.UNAUTHORIZED); String ckanKey = context.getInitParameter("ckanKey"); int internalPort = Integer.parseInt(context.getInitParameter("internalPort"));