From cd1b82d39e2f57ab773fd4ac7a7c6711c2f7757a Mon Sep 17 00:00:00 2001
From: Hiroyuki Wada <wadahiro@gmail.com>
Date: Sun, 4 Nov 2018 00:56:52 +0900
Subject: [PATCH] Fix username mapping because discord allows same username.
 Need to user "discriminator" for unique username.

---
 .../org/keycloak/social/discord/DiscordIdentityProvider.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ejb/src/main/java/org/keycloak/social/discord/DiscordIdentityProvider.java b/ejb/src/main/java/org/keycloak/social/discord/DiscordIdentityProvider.java
index ec92293..c35c97a 100755
--- a/ejb/src/main/java/org/keycloak/social/discord/DiscordIdentityProvider.java
+++ b/ejb/src/main/java/org/keycloak/social/discord/DiscordIdentityProvider.java
@@ -65,8 +65,7 @@ public class DiscordIdentityProvider extends AbstractOAuth2IdentityProvider<OAut
     protected BrokeredIdentityContext extractIdentityFromProfile(EventBuilder event, JsonNode profile) {
         BrokeredIdentityContext user = new BrokeredIdentityContext(getJsonProperty(profile, "id"));
 
-        user.setUsername(getJsonProperty(profile, "username"));
-//        user.setName(getJsonProperty(profile, "username"));
+        user.setUsername(getJsonProperty(profile, "username") + "#" + getJsonProperty(profile, "discriminator"));
         user.setEmail(getJsonProperty(profile, "email"));
         user.setIdpConfig(getConfig());
         user.setIdp(this);
@@ -81,7 +80,7 @@ public class DiscordIdentityProvider extends AbstractOAuth2IdentityProvider<OAut
         log.debug("doGetFederatedIdentity()");
         try {
             JsonNode profile = SimpleHttp.doGet(PROFILE_URL, session).header("Authorization", "Bearer " + accessToken).asJson();
-//            System.out.println(profile.toString());
+            
             return extractIdentityFromProfile(null, profile);
         } catch (Exception e) {
             throw new IdentityBrokerException("Could not obtain user profile from discord.", e);