From b8f8dcd8dbda94394e81aa6949e93bf6d6c6df3e Mon Sep 17 00:00:00 2001
From: Ike Johnson-Woods <contact@ike.au>
Date: Fri, 12 Jul 2024 00:16:29 +0800
Subject: [PATCH] Update to Keycloak v25

---
 pom.xml                                                   | 8 ++++----
 .../keycloak/social/discord/DiscordIdentityProvider.java  | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 04e7895..05b1ee7 100755
--- a/pom.xml
+++ b/pom.xml
@@ -7,11 +7,11 @@
 
     <groupId>org.keycloak.extensions</groupId>
     <artifactId>keycloak-discord</artifactId>
-    <version>0.5.2</version>
+    <version>0.5.3</version>
     <packaging>jar</packaging>
 
     <properties>
-        <version.keycloak>23.0.0</version.keycloak>
+        <version.keycloak>25.0.0</version.keycloak>
     </properties>
 
     <dependencies>
@@ -48,8 +48,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.11.0</version>
                 <configuration>
-                    <source>17</source>
-                    <target>17</target>
+                    <source>21</source>
+                    <target>21</target>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/src/main/java/org/keycloak/social/discord/DiscordIdentityProvider.java b/src/main/java/org/keycloak/social/discord/DiscordIdentityProvider.java
index 0414653..cc2423e 100755
--- a/src/main/java/org/keycloak/social/discord/DiscordIdentityProvider.java
+++ b/src/main/java/org/keycloak/social/discord/DiscordIdentityProvider.java
@@ -77,18 +77,18 @@ public class DiscordIdentityProvider extends AbstractOAuth2IdentityProvider<Disc
 
     @Override
     protected BrokeredIdentityContext extractIdentityFromProfile(EventBuilder event, JsonNode profile) {
-        BrokeredIdentityContext user = new BrokeredIdentityContext(getJsonProperty(profile, "id"));
-
+        String id = getJsonProperty(profile, "id");
         String username = getJsonProperty(profile, "username");
         String discriminator = getJsonProperty(profile, "discriminator");
 
+        BrokeredIdentityContext user = new BrokeredIdentityContext(id, getConfig());
+
         if (!"0".equals(discriminator)) {
             username += "#" + discriminator;
         }
 
         user.setUsername(username);
         user.setEmail(getJsonProperty(profile, "email"));
-        user.setIdpConfig(getConfig());
         user.setIdp(this);
 
         AbstractJsonUserAttributeMapper.storeUserProfileForMapper(user, profile, getConfig().getAlias());