Skip to content

Commit

Permalink
Merge pull request #10 from gayanlggd/master
Browse files Browse the repository at this point in the history 
using keycloak id instead of client id
  • Loading branch information
@chamilaadhi
chamilaadhi authored May 25, 2020
2 parents ff97287 + 5fb12e1 commit 7c90643
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 11 deletions.
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon</groupId>
<artifactId>apim-keymanager-keycloak</artifactId>
<version>1.0.1</version>
<version>1.0.2</version>
<packaging>bundle</packaging>
<name>Client implementation to integrate with Keycloak Authorization Server</name>
<url>http://wso2.org</url>
Expand Down
70 changes: 60 additions & 10 deletions src/main/java/org/wso2/keycloak/client/KeycloakClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,8 @@ public OAuthApplicationInfo createApplication(OAuthAppRequest oAuthAppRequest) t

// If successful a 201 will be returned with no body
if (HttpStatus.SC_CREATED == statusCode) {
String clientSecret = getClientSecret(clientName);
String keycloakId = getKeycloakId(clientName);
String clientSecret = getClientSecret(keycloakId);
JSONObject clientInfoJsonObject = getClientById(clientName);
oAuthApplicationInfo = createOAuthAppInfoFromResponse(clientInfoJsonObject);
oAuthApplicationInfo.addParameter(KeycloakConstants.TOKEN_SCOPE, scope);
Expand Down Expand Up @@ -154,11 +155,13 @@ public OAuthApplicationInfo updateApplication(OAuthAppRequest oAuthAppRequest) t
log.debug(String.format("Updating an OAuth client in Keycloak authorization server for the Consumer Key %s",
clientId));
}
// Get Keycloak Id
String keycloakId = getKeycloakId(clientId);
// Getting Client Instance Url and API Key from Config.
String keyCloakInstanceUrl = configuration.getParameter(KeycloakConstants.KEYCLOAK_INSTANCE_URL);
String keycloakRealm = configuration.getParameter(KeycloakConstants.KEYCLOAK_REALM_NAME);
String registrationEndpoint = keyCloakInstanceUrl + KeycloakConstants.KEYCLOAK_ADMIN_CONTEXT + keycloakRealm +
KeycloakConstants.CLIENT_ENDPOINT + clientId;
KeycloakConstants.CLIENT_ENDPOINT + keycloakId;

Map<String, Object> paramMap = new HashMap<String, Object>();
if (StringUtils.isNotEmpty(clientId)) {
Expand All @@ -182,7 +185,7 @@ public OAuthApplicationInfo updateApplication(OAuthAppRequest oAuthAppRequest) t
HttpResponse response = httpClient.execute(httpPut);
int statusCode = response.getStatusLine().getStatusCode();
if (statusCode == HttpStatus.SC_NO_CONTENT){
String clientSecret = getClientSecret(clientId);
String clientSecret = getClientSecret(keycloakId);
JSONObject clientInfoJsonObject = getClientById(clientId);
oAuthApplicationInfo = createOAuthAppInfoFromResponse(clientInfoJsonObject);
oAuthApplicationInfo.addParameter(KeycloakConstants.CLIENT_SECRET, clientSecret);
Expand All @@ -207,10 +210,11 @@ public void deleteApplication(String clientId) throws APIManagementException {
clientId));
}
// Getting Client Instance Url and API Key from Config.
String keycloakId = getKeycloakId(clientId);
String keyCloakInstanceUrl = configuration.getParameter(KeycloakConstants.KEYCLOAK_INSTANCE_URL);
String keycloakRealm = configuration.getParameter(KeycloakConstants.KEYCLOAK_REALM_NAME);
String registrationEndpoint = keyCloakInstanceUrl + KeycloakConstants.KEYCLOAK_ADMIN_CONTEXT + keycloakRealm +
KeycloakConstants.CLIENT_ENDPOINT + clientId;
KeycloakConstants.CLIENT_ENDPOINT + keycloakId;

