github
/
OpenID-Connect-Java-Spring-Server
mirror of https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

put null check into interceptor, addresses #183

pull/210/head
Justin Richer 2012-08-27 11:55:06 -04:00
parent 8361f74932
commit 259e84c871
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
openid-connect-server/src/main/java/org/mitre/openid/connect/web/UserInfoInterceptor.java
View File

@ -26,17 +26,19 @@ public class UserInfoInterceptor extends HandlerInterceptorAdapter {
@Override
public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception {
// get our principal
Principal p = request.getUserPrincipal();
if (p != null && p.getName() != null) {
// try to look up a user based on it
UserInfo user = userInfoRepository.getByUserId(p.getName());
if (modelAndView != null) { // skip checking at all if we have no model and view to hand the user to
// get our principal from the security context
Principal p = request.getUserPrincipal();
// if we have one, inject it so views can use it
if (user != null) {
modelAndView.addObject("userInfo", user);
if (p != null && p.getName() != null) { // don't bother checking if we don't have a principal
// try to look up a user based on it
UserInfo user = userInfoRepository.getByUserId(p.getName());
// if we have one, inject it so views can use it
if (user != null) {
modelAndView.addObject("userInfo", user);
}
}
}