diff --git a/src/main/java/org/gcube/portlets/admin/OpenIdConnectRESTHelperExtended.java b/src/main/java/org/gcube/portlets/admin/OpenIdConnectRESTHelperExtended.java index f4e9f23..9757d5d 100644 --- a/src/main/java/org/gcube/portlets/admin/OpenIdConnectRESTHelperExtended.java +++ b/src/main/java/org/gcube/portlets/admin/OpenIdConnectRESTHelperExtended.java @@ -40,7 +40,7 @@ public class OpenIdConnectRESTHelperExtended extends OpenIdConnectRESTHelper { * unauthorized call), inspect the * exception for details */ - public static JWTToken queryExchangeToken(URL tokenUrl, String authorization, String audience, String client_id, + public static JWTToken ExtendedQueryExchangeToken(URL tokenUrl, String authorization, String audience, String client_id, String client_secret, List permissions) throws OpenIdConnectRESTHelperException { @@ -87,16 +87,16 @@ public class OpenIdConnectRESTHelperExtended extends OpenIdConnectRESTHelper { // logger.info("Query exchangeToken, params " + params); // logger.info("Query exchangeToken, extraHeaders " + extraHeaders); - return performQueryTokenWithPOST(tokenUrl, null, params, extraHeaders); + return ExtenedPerformQueryTokenWithPOST(tokenUrl, null, params, extraHeaders); } - protected static JWTToken performQueryTokenWithPOST(URL tokenURL, String authorization, + protected static JWTToken ExtenedPerformQueryTokenWithPOST(URL tokenURL, String authorization, Map> params, Map headers) throws OpenIdConnectRESTHelperException { // logger.debug("Querying access token from OIDC server with URL: {}", tokenURL); StringBuilder sb; try { - HttpURLConnection httpURLConnection = performURLEncodedPOSTSendData(tokenURL, params, authorization, + HttpURLConnection httpURLConnection = ExtendedPerformURLEncodedPOSTSendData(tokenURL, params, authorization, headers); sb = new StringBuilder(); @@ -135,7 +135,7 @@ public class OpenIdConnectRESTHelperExtended extends OpenIdConnectRESTHelper { return JWTToken.fromString(sb.toString()); } - protected static HttpURLConnection performURLEncodedPOSTSendData(URL url, Map> params, + protected static HttpURLConnection ExtendedPerformURLEncodedPOSTSendData(URL url, Map> params, String authorization, Map headers) throws IOException, ProtocolException, UnsupportedEncodingException { diff --git a/src/main/java/org/gcube/portlets/admin/RPTTokenReader.java b/src/main/java/org/gcube/portlets/admin/RPTTokenReader.java index d2d0c0c..3bd2351 100644 --- a/src/main/java/org/gcube/portlets/admin/RPTTokenReader.java +++ b/src/main/java/org/gcube/portlets/admin/RPTTokenReader.java @@ -129,7 +129,7 @@ public class RPTTokenReader extends MVCPortlet { // log.info("client_id " + configuration.getPortalClientId()); // log.info("client_secret " + configuration.getPortalClientSecret()); - exchangedToken = OpenIdConnectRESTHelperExtended.queryExchangeToken( + exchangedToken = OpenIdConnectRESTHelperExtended.ExtendedQueryExchangeToken( configuration.getTokenURL(), authToken.getAccessTokenString(), urlEncodedContext,