From 3e0fcc2485c82018381faab7b4843625ce806aec Mon Sep 17 00:00:00 2001 From: "lucio.lelii" Date: Wed, 16 Nov 2016 11:11:14 +0000 Subject: [PATCH] git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/Common/authorization-common-client@134221 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/proxy/DefaultAuthorizationProxy.java | 2 +- .../common/authorizationservice/cl/CallTest.java | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) 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 6dd9817..bf6f080 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 @@ -123,7 +123,7 @@ public class DefaultAuthorizationProxy implements AuthorizationProxy { @Override public String resolveTokenByUserAndContext(String user, String context) throws ObjectNotFound, Exception { - String methodPath = "/token/"; + String methodPath = "/token/resolve/"; int infrastructureHash = Utils.getInfrastructureHashfromContext(context); diff --git a/src/test/java/org/gcube/common/authorizationservice/cl/CallTest.java b/src/test/java/org/gcube/common/authorizationservice/cl/CallTest.java index 5fd2039..c044e11 100644 --- a/src/test/java/org/gcube/common/authorizationservice/cl/CallTest.java +++ b/src/test/java/org/gcube/common/authorizationservice/cl/CallTest.java @@ -33,6 +33,11 @@ public class CallTest { } + @Test + public void requestUserTokenViaUserNameAndScope() throws Exception { + System.out.println(authorizationService().resolveTokenByUserAndContext("alessandro.pieve", "/gcube/devsec")); + } + @Test public void requestNodeToken() throws Exception { System.out.println(_requestNodeToken()); @@ -60,8 +65,8 @@ public class CallTest { } @Test - public void requestToken() throws Exception{ - System.out.println(authorizationService().generateUserToken(new UserInfo("test.gcube", new ArrayList()), "/gcube/devsec")); + public void generateToken() throws Exception{ + System.out.println(authorizationService().generateUserToken(new UserInfo("alessandro.pieve", new ArrayList()), "/gcube/devsec")); } @Test(expected=RuntimeException.class) public void createKeyWithError() throws Exception { @@ -94,8 +99,8 @@ public class CallTest { } public String _requestNodeToken() throws Exception { - SecurityTokenProvider.instance.set(requestTestToken("/d4science.research-infrastructures.eu")); - String token = authorizationService().requestActivation(new ContainerInfo("node65.d4science.org",80), "/d4science.research-infrastructures.eu"); + SecurityTokenProvider.instance.set(requestTestToken("/gcube")); + String token = authorizationService().requestActivation(new ContainerInfo("dlib29.isti.cnr.it",8080), "/gcube/devsec"); return token; }