make user info interceptor more compatible with standalone OIDC client software (with no user info service)
parent
dfdc4ed52d
commit
943fae25a1
|
@ -59,7 +59,7 @@ public class UserInfoInterceptor extends HandlerInterceptorAdapter {
|
||||||
})
|
})
|
||||||
.create();
|
.create();
|
||||||
|
|
||||||
@Autowired
|
@Autowired (required = false)
|
||||||
private UserInfoService userInfoService;
|
private UserInfoService userInfoService;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -85,7 +85,8 @@ public class UserInfoInterceptor extends HandlerInterceptorAdapter {
|
||||||
modelAndView.addObject("userInfo", oidc.getUserInfo());
|
modelAndView.addObject("userInfo", oidc.getUserInfo());
|
||||||
modelAndView.addObject("userInfoJson", oidc.getUserInfo().toJson());
|
modelAndView.addObject("userInfoJson", oidc.getUserInfo().toJson());
|
||||||
} else {
|
} else {
|
||||||
if (p != null && p.getName() != null) { // don't bother checking if we don't have a principal
|
// don't bother checking if we don't have a principal or a userInfoService to work with
|
||||||
|
if (p != null && p.getName() != null && userInfoService != null) {
|
||||||
|
|
||||||
// try to look up a user based on the principal's name
|
// try to look up a user based on the principal's name
|
||||||
UserInfo user = userInfoService.getByUsername(p.getName());
|
UserInfo user = userInfoService.getByUsername(p.getName());
|
||||||
|
|
Loading…
Reference in New Issue