From 585a7ed5777d2b8b4e5999ce6fc1b058d2545300 Mon Sep 17 00:00:00 2001
From: Kevin Paul <kevinpaul@live.at>
Date: Mon, 22 Dec 2025 14:57:26 +0100
Subject: [PATCH] refactor: use constants and simplify conditional logic

---
 .../social/discord/DiscordIdentityProvider.java     |  7 +++----
 .../discord/DiscordIdentityProviderConfig.java      | 13 ++++++++-----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/keycloak/social/discord/DiscordIdentityProvider.java b/src/main/java/org/keycloak/social/discord/DiscordIdentityProvider.java
index e346ab4..bc03d7e 100755
--- a/src/main/java/org/keycloak/social/discord/DiscordIdentityProvider.java
+++ b/src/main/java/org/keycloak/social/discord/DiscordIdentityProvider.java
@@ -131,11 +131,10 @@ public class DiscordIdentityProvider extends AbstractOAuth2IdentityProvider<Disc
             throw new IdentityBrokerException("Could not obtain user profile from discord.", e);
         }
 
-        if (getConfig().hasAllowedGuilds()) {
-            if (!isAllowedGuild(accessToken)) {
-                throw new ErrorPageException(session, Response.Status.FORBIDDEN, Messages.INVALID_REQUESTER);
-            }
+        if (getConfig().hasAllowedGuilds() && !isAllowedGuild(accessToken)) {
+            throw new ErrorPageException(session, Response.Status.FORBIDDEN, Messages.INVALID_REQUESTER);
         }
+
         return extractIdentityFromProfile(null, profile);
     }
 
diff --git a/src/main/java/org/keycloak/social/discord/DiscordIdentityProviderConfig.java b/src/main/java/org/keycloak/social/discord/DiscordIdentityProviderConfig.java
index 099a989..5ad9ead 100755
--- a/src/main/java/org/keycloak/social/discord/DiscordIdentityProviderConfig.java
+++ b/src/main/java/org/keycloak/social/discord/DiscordIdentityProviderConfig.java
@@ -30,6 +30,9 @@ import java.util.stream.Collectors;
  */
 public class DiscordIdentityProviderConfig extends OAuth2IdentityProviderConfig {
 
+    public static final String ALLOWED_GUILDS = "allowedGuilds";
+    public static final String PROMPT = "prompt";
+
     public DiscordIdentityProviderConfig(IdentityProviderModel model) {
         super(model);
     }
@@ -38,27 +41,27 @@ public class DiscordIdentityProviderConfig extends OAuth2IdentityProviderConfig
     }
 
     public String getAllowedGuilds() {
-        return getConfig().get("allowedGuilds");
+        return getConfig().get(ALLOWED_GUILDS);
     }
 
     public void setAllowedGuilds(String allowedGuilds) {
-        getConfig().put("allowedGuilds", allowedGuilds);
+        getConfig().put(ALLOWED_GUILDS, allowedGuilds);
     }
 
     public boolean hasAllowedGuilds() {
-        String guilds = getConfig().get("allowedGuilds");
+        String guilds = getConfig().get(ALLOWED_GUILDS);
         return guilds != null && !guilds.trim().isEmpty();
     }
 
     public Set<String> getAllowedGuildsAsSet() {
         if (hasAllowedGuilds()) {
-            String guilds = getConfig().get("allowedGuilds");
+            String guilds = getConfig().get(ALLOWED_GUILDS);
             return Arrays.stream(guilds.split(",")).map(x -> x.trim()).collect(Collectors.toSet());
         }
         return Collections.emptySet();
     }
 
     public void setPrompt(String prompt) {
-        getConfig().put("prompt", prompt);
+        getConfig().put(PROMPT, prompt);
     }
 }