From 2ba33a5bf0b62d9fa7b27dab94999fae83da3c45 Mon Sep 17 00:00:00 2001
From: olivier le rigoleur <lerigoleur.olivier@gmail.com>
Date: Fri, 2 Aug 2024 10:17:52 +0200
Subject: [PATCH] make code compatible with kck 25.X Signed-off-by: olivier le
 rigoleur <lerigoleur.olivier@gmail.com>

---
 pom.xml                                        | 18 ++++++++++++++++--
 .../FranceConnectIdentityProvider.java         |  3 ++-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index c429b05..7e427da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>fr.insee.keycloak</groupId>
   <artifactId>keycloak-franceconnect</artifactId>
-  <version>6.5.0-SNAPSHOT</version>
+  <version>7.0.0-SNAPSHOT</version>
 
   <name>${project.groupId}:${project.artifactId}</name>
   <description>France Connect Openid-Connect Provider for Keycloak</description>
@@ -68,7 +68,7 @@
     <maven.source.plugin.version>3.3.0</maven.source.plugin.version>
     <maven.javadoc.plugin.version>3.5.0</maven.javadoc.plugin.version>
 
-    <keycloak.version>24.0.2</keycloak.version>
+    <keycloak.version>25.0.2</keycloak.version>
 
     <!-- Testing Tools -->
     <junit.jupiter.version>5.10.0</junit.jupiter.version>
@@ -158,6 +158,20 @@
   </build>
 
   <dependencies>
+
+    <dependency>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
+      <version>4.0.2</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-impl</artifactId>
+      <version>4.0.2</version>
+      <scope>runtime</scope>
+    </dependency>
+
     <dependency>
       <groupId>org.keycloak</groupId>
       <artifactId>keycloak-core</artifactId>
diff --git a/src/main/java/fr/insee/keycloak/providers/franceconnect/FranceConnectIdentityProvider.java b/src/main/java/fr/insee/keycloak/providers/franceconnect/FranceConnectIdentityProvider.java
index 7903392..4b723fe 100644
--- a/src/main/java/fr/insee/keycloak/providers/franceconnect/FranceConnectIdentityProvider.java
+++ b/src/main/java/fr/insee/keycloak/providers/franceconnect/FranceConnectIdentityProvider.java
@@ -86,8 +86,9 @@ public JsonWebToken validateToken(String encodedToken) {
   protected BrokeredIdentityContext extractIdentity(
       AccessTokenResponse tokenResponse, String accessToken, JsonWebToken idToken)
       throws IOException {
+    var config = getConfig();
     var id = idToken.getSubject();
-    var identity = new BrokeredIdentityContext(id);
+    var identity = new BrokeredIdentityContext(id, config);
 
     var name = (String) idToken.getOtherClaims().get(IDToken.NAME);
     var givenName = (String) idToken.getOtherClaims().get(IDToken.GIVEN_NAME);