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

cleanup view

pull/516/head
Justin Richer 2013-09-26 17:07:38 -04:00
parent 7a4366c083
commit 2a34994383
1 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
openid-connect-server/src/main/java/org/mitre/openid/connect/view/UserInfoView.java
View File

@ -31,33 +31,29 @@ import org.springframework.stereotype.Component;
import org.springframework.validation.BeanPropertyBindingResult; import org.springframework.validation.BeanPropertyBindingResult;
import org.springframework.web.servlet.view.AbstractView; import org.springframework.web.servlet.view.AbstractView;
import com.google.common.base.Strings;
import com.google.gson.ExclusionStrategy; import com.google.gson.ExclusionStrategy;
import com.google.gson.FieldAttributes; import com.google.gson.FieldAttributes;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import com.google.gson.JsonParser; import com.google.gson.JsonParser;
@Component("userInfoView") @Component("userInfoView")
public class UserInfoView extends AbstractView { public class UserInfoView extends AbstractView {
private static JsonParser jsonParser = new JsonParser(); private static JsonParser jsonParser = new JsonParser();
private static Logger logger = LoggerFactory.getLogger(UserInfoView.class); private static Logger logger = LoggerFactory.getLogger(UserInfoView.class);
private Gson gson = new GsonBuilder()
.setExclusionStrategies(new ExclusionStrategy() {
//@Override private Gson gson = new GsonBuilder().setExclusionStrategies(new ExclusionStrategy() {
@Override
public boolean shouldSkipField(FieldAttributes f) { public boolean shouldSkipField(FieldAttributes f) {
return false; return false;
} }
//@Override @Override
public boolean shouldSkipClass(Class<?> clazz) { public boolean shouldSkipClass(Class<?> clazz) {
// skip the JPA binding wrapper // skip the JPA binding wrapper
if (clazz.equals(BeanPropertyBindingResult.class)) { if (clazz.equals(BeanPropertyBindingResult.class)) {
@ -68,8 +64,13 @@ public class UserInfoView extends AbstractView {
}).create(); }).create();
/* (non-Javadoc) /*
* @see org.springframework.web.servlet.view.AbstractView#renderMergedOutputModel(java.util.Map, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) * (non-Javadoc)
*
* @see
* org.springframework.web.servlet.view.AbstractView#renderMergedOutputModel
* (java.util.Map, javax.servlet.http.HttpServletRequest,
* javax.servlet.http.HttpServletResponse)
*/ */
@Override @Override
protected void renderMergedOutputModel(Map<String, Object> model, HttpServletRequest request, HttpServletResponse response) { protected void renderMergedOutputModel(Map<String, Object> model, HttpServletRequest request, HttpServletResponse response) {
@ -77,21 +78,7 @@ public class UserInfoView extends AbstractView {
UserInfo userInfo = (UserInfo) model.get("userInfo"); UserInfo userInfo = (UserInfo) model.get("userInfo");
Set<String> scope = (Set<String>) model.get("scope"); Set<String> scope = (Set<String>) model.get("scope");
String claimsRequestJsonString = (String) model.get("claimsRequest");
// getting the 'claims request parameter' from the model
JsonObject claimsRequest = null;
if (!Strings.isNullOrEmpty(claimsRequestJsonString)) {
JsonElement parsed = jsonParser.parse(claimsRequestJsonString);
if (parsed.isJsonObject()) {
claimsRequest = parsed.getAsJsonObject();
} else {
// claimsRequest stays null
logger.warn("Claims parameter not a valid JSON object: " + claimsRequestJsonString);
}
}
response.setContentType("application/json"); response.setContentType("application/json");
Writer out; Writer out;