diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/SignPrincipal.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/SignPrincipal.java index 38abddae0..ae7558dc4 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/SignPrincipal.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/SignPrincipal.java @@ -184,21 +184,35 @@ public class SignPrincipal implements UserDetails { } @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - builder.append("SigninPrincipal [userInfo="); - builder.append(userInfo); - builder.append(", onlineTicket="); - builder.append(session); - builder.append(", grantedAuthority="); - builder.append(grantedAuthority); - builder.append(", authenticated="); - builder.append(authenticated); - builder.append(", roleAdministrators="); - builder.append(roleAdministrators); - builder.append("]"); - return builder.toString(); - } + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("Principal [username="); + builder.append(getUsername()); + builder.append(", userInfo="); + builder.append(userInfo); + builder.append(", userDetails="); + builder.append(userDetails); + builder.append(", session="); + builder.append(session); + builder.append(", grantedAuthority="); + builder.append(grantedAuthority); + builder.append(", grantedAuthorityApps="); + builder.append(grantedAuthorityApps); + builder.append(", authenticated="); + builder.append(authenticated); + builder.append(", roleAdministrators="); + builder.append(roleAdministrators); + builder.append(", accountNonExpired="); + builder.append(accountNonExpired); + builder.append(", accountNonLocked="); + builder.append(accountNonLocked); + builder.append(", credentialsNonExpired="); + builder.append(credentialsNonExpired); + builder.append(", enabled="); + builder.append(enabled); + builder.append("]"); + return builder.toString(); + } diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/web/HttpSessionListenerAdapter.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/web/HttpSessionListenerAdapter.java index 55bcd60e1..169dace1e 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/web/HttpSessionListenerAdapter.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/web/HttpSessionListenerAdapter.java @@ -55,9 +55,9 @@ public class HttpSessionListenerAdapter implements HttpSessionListener { HttpSession session = sessionEvent.getSession(); Authentication authentication = (Authentication ) session.getAttribute(WebConstants.AUTHENTICATION); Object principal = authentication == null ? null : authentication.getPrincipal(); - + _logger.trace("principal {}",principal); if(principal != null ) { - if(principal instanceof SignPrincipal) { + if(principal instanceof SignPrincipal && ((SignPrincipal)principal).getUserInfo()!=null) { SignPrincipal signPrincipal = (SignPrincipal)principal; _logger.trace("{} HttpSession Id {} for userId {} , username {} @Ticket {} Destroyed" , DateUtils.formatDateTime(new Date()),