fix(jans-auth): npe during client registration #7703

Signed-off-by: YuriyZ <yzabrovarniy@gmail.com>
JanssenProject · Feb 14, 2024 · 125cb89 · 125cb89
1 parent 76b63e5
commit 125cb89
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/...uth-server/server/src/main/java/io/jans/as/server/register/ws/rs/RegisterJsonService.java b/...uth-server/server/src/main/java/io/jans/as/server/register/ws/rs/RegisterJsonService.java
@@ -24,6 +24,7 @@
 import jakarta.ejb.Stateless;
 import jakarta.inject.Inject;
 import jakarta.inject.Named;
+import org.apache.commons.collections.CollectionUtils;
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -151,10 +152,12 @@ public JSONObject getJSONObject(Client client) throws JSONException, StringEncry
             Util.addToJSONObjectIfNotNull(responseJsonObject, JWKS.toString(), new JSONObject(client.getJwks()));
         }
 
+        final List<String> backchannelLogoutUris = client.getAttributes().getBackchannelLogoutUri();
+
         // Logout params
         Util.addToJSONObjectIfNotNull(responseJsonObject, FRONT_CHANNEL_LOGOUT_URI.toString(), client.getFrontChannelLogoutUri());
         Util.addToJSONObjectIfNotNull(responseJsonObject, FRONT_CHANNEL_LOGOUT_SESSION_REQUIRED.toString(), client.getFrontChannelLogoutSessionRequired());
-        Util.addToJSONObjectIfNotNull(responseJsonObject, BACKCHANNEL_LOGOUT_URI.toString(), client.getAttributes().getBackchannelLogoutUri().iterator().next());
+        Util.addToJSONObjectIfNotNull(responseJsonObject, BACKCHANNEL_LOGOUT_URI.toString(), CollectionUtils.isNotEmpty(backchannelLogoutUris) ? backchannelLogoutUris.iterator().next() : null);
         Util.addToJSONObjectIfNotNull(responseJsonObject, BACKCHANNEL_LOGOUT_SESSION_REQUIRED.toString(), client.getAttributes().getBackchannelLogoutSessionRequired());
         Util.addToJSONObjectIfNotNull(responseJsonObject, REDIRECT_URIS_REGEX.toString(), client.getAttributes().getRedirectUrisRegex());