From f41b7b047a15dc5a4ac3346e6f721ec3eec3b6c7 Mon Sep 17 00:00:00 2001
From: Ike Johnson-Woods <contact@ike.au>
Date: Wed, 16 Aug 2023 15:36:29 +0800
Subject: [PATCH] Update to Keycloak 22.0.1

---
 pom.xml                                       | 10 +++----
 .../discord/DiscordIdentityProvider.java      |  2 +-
 .../DiscordIdentityProviderFactory.java       | 27 +++++++++++++++++--
 3 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2d6cdb1..77fb68f 100755
--- a/pom.xml
+++ b/pom.xml
@@ -7,11 +7,11 @@
 
     <groupId>org.keycloak.extensions</groupId>
     <artifactId>keycloak-discord</artifactId>
-    <version>0.4.2-SNAPSHOT</version>
+    <version>0.5.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <properties>
-        <version.keycloak>20.0.0</version.keycloak>
+        <version.keycloak>22.0.1</version.keycloak>
     </properties>
 
     <dependencies>
@@ -46,10 +46,10 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
+                <version>3.11.0</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>17</source>
+                    <target>17</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 3b3ba2b..e97e35a 100755
--- a/src/main/java/org/keycloak/social/discord/DiscordIdentityProvider.java
+++ b/src/main/java/org/keycloak/social/discord/DiscordIdentityProvider.java
@@ -33,7 +33,7 @@ import org.keycloak.models.KeycloakSession;
 import org.keycloak.services.ErrorPageException;
 import org.keycloak.services.messages.Messages;
 
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
diff --git a/src/main/java/org/keycloak/social/discord/DiscordIdentityProviderFactory.java b/src/main/java/org/keycloak/social/discord/DiscordIdentityProviderFactory.java
index 1e9cfd3..3e31a2b 100755
--- a/src/main/java/org/keycloak/social/discord/DiscordIdentityProviderFactory.java
+++ b/src/main/java/org/keycloak/social/discord/DiscordIdentityProviderFactory.java
@@ -1,3 +1,4 @@
+
 /*
  * Copyright 2018 Red Hat, Inc. and/or its affiliates
  * and other contributors as indicated by the @author tags.
@@ -17,11 +18,14 @@
 
 package org.keycloak.social.discord;
 
-import org.keycloak.broker.oidc.OAuth2IdentityProviderConfig;
 import org.keycloak.broker.provider.AbstractIdentityProviderFactory;
 import org.keycloak.broker.social.SocialIdentityProviderFactory;
 import org.keycloak.models.IdentityProviderModel;
 import org.keycloak.models.KeycloakSession;
+import org.keycloak.provider.ProviderConfigProperty;
+import org.keycloak.provider.ProviderConfigurationBuilder;
+
+import java.util.List;
 
 /**
  * @author <a href="mailto:wadahiro@gmail.com">Hiroyuki Wada</a>
@@ -46,8 +50,27 @@ public class DiscordIdentityProviderFactory extends AbstractIdentityProviderFact
         return new DiscordIdentityProviderConfig();
     }
 
+    @Override
+    public List<ProviderConfigProperty> getConfigProperties() {
+        return ProviderConfigurationBuilder.create()
+                .property()
+                .name("allowedGuilds")
+                .type(ProviderConfigProperty.STRING_TYPE)
+                .label("Guild Id(s) to allow federation")
+                .helpText("If you want to allow federation for specific guild, enter the guild id. Please use a comma as a separator for multiple guilds.")
+                .add()
+//                .create()
+                .property()
+                .name("mappedRoles")
+                .type(ProviderConfigProperty.STRING_TYPE)
+                .label("Discord Roles mapping")
+                .helpText("Map Discord roles to Keycloak groups. The expected format is '<guild_id>:<role_id>:<group_name>'. Use a comma as a separator for multiple mappings.")
+                .add()
+                .build();
+    }
+
     @Override
     public String getId() {
         return PROVIDER_ID;
     }
-}
\ No newline at end of file
+}