From 74b888e6f05fc87aa3ae89c3bee88fd758ca00b2 Mon Sep 17 00:00:00 2001
From: antoniojfelix <antonio.felix@texter.ai>
Date: Thu, 2 Apr 2020 13:12:19 +0100
Subject: [PATCH] REPO-4915 - bump keycloak to 9.0.2 (#916)

---
 pom.xml                                                    | 2 +-
 .../IdentityServiceDeploymentFactoryBean.java              | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d08ed7cb29..ff4633ae98 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
         <dependency.mariadb.version>2.6.0</dependency.mariadb.version>
         <dependency.antlr.version>3.5.2</dependency.antlr.version>
         <!-- 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.camel.version>2.24.2</dependency.camel.version>
         <dependency.activemq.version>5.15.12</dependency.activemq.version>
diff --git a/src/main/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceDeploymentFactoryBean.java b/src/main/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceDeploymentFactoryBean.java
index fc26f6f7bc..61be50cc24 100644
--- a/src/main/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceDeploymentFactoryBean.java
+++ b/src/main/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceDeploymentFactoryBean.java
@@ -31,8 +31,10 @@ import org.apache.http.client.HttpClient;
 import org.keycloak.adapters.HttpClientBuilder;
 import org.keycloak.adapters.KeycloakDeployment;
 import org.keycloak.adapters.KeycloakDeploymentBuilder;
+import org.keycloak.common.util.KeycloakUriBuilder;
 import org.springframework.beans.factory.FactoryBean;
 
+import java.lang.reflect.Field;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -56,6 +58,11 @@ public class IdentityServiceDeploymentFactoryBean implements FactoryBean<Keycloa
     {
         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.
         // This can be removed if the future versions of Keycloak accept timeout values through the config.
         if (deployment.getClient() != null)