From 3a7f601c71ac97bcbbf115f8bcf3b25f55afbbcd Mon Sep 17 00:00:00 2001 From: "massimiliano.assante" Date: Mon, 6 Feb 2017 16:16:59 +0000 Subject: [PATCH] cleaned-up code git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/my-vres@142277 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../java/org/gcube/portlet/user/my_vres/client/MyVREs.java | 6 +++++- .../portlet/user/my_vres/client/widgets/ClickableVRE.java | 5 ++++- .../portlet/user/my_vres/server/MyVREsServiceImpl.java | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/gcube/portlet/user/my_vres/client/MyVREs.java b/src/main/java/org/gcube/portlet/user/my_vres/client/MyVREs.java index d50ebca..d9d4c39 100644 --- a/src/main/java/org/gcube/portlet/user/my_vres/client/MyVREs.java +++ b/src/main/java/org/gcube/portlet/user/my_vres/client/MyVREs.java @@ -21,6 +21,7 @@ public class MyVREs implements EntryPoint { public static final String GET_CONTEXT_PARAMETER = "scope"; public static final String GET_CLIENT_ID_PARAMETER = "client_id"; public static final String GET_CLIENT_SECRET_PARAMETER = "client_secret"; + public static final String GET_RESPONSE_TYPE_PARAMETER = "response_type"; public static final String GET_AUTH_TOKEN_PARAMETER = "code"; @@ -53,7 +54,10 @@ public class MyVREs implements EntryPoint { @Override public void onSuccess(AuthorizationBean result) { if (result.isSuccess()) { - Location.assign(params.redirectURI+"?"+GET_AUTH_TOKEN_PARAMETER+"="+result.getOAuth2TemporaryCode()+"&"+GET_STATE_PARAMETER+"="+result.getState()); + Location.assign(params.redirectURI+"?" + +GET_AUTH_TOKEN_PARAMETER+"="+result.getOAuth2TemporaryCode()+"&" + +GET_STATE_PARAMETER+"="+result.getState()+"&" + +GET_RESPONSE_TYPE_PARAMETER+"=code"); } else { HTML message = new HTML("There were issues in managing this request: " + result.getErrorDescription()); message.setStyleName("portlet-msg-error"); diff --git a/src/main/java/org/gcube/portlet/user/my_vres/client/widgets/ClickableVRE.java b/src/main/java/org/gcube/portlet/user/my_vres/client/widgets/ClickableVRE.java index 1660087..6ad4624 100644 --- a/src/main/java/org/gcube/portlet/user/my_vres/client/widgets/ClickableVRE.java +++ b/src/main/java/org/gcube/portlet/user/my_vres/client/widgets/ClickableVRE.java @@ -67,7 +67,10 @@ public class ClickableVRE extends HTML { @Override public void onSuccess(AuthorizationBean result) { if (result.isSuccess()) { - Location.assign(params.getRedirectURI()+"?"+MyVREs.GET_AUTH_TOKEN_PARAMETER+"="+result.getOAuth2TemporaryCode()+"&"+MyVREs.GET_STATE_PARAMETER+"="+result.getState()); + Location.assign(params.getRedirectURI()+"?" + +MyVREs.GET_AUTH_TOKEN_PARAMETER+"="+result.getOAuth2TemporaryCode()+"&" + +MyVREs.GET_STATE_PARAMETER+"="+result.getState()+"&" + +MyVREs.GET_RESPONSE_TYPE_PARAMETER+"=code");; } else { HTML message = new HTML("There were issues in managing this request: " + result.getErrorDescription()); message.setStyleName("portlet-msg-error"); diff --git a/src/main/java/org/gcube/portlet/user/my_vres/server/MyVREsServiceImpl.java b/src/main/java/org/gcube/portlet/user/my_vres/server/MyVREsServiceImpl.java index 79276a0..93345d6 100644 --- a/src/main/java/org/gcube/portlet/user/my_vres/server/MyVREsServiceImpl.java +++ b/src/main/java/org/gcube/portlet/user/my_vres/server/MyVREsServiceImpl.java @@ -410,7 +410,7 @@ public class MyVREsServiceImpl extends RemoteServiceServlet implements MyVREsSer HttpResponse response = httpClient.execute(httpPostRequest); responseCode = response.getStatusLine().getStatusCode(); if (responseCode < 200 || responseCode >= 300) { - _log.error("failed to patch the product. response status line from " + _log.error("error: response status line from " + fullPath2oAuthService + " was: " + responseCode); return false; }