String accessToken = getAccessToken();
try (CloseableHttpClient httpClient = HttpClientBuilder.create().build();) {
Expand Down Expand Up @@ -238,7 +242,8 @@ public void deleteApplication(String clientId) throws APIManagementException {
@Override
public OAuthApplicationInfo retrieveApplication(String clientId) throws APIManagementException {
OAuthApplicationInfo oAuthApplicationInfo;
String clientSecret = getClientSecret(clientId);
String keycloakId = getKeycloakId(clientId);
String clientSecret = getClientSecret(keycloakId);
JSONObject clientInfoJsonObject = getClientById(clientId);
oAuthApplicationInfo = createOAuthAppInfoFromResponse(clientInfoJsonObject);
oAuthApplicationInfo.setClientSecret(clientSecret);
Expand Down Expand Up @@ -302,7 +307,8 @@ public AccessTokenInfo getTokenMetaData(String accessToken) throws APIManagement
}
handleException("Invalid JWT token. Failed to decode the token.");
}
String clientSecret = getClientSecret(clientId);
String keycloakId = getKeycloakId(clientId);
String clientSecret = getClientSecret(keycloakId);
AccessTokenInfo tokenInfo = new AccessTokenInfo();
String keyCloakInstanceUrl = configuration.getParameter(KeycloakConstants.KEYCLOAK_INSTANCE_URL);
String keycloakRealm = configuration.getParameter(KeycloakConstants.KEYCLOAK_REALM_NAME);
Expand Down Expand Up @@ -562,7 +568,7 @@ private String createJsonPayloadFromOauthApplication(OAuthApplicationInfo oAuthA

if (StringUtils.isNotEmpty(clientId)) {
paramMap.put(KeycloakConstants.KEYCLOAK_CLIENT_ID, clientId);
paramMap.put(KeycloakConstants.KEYCLOAK_ID, clientId);
//paramMap.put(KeycloakConstants.KEYCLOAK_ID, clientId);
}

String clientRedirectUri = oAuthApplicationInfo.getCallBackURL();
Expand Down Expand Up @@ -628,7 +634,15 @@ private JSONObject getParsedObjectByReader(BufferedReader reader) throws ParseEx
JSONObject parsedObject = null;
JSONParser parser = new JSONParser();
if (reader != null) {
parsedObject = (JSONObject) parser.parse(reader);
Object object = parser.parse(reader);

if(object instanceof JSONArray) {
JSONArray jsonArray = (JSONArray) object;
parsedObject = (JSONObject)jsonArray.get(0);
} else {
parsedObject = (JSONObject)object;
}

}
return parsedObject;
}
Expand Down Expand Up @@ -816,7 +830,43 @@ private String getClientSecret(String clientId) throws APIManagementException{
}
return null;
}


/**
* This method returns the Keycloak id with the given clientId in Keycloak
* @param clientId Client id of a client in Keycloak
* @return Keycloak id
* @throws APIManagementException This is the custom exception class for API management
*/
private String getKeycloakId(String clientId) throws APIManagementException{
String accessToken = getAccessToken();
String keyCloakInstanceUrl = configuration.getParameter(KeycloakConstants.KEYCLOAK_INSTANCE_URL);
String keycloakRealm = configuration.getParameter(KeycloakConstants.KEYCLOAK_REALM_NAME);
String clientSecretEndpoint = keyCloakInstanceUrl + KeycloakConstants.KEYCLOAK_ADMIN_CONTEXT + keycloakRealm +
KeycloakConstants.CLIENT_ENDPOINT + "?clientId=" + clientId;
try (CloseableHttpClient httpClient = HttpClientBuilder.create().build();) {
HttpGet httpGet = new HttpGet(clientSecretEndpoint);
httpGet.setHeader(KeycloakConstants.AUTHORIZATION, KeycloakConstants.AUTHENTICATION_BEARER + accessToken);
HttpResponse response = httpClient.execute(httpGet);
int statusCode = response.getStatusLine().getStatusCode();
if (HttpStatus.SC_OK == statusCode) {
HttpEntity entity = response.getEntity();
try (BufferedReader reader = new BufferedReader(new InputStreamReader(entity.getContent(), KeycloakConstants.UTF_8));) {
JSONObject responseJSON = getParsedObjectByReader(reader);
return (String)responseJSON.get(KeycloakConstants.KEYCLOAK_ID);
}
}
} catch (ParseException e) {
handleException(KeycloakConstants.ERROR_WHILE_PARSE_RESPONSE, e);
} catch (UnsupportedEncodingException e) {
handleException(KeycloakConstants.ERROR_ENCODING_METHOD_NOT_SUPPORTED, e);
} catch (ClientProtocolException e) {
handleException("HTTP request error has occurred while sending request to OAuth provider. ", e);
} catch (IOException e) {
handleException(KeycloakConstants.ERROR_OCCURRED_WHILE_READ_OR_CLOSE_BUFFER_READER, e);
}
return null;
}

/**
* This method returns the client representation related of a client with the given clientId in Keycloak
* @param clientId Client id of a client in Keycloak
Expand All @@ -828,7 +878,7 @@ private JSONObject getClientById(String clientId) throws APIManagementException{
String keyCloakInstanceUrl = configuration.getParameter(KeycloakConstants.KEYCLOAK_INSTANCE_URL);
String keycloakRealm = configuration.getParameter(KeycloakConstants.KEYCLOAK_REALM_NAME);
String clientSecretEndpoint = keyCloakInstanceUrl + KeycloakConstants.KEYCLOAK_ADMIN_CONTEXT + keycloakRealm +
KeycloakConstants.CLIENT_ENDPOINT + clientId;
KeycloakConstants.CLIENT_ENDPOINT + "?clientId=" + clientId;
try (CloseableHttpClient httpClient = HttpClientBuilder.create().build();) {
HttpGet httpGet = new HttpGet(clientSecretEndpoint);
httpGet.setHeader(KeycloakConstants.AUTHORIZATION, KeycloakConstants.AUTHENTICATION_BEARER + accessToken);
Expand Down

0 comments on commit 7c90643

Please sign in to comment.