Fixing test
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/2ae6337a Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2ae6337a Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2ae6337a Branch: refs/heads/3.0.x-fixes Commit: 2ae6337ab7006554c062db05225c56f0cf0ac38e Parents: 13bb208 Author: Colm O hEigeartaigh <[email protected]> Authored: Wed Dec 23 15:35:53 2015 +0000 Committer: Colm O hEigeartaigh <[email protected]> Committed: Wed Dec 23 15:35:53 2015 +0000 ---------------------------------------------------------------------- .../rs/security/oauth2/services/RedirectionBasedGrantService.java | 2 +- .../security/oauth2/grants/AuthorizationGrantNegativeTest.java | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/2ae6337a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java index e260bbc..adef572 100644 --- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java +++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java @@ -325,7 +325,7 @@ public abstract class RedirectionBasedGrantService extends AbstractOAuthService List<String> uris = client.getRedirectUris(); if (redirectUri != null) { if (!uris.contains(redirectUri)) { - redirectUri = null; + reportInvalidRequestError("Client Redirect Uri is invalid"); } } else if (uris.size() == 1 && useRegisteredRedirectUriIfPossible) { redirectUri = uris.get(0); http://git-wip-us.apache.org/repos/asf/cxf/blob/2ae6337a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/AuthorizationGrantNegativeTest.java ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/AuthorizationGrantNegativeTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/AuthorizationGrantNegativeTest.java index 74a65be..5cf1b0a 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/AuthorizationGrantNegativeTest.java +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/AuthorizationGrantNegativeTest.java @@ -731,9 +731,7 @@ public class AuthorizationGrantNegativeTest extends AbstractBusClientServerTestB JwsJwtCompactProducer jws = new JwsJwtCompactProducer(jwsHeaders, claims); return jws.getSignedEncodedJws(); } -<<<<<<< HEAD */ -======= private String getAuthorizationCode(WebClient client) { return getAuthorizationCode(client, null); @@ -793,5 +791,4 @@ public class AuthorizationGrantNegativeTest extends AbstractBusClientServerTestB } return foundString.substring(0, ampersandIndex); } ->>>>>>> d7b5336... Adding more OAuth negative tests }
