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

RPT endpoint cleanup

pull/708/merge
Justin Richer 2015-05-11 15:28:09 -04:00
parent 1f083c7acb
commit f4f08d9449
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
openid-connect-server/src/main/java/org/mitre/uma/web/AuthorizationRequestEndpoint.java
View File

@ -119,10 +119,10 @@ public class AuthorizationRequestEndpoint {
if (o.has(TICKET)) { if (o.has(TICKET)) {
OAuth2AccessTokenEntity rpt = null; OAuth2AccessTokenEntity incomingRpt = null;
if (o.has(RPT)) { if (o.has(RPT)) {
String rptValue = o.get(RPT).getAsString(); String rptValue = o.get(RPT).getAsString();
rpt = tokenService.readAccessToken(rptValue); incomingRpt = tokenService.readAccessToken(rptValue);
} }
String ticketValue = o.get(TICKET).getAsString(); String ticketValue = o.get(TICKET).getAsString();
@ -152,6 +152,11 @@ public class AuthorizationRequestEndpoint {
OAuth2Authentication o2auth = (OAuth2Authentication) auth; OAuth2Authentication o2auth = (OAuth2Authentication) auth;
OAuth2AccessTokenEntity token = umaTokenService.createRequestingPartyToken(o2auth, ticket); OAuth2AccessTokenEntity token = umaTokenService.createRequestingPartyToken(o2auth, ticket);
// if we have an inbound RPT, throw it out because we're replacing it
if (incomingRpt != null) {
tokenService.revokeAccessToken(incomingRpt);
}
Map<String, String> entity = ImmutableMap.of("rpt", token.getValue()); Map<String, String> entity = ImmutableMap.of("rpt", token.getValue());
@ -164,7 +169,7 @@ public class AuthorizationRequestEndpoint {
// if we got here, the claim didn't match, forward the user to the claim gathering endpoint // if we got here, the claim didn't match, forward the user to the claim gathering endpoint
JsonObject entity = new JsonObject(); JsonObject entity = new JsonObject();
entity.addProperty("error", "need_info"); entity.addProperty(JsonErrorView.ERROR, "need_info");
JsonObject details = new JsonObject(); JsonObject details = new JsonObject();
JsonObject rpClaims = new JsonObject(); JsonObject rpClaims = new JsonObject();