inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

REPO-4915 - bump keycloak to 9.0.2 (#916)

Browse Source
This commit is contained in:
antoniojfelix
2020-04-02 13:12:19 +01:00
committed by GitHub
parent 9ad1b364cf
commit 74b888e6f0
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -60,7 +60,7 @@
<dependency.mariadb.version>2.6.0</dependency.mariadb.version> <dependency.mariadb.version>2.6.0</dependency.mariadb.version>
<dependency.antlr.version>3.5.2</dependency.antlr.version> <dependency.antlr.version>3.5.2</dependency.antlr.version>
<!-- REPO-4964 --> <!-- REPO-4964 -->
<dependency.keycloak.version>7.0.0</dependency.keycloak.version> <dependency.keycloak.version>9.0.2</dependency.keycloak.version>
<dependency.jboss.logging.version>3.4.1.Final</dependency.jboss.logging.version> <dependency.jboss.logging.version>3.4.1.Final</dependency.jboss.logging.version>
<dependency.camel.version>2.24.2</dependency.camel.version> <dependency.camel.version>2.24.2</dependency.camel.version>
<dependency.activemq.version>5.15.12</dependency.activemq.version> <dependency.activemq.version>5.15.12</dependency.activemq.version>

7
src/main/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceDeploymentFactoryBean.java
View File

@@ -31,8 +31,10 @@ import org.apache.http.client.HttpClient;
import org.keycloak.adapters.HttpClientBuilder; import org.keycloak.adapters.HttpClientBuilder;
import org.keycloak.adapters.KeycloakDeployment; import org.keycloak.adapters.KeycloakDeployment;
import org.keycloak.adapters.KeycloakDeploymentBuilder; import org.keycloak.adapters.KeycloakDeploymentBuilder;
import org.keycloak.common.util.KeycloakUriBuilder;
import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.FactoryBean;
import java.lang.reflect.Field;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
/** /**
@@ -56,6 +58,11 @@ public class IdentityServiceDeploymentFactoryBean implements FactoryBean<Keycloa
{ {
KeycloakDeployment deployment = KeycloakDeploymentBuilder.build(this.identityServiceConfig); KeycloakDeployment deployment = KeycloakDeploymentBuilder.build(this.identityServiceConfig);
Class myClass = deployment.getClass();
Field realmField = myClass.getDeclaredField("realmInfoUrl");
realmField.setAccessible(true);
realmField.set(deployment,this.identityServiceConfig.getAuthServerUrl() + "/realms/" + this.identityServiceConfig.getRealm());
// Set client with custom timeout values if client was created by the KeycloakDeploymentBuilder. // Set client with custom timeout values if client was created by the KeycloakDeploymentBuilder.
// This can be removed if the future versions of Keycloak accept timeout values through the config. // This can be removed if the future versions of Keycloak accept timeout values through the config.
if (deployment.getClient() != null) if (deployment.getClient() != null)