diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/view/ExceptionAsJSONView.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/view/ExceptionAsJSONView.java index c6f2293ad..fe6d9e977 100644 --- a/openid-connect-server/src/main/java/org/mitre/openid/connect/view/ExceptionAsJSONView.java +++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/view/ExceptionAsJSONView.java @@ -21,6 +21,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.springframework.stereotype.Component; import org.springframework.web.servlet.view.AbstractView; import com.google.gson.JsonObject; @@ -29,6 +30,7 @@ import com.google.gson.JsonObject; * @author nemonik * */ +@Component("exceptionAsJSONView") public class ExceptionAsJSONView extends AbstractView { /* diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/view/JSONClientView.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/view/JSONClientView.java index f34c5dfb7..4785e8a17 100644 --- a/openid-connect-server/src/main/java/org/mitre/openid/connect/view/JSONClientView.java +++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/view/JSONClientView.java @@ -12,6 +12,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.springframework.stereotype.Component; import org.springframework.validation.BeanPropertyBindingResult; import org.springframework.web.servlet.view.AbstractView; @@ -20,6 +21,7 @@ import com.google.gson.FieldAttributes; import com.google.gson.Gson; import com.google.gson.GsonBuilder; +@Component("jsonClientView") public class JSONClientView extends AbstractView { /* (non-Javadoc) diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/view/JSONIdTokenView.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/view/JSONIdTokenView.java deleted file mode 100644 index 84b7ada14..000000000 --- a/openid-connect-server/src/main/java/org/mitre/openid/connect/view/JSONIdTokenView.java +++ /dev/null @@ -1,100 +0,0 @@ -/******************************************************************************* - * Copyright 2012 The MITRE Corporation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - ******************************************************************************/ -package org.mitre.openid.connect.view; - -import java.io.IOException; -import java.io.Writer; -import java.lang.reflect.Type; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.mitre.jwt.model.ClaimSet; -import org.springframework.validation.BeanPropertyBindingResult; -import org.springframework.web.servlet.view.AbstractView; - -import com.google.gson.ExclusionStrategy; -import com.google.gson.FieldAttributes; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.JsonElement; -import com.google.gson.JsonNull; -import com.google.gson.JsonSerializationContext; -import com.google.gson.JsonSerializer; - -public class JSONIdTokenView extends AbstractView { - - /* (non-Javadoc) - * @see org.springframework.web.servlet.view.AbstractView#renderMergedOutputModel(java.util.Map, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) - */ - protected void renderMergedOutputModel(Map model, HttpServletRequest request, HttpServletResponse response) { - - Gson gson = new GsonBuilder() - .setExclusionStrategies(new ExclusionStrategy() { - - public boolean shouldSkipField(FieldAttributes f) { - - return false; - } - - public boolean shouldSkipClass(Class clazz) { - // skip the JPA binding wrapper - if (clazz.equals(BeanPropertyBindingResult.class)) { - return true; - } - return false; - } - - }) - .registerTypeHierarchyAdapter(ClaimSet.class, new JsonSerializer() { - @Override - public JsonElement serialize(ClaimSet src, Type typeOfSrc, JsonSerializationContext context) { - if (src != null) { - return src.getAsJsonObject(); - } else { - return JsonNull.INSTANCE; - } - } - }) - .create(); - - response.setContentType("application/json"); - - - Writer out; - - try { - - out = response.getWriter(); - - Object obj = model.get("entity"); - if (obj == null) { - obj = model; - } - - gson.toJson(obj, out); - - } catch (IOException e) { - - // TODO Auto-generated catch block - e.printStackTrace(); - - } - - } - -} diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/view/JSONUserInfoView.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/view/JSONUserInfoView.java index 5a38a4093..afa8ba13d 100644 --- a/openid-connect-server/src/main/java/org/mitre/openid/connect/view/JSONUserInfoView.java +++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/view/JSONUserInfoView.java @@ -24,6 +24,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.mitre.openid.connect.model.UserInfo; +import org.springframework.stereotype.Component; import org.springframework.validation.BeanPropertyBindingResult; import org.springframework.web.servlet.view.AbstractView; @@ -33,7 +34,8 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonObject; -public class JSONUserInfoView extends AbstractView{ +@Component("jsonUserInfoView") +public class JSONUserInfoView extends AbstractView { /* (non-Javadoc) * @see org.springframework.web.servlet.view.AbstractView#renderMergedOutputModel(java.util.Map, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/view/JwkKeyListView.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/view/JwkKeyListView.java index f68cf07a9..e6699d68c 100644 --- a/openid-connect-server/src/main/java/org/mitre/openid/connect/view/JwkKeyListView.java +++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/view/JwkKeyListView.java @@ -30,6 +30,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.codec.binary.Base64; import org.mitre.jwt.signer.JwtSigner; import org.mitre.jwt.signer.impl.RsaSigner; +import org.springframework.stereotype.Component; import org.springframework.validation.BeanPropertyBindingResult; import org.springframework.web.servlet.view.AbstractView; @@ -44,6 +45,7 @@ import com.google.gson.JsonObject; * @author jricher * */ +@Component("jwkKeyList") public class JwkKeyListView extends AbstractView { @Override diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/view/POCOUserInfoView.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/view/POCOUserInfoView.java index 1ffee295f..3602e7cb9 100644 --- a/openid-connect-server/src/main/java/org/mitre/openid/connect/view/POCOUserInfoView.java +++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/view/POCOUserInfoView.java @@ -24,6 +24,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.mitre.openid.connect.model.UserInfo; +import org.springframework.stereotype.Component; import org.springframework.validation.BeanPropertyBindingResult; import org.springframework.web.servlet.view.AbstractView; @@ -34,6 +35,7 @@ import com.google.gson.GsonBuilder; import com.google.gson.JsonArray; import com.google.gson.JsonObject; +@Component("pocoUserInfoView") public class POCOUserInfoView extends AbstractView{ /* (non-Javadoc) diff --git a/openid-connect-server/src/main/java/org/mitre/swd/view/JsonOpenIdConfigurationView.java b/openid-connect-server/src/main/java/org/mitre/swd/view/JsonOpenIdConfigurationView.java index 8c754471e..b9cc066bb 100644 --- a/openid-connect-server/src/main/java/org/mitre/swd/view/JsonOpenIdConfigurationView.java +++ b/openid-connect-server/src/main/java/org/mitre/swd/view/JsonOpenIdConfigurationView.java @@ -22,6 +22,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.springframework.stereotype.Component; import org.springframework.validation.BeanPropertyBindingResult; import org.springframework.web.servlet.view.AbstractView; @@ -30,6 +31,7 @@ import com.google.gson.FieldAttributes; import com.google.gson.Gson; import com.google.gson.GsonBuilder; +@Component("jsonOpenIdConfigurationView") public class JsonOpenIdConfigurationView extends AbstractView { @Override diff --git a/openid-connect-server/src/main/java/org/mitre/swd/view/SwdResponse.java b/openid-connect-server/src/main/java/org/mitre/swd/view/SwdResponse.java index 25d5eb21c..7e38e9702 100644 --- a/openid-connect-server/src/main/java/org/mitre/swd/view/SwdResponse.java +++ b/openid-connect-server/src/main/java/org/mitre/swd/view/SwdResponse.java @@ -25,6 +25,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.springframework.stereotype.Component; import org.springframework.validation.BeanPropertyBindingResult; import org.springframework.web.servlet.view.AbstractView; @@ -37,6 +38,7 @@ import com.google.gson.GsonBuilder; * @author jricher * */ +@Component("jsonSwdResponseView") public class SwdResponse extends AbstractView { /* (non-Javadoc) diff --git a/openid-connect-server/src/main/java/org/mitre/swd/view/XrdJsonResponse.java b/openid-connect-server/src/main/java/org/mitre/swd/view/XrdJsonResponse.java index c77c0a2d9..5d0e4e950 100644 --- a/openid-connect-server/src/main/java/org/mitre/swd/view/XrdJsonResponse.java +++ b/openid-connect-server/src/main/java/org/mitre/swd/view/XrdJsonResponse.java @@ -25,6 +25,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.springframework.stereotype.Component; import org.springframework.validation.BeanPropertyBindingResult; import org.springframework.web.servlet.view.AbstractView; @@ -39,6 +40,7 @@ import com.google.gson.JsonObject; * @author jricher * */ +@Component("jsonXrdResponseView") public class XrdJsonResponse extends AbstractView { /* (non-Javadoc) diff --git a/openid-connect-server/src/main/webapp/WEB-INF/application-context.xml b/openid-connect-server/src/main/webapp/WEB-INF/application-context.xml index 143836cf8..2eecf1612 100644 --- a/openid-connect-server/src/main/webapp/WEB-INF/application-context.xml +++ b/openid-connect-server/src/main/webapp/WEB-INF/application-context.xml @@ -16,8 +16,7 @@ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd"> - + @@ -32,8 +31,7 @@ - + - - - - - - - - - - - - - - - - + exceptionAsJSONView