diff --git a/components/keycloak.key.manager/src/main/java/org/wso2/keycloak/client/KeyCloakConnectorConfiguration.java b/components/keycloak.key.manager/src/main/java/org/wso2/keycloak/client/KeyCloakConnectorConfiguration.java index 347141e..8fe4d57 100644 --- a/components/keycloak.key.manager/src/main/java/org/wso2/keycloak/client/KeyCloakConnectorConfiguration.java +++ b/components/keycloak.key.manager/src/main/java/org/wso2/keycloak/client/KeyCloakConnectorConfiguration.java @@ -15,8 +15,7 @@ @Component( name = "keycloak.configuration.component", immediate = true, - service = KeyManagerConnectorConfiguration.class, - property = {"type=" + KeycloakConstants.KEY_CLOAK_TYPE} + service = KeyManagerConnectorConfiguration.class ) public class KeyCloakConnectorConfiguration implements KeyManagerConnectorConfiguration { @@ -69,4 +68,10 @@ public List getApplicationConfigurations() { false, Arrays.asList("false", "true"), false)); return configurationDtoList; } + + @Override + public String getType() { + + return KeycloakConstants.KEY_CLOAK_TYPE; + } } diff --git a/components/keycloak.key.manager/src/main/java/org/wso2/keycloak/client/KeycloakClient.java b/components/keycloak.key.manager/src/main/java/org/wso2/keycloak/client/KeycloakClient.java index 72d4025..b62852c 100644 --- a/components/keycloak.key.manager/src/main/java/org/wso2/keycloak/client/KeycloakClient.java +++ b/components/keycloak.key.manager/src/main/java/org/wso2/keycloak/client/KeycloakClient.java @@ -79,7 +79,6 @@ public class KeycloakClient extends AbstractKeyManager { private static final Log log = LogFactory.getLog(KeycloakClient.class); - private KeyManagerConfiguration configuration; private DCRClient dcrClient; private IntrospectionClient introspectionClient; @@ -241,7 +240,9 @@ public org.wso2.carbon.apimgt.api.model.AccessTokenInfo getTokenMetaData(String tokenInfo.setValidityPeriod(introspectInfo.getExpiryTime() - introspectInfo.getIssuedAt()); tokenInfo.setEndUserName(introspectInfo.getUsername()); tokenInfo.setConsumerKey(introspectInfo.getConsumerKey()); - tokenInfo.setScope(introspectInfo.getScope().split("\\s+")); + if (StringUtils.isNotEmpty(introspectInfo.getScope())) { + tokenInfo.setScope(introspectInfo.getScope().split("\\s+")); + } tokenInfo.addParameter(KeycloakConstants.ACCESS_TOKEN_ISSUER, introspectInfo.getIssuer()); tokenInfo.addParameter(KeycloakConstants.ACCESS_TOKEN_IDENTIFIER, introspectInfo.getJti()); } diff --git a/pom.xml b/pom.xml index a4fd58e..6cd6a4e 100644 --- a/pom.xml +++ b/pom.xml @@ -234,7 +234,7 @@ - 6.7.52 + 6.7.165 1.1 2.1 1.5.3 @@ -245,4 +245,4 @@ - \ No newline at end of file +