From b7019883a724bf77a09e67b6a57732d89725894f Mon Sep 17 00:00:00 2001 From: YuriyZ Date: Tue, 28 Dec 2021 17:35:03 +0200 Subject: [PATCH] feat(jans-auth-server): code clean up https://github.com/JanssenProject/jans-auth-server/issues/27 --- .../io/jans/as/server/session/ws/rs/EndSessionUtils.java | 6 +++--- .../io/jans/as/server/session/ws/rs/LogoutTokenFactory.java | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/server/src/main/java/io/jans/as/server/session/ws/rs/EndSessionUtils.java b/server/src/main/java/io/jans/as/server/session/ws/rs/EndSessionUtils.java index b13ef116d22..873f2cf2ffe 100644 --- a/server/src/main/java/io/jans/as/server/session/ws/rs/EndSessionUtils.java +++ b/server/src/main/java/io/jans/as/server/session/ws/rs/EndSessionUtils.java @@ -28,7 +28,7 @@ */ public class EndSessionUtils { - private final static Logger log = LoggerFactory.getLogger(EndSessionUtils.class); + private static final Logger log = LoggerFactory.getLogger(EndSessionUtils.class); private EndSessionUtils() { } @@ -41,9 +41,9 @@ public static void callRpWithBackchannelUri(final String backchannelLogoutUri, S javax.ws.rs.client.Client client = ((ResteasyClientBuilder) ClientBuilder.newBuilder()).httpEngine(ClientFactory.instance().createEngine(true)).build(); WebTarget target = client.target(backchannelLogoutUri); - log.debug("Calling RP with backchannel, backchannel_logout_uri: " + backchannelLogoutUri); + log.debug("Calling RP with backchannel, backchannel_logout_uri: {}", backchannelLogoutUri); try (Response response = target.request().post(Entity.form(new Form("logout_token", logoutToken)))) { - log.debug("Backchannel RP response, status: " + response.getStatus() + ", backchannel_logout_uri" + backchannelLogoutUri); + log.debug("Backchannel RP response, status: {}, backchannel_logout_uri: {}", response.getStatus(), backchannelLogoutUri); } catch (Exception e) { log.error("Failed to call backchannel_logout_uri" + backchannelLogoutUri + ", message: " + e.getMessage(), e); } diff --git a/server/src/main/java/io/jans/as/server/session/ws/rs/LogoutTokenFactory.java b/server/src/main/java/io/jans/as/server/session/ws/rs/LogoutTokenFactory.java index 54f56ff1836..7ad5c014eea 100644 --- a/server/src/main/java/io/jans/as/server/session/ws/rs/LogoutTokenFactory.java +++ b/server/src/main/java/io/jans/as/server/session/ws/rs/LogoutTokenFactory.java @@ -14,6 +14,7 @@ import io.jans.as.server.model.token.JwrService; import io.jans.as.server.service.SectorIdentifierService; import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.BooleanUtils; import org.json.JSONObject; import org.msgpack.core.Preconditions; import org.slf4j.Logger; @@ -58,7 +59,7 @@ public JsonWebResponse createLogoutToken(Client rpClient, String outsideSid, Use jwrService.encode(jwr, rpClient); return jwr; } catch (Exception e) { - log.error("Failed to create logout_token for client:" + rpClient.getClientId()); + log.error("Failed to create logout_token for client: {}", rpClient.getClientId()); return null; } } @@ -77,7 +78,7 @@ private void fillClaims(JsonWebResponse jwr, Client client, String outsideSid, U jwr.getClaims().setClaim("events", getLogoutTokenEvents()); Audience.setAudience(jwr.getClaims(), client); - if (StringUtils.isNotBlank(outsideSid) && client.getAttributes().getBackchannelLogoutSessionRequired()) { + if (StringUtils.isNotBlank(outsideSid) && BooleanUtils.isTrue(client.getAttributes().getBackchannelLogoutSessionRequired())) { jwr.getClaims().setClaim("sid", outsideSid); }