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

userinfo endpoint now uses OAuth2Authentication exclusively 

(which is all it was really doing before)
pull/516/head
Justin Richer 2013-09-10 14:16:34 -04:00
parent ac42c00062
commit 29d1c7d54a
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
openid-connect-server/src/main/java/org/mitre/openid/connect/web/UserInfoEndpoint.java
View File

@ -53,15 +53,15 @@ public class UserInfoEndpoint {
*/
@PreAuthorize("hasRole('ROLE_USER') and #oauth2.hasScope('openid')")
@RequestMapping(value="/userinfo", method= {RequestMethod.GET, RequestMethod.POST}, produces = "application/json")
public String getInfo(@RequestParam(value="claims", required=false) String claimsRequestJsonString, Principal p, Model model) {
public String getInfo(@RequestParam(value="claims", required=false) String claimsRequestJsonString, OAuth2Authentication auth, Model model) {
if (p == null) {
if (auth == null) {
logger.error("getInfo failed; no principal. Requester is not authorized.");
model.addAttribute("code", HttpStatus.FORBIDDEN);
return "httpCodeView";
}
String username = p.getName();
String username = auth.getName();
UserInfo userInfo = userInfoService.getByUsername(username);
if (userInfo == null) {
@ -74,12 +74,8 @@ public class UserInfoEndpoint {
model.addAttribute("claimsRequest", claimsRequestJsonString);
}
if (p instanceof OAuth2Authentication) {
OAuth2Authentication authentication = (OAuth2Authentication)p;
model.addAttribute("scope", authentication.getOAuth2Request().getScope());
model.addAttribute("requestObject", authentication.getOAuth2Request().getRequestParameters().get("request"));
}
model.addAttribute("scope", auth.getOAuth2Request().getScope());
model.addAttribute("requestObject", auth.getOAuth2Request().getRequestParameters().get("request"));
model.addAttribute("userInfo", userInfo);