Merge pull request #1131 from stormpath/Issue-1126-1.2.x

issue 1126 - improved AccessTokenController error handling to elimina…

Author: iancorcoran

extensions/servlet/src/main/java/com/stormpath/sdk/servlet/mvc/AccessTokenController.java

@@ -244,11 +244,11 @@ private AccessTokenResult refreshTokenAuthenticationRequest(HttpServletRequest r
      * @since 1.0.0
      */
     private AccessTokenResult clientCredentialsAuthenticationRequest(HttpServletRequest request, HttpServletResponse response) {
-        DefaultBasicApiAuthenticationRequest authenticationRequest = new DefaultBasicApiAuthenticationRequest(new DefaultHttpServletRequestWrapper(request));
-
         OAuthGrantRequestAuthenticationResult authenticationResult;
 
         try {
+            DefaultBasicApiAuthenticationRequest authenticationRequest = new DefaultBasicApiAuthenticationRequest(new DefaultHttpServletRequestWrapper(request));
+
             Application app = getApplication(request);
             OAuthClientCredentialsGrantRequestAuthentication clientCredentialsGrantRequestAuthentication =
                     OAuthRequests.OAUTH_CLIENT_CREDENTIALS_GRANT_REQUEST.builder()
@@ -287,6 +287,8 @@ private AccessTokenResult stormpathSocialAuthenticationRequest(HttpServletReques
         } catch (ResourceException e) {
             log.debug("Unable to authenticate stormpath social grant request: {}", e.getMessage(), e);
             throw convertToOAuthException(e, OAuthErrorCode.INVALID_CLIENT);
+        } catch (IllegalArgumentException ex) {
+            throw new OAuthException(OAuthErrorCode.INVALID_REQUEST);
         }
 
         return createAccessTokenResult(request, response, authenticationResult);

extensions/spring/boot/stormpath-webmvc-spring-boot-starter/src/main/java/com/stormpath/spring/boot/autoconfigure/StormpathWebMvcAutoConfiguration.java

@@ -44,6 +44,8 @@
 import com.stormpath.sdk.servlet.filter.account.JwtSigningKeyResolver;
 import com.stormpath.sdk.servlet.filter.oauth.AccessTokenAuthenticationRequestFactory;
 import com.stormpath.sdk.servlet.filter.oauth.AccessTokenResultFactory;
+import com.stormpath.sdk.servlet.filter.oauth.RefreshTokenAuthenticationRequestFactory;
+import com.stormpath.sdk.servlet.filter.oauth.RefreshTokenResultFactory;
 import com.stormpath.sdk.servlet.http.MediaType;
 import com.stormpath.sdk.servlet.http.Resolver;
 import com.stormpath.sdk.servlet.http.Saver;
@@ -291,6 +293,12 @@ public AccessTokenResultFactory stormpathAccessTokenResultFactory() {
         return super.stormpathAccessTokenResultFactory();
     }
 
+    @Bean
+    @ConditionalOnMissingBean
+    public RefreshTokenResultFactory stormpathRefreshTokenResultFactory() {
+        return super.stormpathRefreshTokenResultFactory();
+    }
+
     @Bean
     @ConditionalOnMissingBean
     public WrappedServletRequestFactory stormpathWrappedServletRequestFactory() {
@@ -487,6 +495,12 @@ public AccessTokenAuthenticationRequestFactory stormpathAccessTokenAuthenticatio
         return super.stormpathAccessTokenAuthenticationRequestFactory();
     }
 
+    @Bean
+    @ConditionalOnMissingBean
+    public RefreshTokenAuthenticationRequestFactory stormpathRefreshTokenAuthenticationRequestFactory() {
+        return super.stormpathRefreshTokenAuthenticationRequestFactory();
+    }
+
     @Bean
     @ConditionalOnMissingBean(name = "stormpathAccessTokenRequestAuthorizer")
     public RequestAuthorizer stormpathAccessTokenRequestAuthorizer() {
@@ -526,7 +540,7 @@ public Controller stormpathMeController() {
 
     @Bean
     @ConditionalOnMissingBean
-    public ExpandsResolver stormpathMeExpandsResolver(){
+    public ExpandsResolver stormpathMeExpandsResolver() {
         return super.stormpathMeExpandsResolver();
     }
 
@@ -654,7 +668,7 @@ public ControllerConfig stormpathVerifyConfig() {
      */
     @Bean
     @ConditionalOnMissingBean(name = "stormpathAccessTokenConfig")
-    public AccessTokenControllerConfig stormpathAccessTokenConfig(){
+    public AccessTokenControllerConfig stormpathAccessTokenConfig() {
         return super.stormpathAccessTokenConfig();
     }
 

extensions/spring/stormpath-spring-webmvc/src/main/java/com/stormpath/spring/config/StormpathWebMvcConfiguration.java

@@ -43,6 +43,8 @@
 import com.stormpath.sdk.servlet.filter.account.JwtSigningKeyResolver;
 import com.stormpath.sdk.servlet.filter.oauth.AccessTokenAuthenticationRequestFactory;
 import com.stormpath.sdk.servlet.filter.oauth.AccessTokenResultFactory;
+import com.stormpath.sdk.servlet.filter.oauth.RefreshTokenAuthenticationRequestFactory;
+import com.stormpath.sdk.servlet.filter.oauth.RefreshTokenResultFactory;
 import com.stormpath.sdk.servlet.http.MediaType;
 import com.stormpath.sdk.servlet.http.Resolver;
 import com.stormpath.sdk.servlet.http.Saver;
@@ -246,6 +248,11 @@ public AccessTokenResultFactory stormpathAccessTokenResultFactory() {
         return super.stormpathAccessTokenResultFactory();
     }
 
+    @Bean
+    public RefreshTokenResultFactory stormpathRefreshTokenResultFactory(){
+        return super.stormpathRefreshTokenResultFactory();
+    }
+
     @Bean
     public WrappedServletRequestFactory stormpathWrappedServletRequestFactory() {
         return super.stormpathWrappedServletRequestFactory();
@@ -422,6 +429,11 @@ public AccessTokenAuthenticationRequestFactory stormpathAccessTokenAuthenticatio
         return super.stormpathAccessTokenAuthenticationRequestFactory();
     }
 
+    @Bean
+    public RefreshTokenAuthenticationRequestFactory stormpathRefreshTokenAuthenticationRequestFactory(){
+        return super.stormpathRefreshTokenAuthenticationRequestFactory();
+    }
+
     @Bean
     public RequestAuthorizer stormpathAccessTokenRequestAuthorizer() {
         return super.stormpathAccessTokenRequestAuthorizer();