From 8d0662c07ef90f0413e9521b65d616fbc2f149eb Mon Sep 17 00:00:00 2001
From: Jeroen Nederlof <jeroen@nederlof.dev>
Date: Sat, 8 Mar 2025 19:48:17 +0100
Subject: [PATCH] Changed version to 0.7.0 and updated CHANGELOG.md

---
 CHANGELOG.md                                  | 23 ++++---------------
 pom.xml                                       |  2 +-
 .../oidc/mappers/ClaimToGroupMapper.java      |  7 +-----
 3 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8a12dd6..a16d8ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,23 +1,8 @@
-# 1.0.0 (2025-03-03)
-
-
-### Bug Fixes
-
-* eliminate the possibility of NullPointerException ([#56](https://github.com/maaroen/keycloak-discord/issues/56)) ([e2b5991](https://github.com/maaroen/keycloak-discord/commit/e2b5991c7ef33ee3ac6483ca00e3e854bb935371))
-* ignore discriminator if the value is "0" ([4c68b69](https://github.com/maaroen/keycloak-discord/commit/4c68b69b0bf0d6421589e03e4baf8bbbe5138caa))
-* update authorization URL ([#28](https://github.com/maaroen/keycloak-discord/issues/28)) ([a31c116](https://github.com/maaroen/keycloak-discord/commit/a31c116092183318fdbe09fa059a1f63bb0d794c))
-* update discord api endpoint urls ([0aa7f14](https://github.com/maaroen/keycloak-discord/commit/0aa7f14edf48a5f9e8a75a68f530cfb1945935e9))
-* use DiscordIdentityProvider class in instantiating the Logger ([93003c2](https://github.com/maaroen/keycloak-discord/commit/93003c28bc377577b5d4b218e3d89d984a3f1ae6))
-
-
+# 0.7.0 (2025-03-08)
 ### Features
-
-* implement IdentityProviderFactory#createConfig() which is ([9f359f5](https://github.com/maaroen/keycloak-discord/commit/9f359f5f61848131f1b19994a2c75d6955bb9b27))
-* update to keycloak 17.0.0 (based on Quarkus) ([f24ed18](https://github.com/maaroen/keycloak-discord/commit/f24ed1801141da1fbb58d0a58fafdb5aeb0bfa6e))
-* update to keycloak 22.0.1 (support new admin console) ([#37](https://github.com/maaroen/keycloak-discord/issues/37)) ([2c8da2d](https://github.com/maaroen/keycloak-discord/commit/2c8da2da4b48ea081644deb7fc11931aba55ba8f))
-* update to keycloak 26.0.5 ([05a3df4](https://github.com/maaroen/keycloak-discord/commit/05a3df43f21289762f72e3ac6780fd6b543d8c07))
-* updated provider for Keycloak 25.x ([#49](https://github.com/maaroen/keycloak-discord/issues/49)) ([c10480b](https://github.com/maaroen/keycloak-discord/commit/c10480b79864a85817d20d48f949475020322090))
-* use "Theme Resources" for the custom template ([7cb885c](https://github.com/maaroen/keycloak-discord/commit/7cb885cea7ae317ae071a2ac72956faa67d4fdf9))
+* Updated to keycloak 26.1.3
+* Added Discord role syncing support (work done by [NotActuallyTerry](https://github.com/NotActuallyTerry/keycloak-discord))
+* Added a fix to also sync roles (delete all) if no roles were returned for the discord guild (Inspired by [pierrearma](https://github.com/NotActuallyTerry/keycloak-discord/pull/2))
 
 ## [0.6.1](https://github.com/wadahiro/keycloak-discord/compare/v0.6.0...v0.6.1) (2024-11-02)
 
diff --git a/pom.xml b/pom.xml
index 1a13786..44476d2 100755
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>org.keycloak.extensions</groupId>
     <artifactId>keycloak-discord</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>0.7.0</version>
     <packaging>jar</packaging>
 
     <properties>
diff --git a/src/main/java/br/com/luizcarlosvianamelo/keycloak/broker/oidc/mappers/ClaimToGroupMapper.java b/src/main/java/br/com/luizcarlosvianamelo/keycloak/broker/oidc/mappers/ClaimToGroupMapper.java
index 18f5384..b3200f5 100644
--- a/src/main/java/br/com/luizcarlosvianamelo/keycloak/broker/oidc/mappers/ClaimToGroupMapper.java
+++ b/src/main/java/br/com/luizcarlosvianamelo/keycloak/broker/oidc/mappers/ClaimToGroupMapper.java
@@ -137,17 +137,14 @@ public class ClaimToGroupMapper extends AbstractClaimMapper {
         JsonNode profileJsonNode = (JsonNode) context.getContextData().get(OIDCIdentityProvider.USER_INFO);
         var roles = AbstractJsonUserAttributeMapper.getJsonValue(profileJsonNode, claim);
         if(roles == null) {
-            logger.debugf("MAAROENTEST: Result was null");
             return new ArrayList<>();
         }
         // convert to string list if not list
         List<String> newList = new ArrayList<>();
         if (!List.class.isAssignableFrom(roles.getClass())) {
-            logger.debugf("MAAROENTEST: Result was single item");
             newList.add(roles.toString());
         }
         else {
-            logger.debugf("MAAROENTEST: Result was list");
             newList = (List<String>)roles;
         }
         return newList;
@@ -166,11 +163,9 @@ public class ClaimToGroupMapper extends AbstractClaimMapper {
 
         // get new groups
         List<String> newGroupsList = getClaimValue(context, groupClaimName);
-        logger.debugf("MAAROENTEST: Amount of newGroups: [%s]", newGroupsList.size());
         boolean clearRolesIfNone = Boolean.parseBoolean(mapperModel.getConfig().get(CLEAR_ROLES_IF_NONE));
         // Clear roles if config option enabled
         if (newGroupsList.isEmpty() && !clearRolesIfNone) {
-            logger.debugf("MAAROENTEST: Skipped import ");
             logger.debugf("Realm [%s], IdP [%s]: no group claim (claim name: [%s]) for user [%s], ignoring...",
                     realm.getName(),
                     mapperModel.getIdentityProviderAlias(),
@@ -289,6 +284,6 @@ public class ClaimToGroupMapper extends AbstractClaimMapper {
     }
 
     private static boolean isEmpty(String str) {
-        return str == null || str.length() == 0;
+        return str == null || str.isEmpty();
     }
 }