You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oltu.apache.org by st...@apache.org on 2016/02/23 09:14:15 UTC
svn commit: r1731804 - in /oltu/trunk/oauth-2.0/client/src: main/java/org/apache/oltu/oauth2/client/response/ main/java/org/apache/oltu/oauth2/client/validator/ test/java/org/apache/oltu/oauth2/client/validator/

Author: stein
Date: Tue Feb 23 08:14:15 2016
New Revision: 1731804

URL: http://svn.apache.org/viewvc?rev=1731804&view=rev
Log:
OLTU-178 Add the response code when the validateErrorResponse method is called which triggers an OAuthProblemException

Added:
    oltu/trunk/oauth-2.0/client/src/test/java/org/apache/oltu/oauth2/client/validator/OAuthClientValidatorTest.java
Modified:
    oltu/trunk/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/response/OAuthClientResponse.java
    oltu/trunk/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/validator/OAuthClientValidator.java
    oltu/trunk/oauth-2.0/client/src/test/java/org/apache/oltu/oauth2/client/validator/CodeTokenValidatorTest.java

Modified: oltu/trunk/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/response/OAuthClientResponse.java
URL: http://svn.apache.org/viewvc/oltu/trunk/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/response/OAuthClientResponse.java?rev=1731804&r1=1731803&r2=1731804&view=diff
==============================================================================
--- oltu/trunk/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/response/OAuthClientResponse.java (original)
+++ oltu/trunk/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/response/OAuthClientResponse.java Tue Feb 23 08:14:15 2016
@@ -48,6 +48,10 @@ public abstract class OAuthClientRespons
         return value == null ? null : String.valueOf(value);
     }
 
+    public int getResponseCode() {
+        return responseCode;
+    }
+
     public void setHeaders(Map<String, List<String>> headers) {
         this.headers = headers;
     }

Modified: oltu/trunk/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/validator/OAuthClientValidator.java
URL: http://svn.apache.org/viewvc/oltu/trunk/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/validator/OAuthClientValidator.java?rev=1731804&r1=1731803&r2=1731804&view=diff
==============================================================================
--- oltu/trunk/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/validator/OAuthClientValidator.java (original)
+++ oltu/trunk/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/validator/OAuthClientValidator.java Tue Feb 23 08:14:15 2016
@@ -60,7 +60,7 @@ public abstract class OAuthClientValidat
             String errorDesc = response.getParam(OAuthError.OAUTH_ERROR_DESCRIPTION);
             String errorUri = response.getParam(OAuthError.OAUTH_ERROR_URI);
             String state = response.getParam(OAuth.OAUTH_STATE);
-            throw OAuthProblemException.error(error).description(errorDesc).uri(errorUri).state(state);
+            throw OAuthProblemException.error(error).description(errorDesc).uri(errorUri).responseStatus(response.getResponseCode()).state(state);
         }
     }
 

Modified: oltu/trunk/oauth-2.0/client/src/test/java/org/apache/oltu/oauth2/client/validator/CodeTokenValidatorTest.java
URL: http://svn.apache.org/viewvc/oltu/trunk/oauth-2.0/client/src/test/java/org/apache/oltu/oauth2/client/validator/CodeTokenValidatorTest.java?rev=1731804&r1=1731803&r2=1731804&view=diff
==============================================================================
--- oltu/trunk/oauth-2.0/client/src/test/java/org/apache/oltu/oauth2/client/validator/CodeTokenValidatorTest.java (original)
+++ oltu/trunk/oauth-2.0/client/src/test/java/org/apache/oltu/oauth2/client/validator/CodeTokenValidatorTest.java Tue Feb 23 08:14:15 2016
@@ -21,8 +21,6 @@
 
 package org.apache.oltu.oauth2.client.validator;
 
-import org.apache.oltu.oauth2.client.validator.CodeTokenValidator;
-import org.apache.oltu.oauth2.client.validator.OAuthClientValidator;
 import org.apache.oltu.oauth2.common.OAuth;
 import org.junit.Assert;
 import org.junit.Test;

Added: oltu/trunk/oauth-2.0/client/src/test/java/org/apache/oltu/oauth2/client/validator/OAuthClientValidatorTest.java
URL: http://svn.apache.org/viewvc/oltu/trunk/oauth-2.0/client/src/test/java/org/apache/oltu/oauth2/client/validator/OAuthClientValidatorTest.java?rev=1731804&view=auto
==============================================================================
--- oltu/trunk/oauth-2.0/client/src/test/java/org/apache/oltu/oauth2/client/validator/OAuthClientValidatorTest.java (added)
+++ oltu/trunk/oauth-2.0/client/src/test/java/org/apache/oltu/oauth2/client/validator/OAuthClientValidatorTest.java Tue Feb 23 08:14:15 2016
@@ -0,0 +1,24 @@
+package org.apache.oltu.oauth2.client.validator;
+
+import org.apache.oltu.oauth2.client.response.OAuthClientResponseFactory;
+import org.apache.oltu.oauth2.common.OAuth;
+import org.apache.oltu.oauth2.common.exception.OAuthProblemException;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+public class OAuthClientValidatorTest {
+
+    private static final String OAUTH_ERROR_JSON = "{\"error\":\"invalid_client\"}";
+
+    @Test
+    public void shouldReturnExceptionWithSpecificResponseCode() throws OAuthProblemException {
+        try {
+            OAuthClientResponseFactory.createJSONTokenResponse(OAUTH_ERROR_JSON, OAuth.ContentType.JSON, 401);
+            fail();
+        } catch (OAuthProblemException e) {
+            assertEquals(401, e.getResponseStatus());
+        }
+    }
+}
\ No newline at end of file