From 2bdbb283b7d857931ce5fccc2cfbc65224072821 Mon Sep 17 00:00:00 2001 From: Mike Derryberry Date: Wed, 8 Aug 2012 09:26:18 -0400 Subject: [PATCH] removed dependency on abstract endpoint class. added methods needed to authRequestObjectEndpoint (afterPropertiesSet()) --- .../AuthorizationEndpointRequestObject.java | 27 +++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/server/AuthorizationEndpointRequestObject.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/server/AuthorizationEndpointRequestObject.java index 49c65fd44..e3494b9d2 100644 --- a/openid-connect-server/src/main/java/org/mitre/openid/connect/server/AuthorizationEndpointRequestObject.java +++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/server/AuthorizationEndpointRequestObject.java @@ -10,9 +10,12 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.mitre.jwt.model.Jwt; import org.mitre.jwt.model.JwtClaims; import org.springframework.beans.factory.InitializingBean; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.authentication.InsufficientAuthenticationException; import org.springframework.security.core.Authentication; import org.springframework.security.core.AuthenticationException; @@ -25,15 +28,16 @@ import org.springframework.security.oauth2.common.exceptions.UnsupportedGrantTyp import org.springframework.security.oauth2.common.exceptions.UserDeniedAuthorizationException; import org.springframework.security.oauth2.provider.AuthorizationRequest; import org.springframework.security.oauth2.provider.ClientDetailsService; +import org.springframework.security.oauth2.provider.TokenGranter; import org.springframework.security.oauth2.provider.approval.DefaultUserApprovalHandler; import org.springframework.security.oauth2.provider.approval.UserApprovalHandler; import org.springframework.security.oauth2.provider.code.AuthorizationCodeServices; import org.springframework.security.oauth2.provider.code.AuthorizationRequestHolder; import org.springframework.security.oauth2.provider.code.InMemoryAuthorizationCodeServices; -import org.springframework.security.oauth2.provider.endpoint.AbstractEndpoint; import org.springframework.security.oauth2.provider.endpoint.DefaultRedirectResolver; import org.springframework.security.oauth2.provider.endpoint.RedirectResolver; import org.springframework.stereotype.Controller; +import org.springframework.util.Assert; import org.springframework.util.ClassUtils; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; @@ -48,7 +52,12 @@ import org.springframework.web.servlet.view.RedirectView; @Controller @SessionAttributes(types = AuthorizationRequest.class) @RequestMapping(value = "/oauth/authorize") -public class AuthorizationEndpointRequestObject extends AbstractEndpoint implements InitializingBean{ +public class AuthorizationEndpointRequestObject implements InitializingBean{ + + @Autowired + private TokenGranter tokenGranter; + + protected final Log logger = LogFactory.getLog(getClass()); private RedirectResolver redirectResolver = new DefaultRedirectResolver(); @@ -392,4 +401,18 @@ public class AuthorizationEndpointRequestObject extends AbstractEndpoint impleme return url.toString(); } + + public TokenGranter getTokenGranter() { + return tokenGranter; + } + + public void setTokenGranter(TokenGranter tokenGranter) { + this.tokenGranter = tokenGranter; + } + + @Override + public void afterPropertiesSet() throws Exception { + Assert.state(tokenGranter != null, "TokenGranter must be provided"); + + } }