From 63f585888ede75826ce9a6d6a3a5b6cc59fdf43d Mon Sep 17 00:00:00 2001 From: "lucio.lelii" Date: Thu, 22 Feb 2018 17:13:45 +0000 Subject: [PATCH] git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/Common/authorization-common-client@164543 82a268e6-3cf1-43bd-a215-b396298e98cf --- pom.xml | 2 +- .../client/proxy/AuthorizationProxy.java | 2 +- .../client/proxy/DefaultAuthorizationProxy.java | 14 +++++--------- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index a0364de..4066031 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.gcube.common authorization-client - 2.0.1-SNAPSHOT + 2.0.2-SNAPSHOT authorization service client library diff --git a/src/main/java/org/gcube/common/authorization/client/proxy/AuthorizationProxy.java b/src/main/java/org/gcube/common/authorization/client/proxy/AuthorizationProxy.java index 282d2d9..f952a1e 100644 --- a/src/main/java/org/gcube/common/authorization/client/proxy/AuthorizationProxy.java +++ b/src/main/java/org/gcube/common/authorization/client/proxy/AuthorizationProxy.java @@ -50,6 +50,6 @@ public interface AuthorizationProxy { Map retrieveExternalServiceGenerated() throws Exception; - void removeAllReleatedToken(UserInfo client, String context) throws Exception; + void removeAllReleatedToken(String clientId, String context) throws Exception; } diff --git a/src/main/java/org/gcube/common/authorization/client/proxy/DefaultAuthorizationProxy.java b/src/main/java/org/gcube/common/authorization/client/proxy/DefaultAuthorizationProxy.java index afee260..0ca8912 100644 --- a/src/main/java/org/gcube/common/authorization/client/proxy/DefaultAuthorizationProxy.java +++ b/src/main/java/org/gcube/common/authorization/client/proxy/DefaultAuthorizationProxy.java @@ -1,6 +1,7 @@ package org.gcube.common.authorization.client.proxy; import static org.gcube.common.authorization.client.Constants.CONTEXT_PARAM; +import static org.gcube.common.authorization.client.Constants.CLIENT_ID_PARAM; import java.io.BufferedOutputStream; import java.io.BufferedReader; @@ -186,25 +187,20 @@ public class DefaultAuthorizationProxy implements AuthorizationProxy { } @Override - public void removeAllReleatedToken(UserInfo client, String context) throws Exception{ + public void removeAllReleatedToken(String clientId, String context) throws Exception{ String methodPath = "/token/user"; int infrastructureHash = Utils.getInfrastructureHashfromContext(context); StringBuilder callUrl = new StringBuilder(getInternalEnpoint(infrastructureHash)).append(methodPath).append("?") - .append(CONTEXT_PARAM).append("=").append(context); + .append(CONTEXT_PARAM).append("=").append(context).append("&").append(CLIENT_ID_PARAM).append("=").append(clientId); URL url = new URL(callUrl.toString()); HttpURLConnection connection = makeRequest(url, "DELETE", false); - connection.setDoOutput(true); + //connection.setDoOutput(false); connection.setDoInput(true); - connection.setRequestProperty("Content-type", "application/xml"); - - try(OutputStream os = new BufferedOutputStream(connection.getOutputStream())){ - Binder.getContext().createMarshaller().marshal(client, os); - } log.debug("response code for "+callUrl.toString()+" is "+connection.getResponseCode()+" "+connection.getResponseMessage()); - if (connection.getResponseCode()!=200) throw new Exception("error contacting authorization service"); + if (connection.getResponseCode()!=200 && connection.getResponseCode()!=204) throw new Exception("error contacting authorization service"); }