You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by li...@apache.org on 2010/06/02 09:57:51 UTC
svn commit: r950406 - in /shindig/trunk/java:
common/src/main/java/org/apache/shindig/auth/
gadgets/src/main/java/org/apache/shindig/gadgets/oauth/
gadgets/src/main/java/org/apache/shindig/gadgets/oauth/testing/
gadgets/src/test/java/org/apache/shindig...
Author: lindner
Date: Wed Jun 2 07:57:51 2010
New Revision: 950406
URL: http://svn.apache.org/viewvc?rev=950406&view=rev
Log:
use OAuth constants from new OAuth library
Modified:
shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/OAuthConstants.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthRequest.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/testing/FakeOAuthServiceProvider.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthRequestTest.java
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleOAuthServlet.java
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/OAuthConstants.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/OAuthConstants.java?rev=950406&r1=950405&r2=950406&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/OAuthConstants.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/OAuthConstants.java Wed Jun 2 07:57:51 2010
@@ -19,31 +19,14 @@
package org.apache.shindig.auth;
-public class OAuthConstants {
+public final class OAuthConstants {
+ private OAuthConstants() {}
public static final String OAUTH_SESSION_HANDLE = "oauth_session_handle";
public static final String OAUTH_EXPIRES_IN = "oauth_expires_in";
public static final String OAUTH_BODY_HASH = "oauth_body_hash";
- public static final String OAUTH_VERIFIER = "oauth_verifier";
- public static final String OAUTH_CALLBACK_CONFIRMED = "oauth_callback_confirmed";
public static final String PROBLEM_ACCESS_TOKEN_EXPIRED = "access_token_expired";
-
public static final String PROBLEM_PARAMETER_MISSING = "parameter_missing";
-
- public static final String PROBLEM_TOKEN_REVOKED = "token_revoked";
-
public static final String PROBLEM_TOKEN_INVALID = "token_invalid";
-
- public static final String PROBLEM_PARAMETER_ABSENT = "parameter_absent";
-
public static final String PROBLEM_BAD_VERIFIER = "bad_verifier";
-
- public static final String PROBLEM_TOKEN_REJECTED = "token_rejected";
-
- public static final String PROBLEM_PARAMETER_REJECTED = "parameter_rejected";
-
- public static final String PROBLEM_PERMISSION_DENIED = "permission_denied";
-
- public static final String PROBLEM_CONSUMER_KEY_REFUSED = "consumer_key_refused";
-
- public static final String PROBLEM_CONSUMER_KEY_UNKNOWN = "consumer_key_unknown";}
+}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthRequest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthRequest.java?rev=950406&r1=950405&r2=950406&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthRequest.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthRequest.java Wed Jun 2 07:57:51 2010
@@ -742,9 +742,9 @@ public class OAuthRequest {
if (!StringUtils.isBlank(receivedCallback)) {
try {
Uri parsed = Uri.parse(receivedCallback);
- String verifier = parsed.getQueryParameter(OAuthConstants.OAUTH_VERIFIER);
+ String verifier = parsed.getQueryParameter(OAuth.OAUTH_VERIFIER);
if (verifier != null) {
- msgParams.add(new Parameter(OAuthConstants.OAUTH_VERIFIER, verifier));
+ msgParams.add(new Parameter(OAuth.OAUTH_VERIFIER, verifier));
}
} catch (IllegalArgumentException e) {
throw new OAuthRequestException(OAuthError.INVALID_REQUEST,
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/testing/FakeOAuthServiceProvider.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/testing/FakeOAuthServiceProvider.java?rev=950406&r1=950405&r2=950406&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/testing/FakeOAuthServiceProvider.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/testing/FakeOAuthServiceProvider.java Wed Jun 2 07:57:51 2010
@@ -305,23 +305,23 @@ public class FakeOAuthServiceProvider im
consumer = oauthConsumer;
} else {
return makeOAuthProblemReport(
- OAuthConstants.PROBLEM_CONSUMER_KEY_UNKNOWN, "invalid consumer: " + requestConsumer,
+ OAuth.Problems.CONSUMER_KEY_UNKNOWN, "invalid consumer: " + requestConsumer,
HttpResponse.SC_FORBIDDEN);
}
if (throttled) {
return makeOAuthProblemReport(
- OAuthConstants.PROBLEM_CONSUMER_KEY_REFUSED, "exceeded quota exhausted",
+ OAuth.Problems.CONSUMER_KEY_REFUSED, "exceeded quota exhausted",
HttpResponse.SC_FORBIDDEN);
}
if (unauthorized) {
return makeOAuthProblemReport(
- OAuthConstants.PROBLEM_PERMISSION_DENIED, "user refused access",
+ OAuth.Problems.PERMISSION_DENIED, "user refused access",
HttpResponse.SC_BAD_REQUEST);
}
if (rejectExtraParams) {
String extra = hasExtraParams(info.message);
if (extra != null) {
- return makeOAuthProblemReport(OAuthConstants.PROBLEM_PARAMETER_REJECTED, extra,
+ return makeOAuthProblemReport(OAuth.Problems.PARAMETER_REJECTED, extra,
HttpResponse.SC_BAD_REQUEST);
}
}
@@ -336,7 +336,7 @@ public class FakeOAuthServiceProvider im
"oauth_token", requestToken,
"oauth_token_secret", requestTokenSecret);
if (callbackUrl != null) {
- responseParams.add(new Parameter(OAuthConstants.OAUTH_CALLBACK_CONFIRMED, "true"));
+ responseParams.add(new Parameter(OAuth.OAUTH_CALLBACK_CONFIRMED, "true"));
}
return new HttpResponse(OAuth.formEncode(responseParams));
}
@@ -514,7 +514,7 @@ public class FakeOAuthServiceProvider im
state.setUserData(parsed.getQueryParam("user_data"));
if (state.callbackUrl != null) {
UriBuilder callback = UriBuilder.parse(state.callbackUrl);
- callback.addQueryParameter(OAuthConstants.OAUTH_VERIFIER, state.verifier);
+ callback.addQueryParameter(OAuth.OAUTH_VERIFIER, state.verifier);
return callback.toString();
}
return null;
@@ -572,19 +572,19 @@ public class FakeOAuthServiceProvider im
String requestToken = info.message.getParameter("oauth_token");
TokenState state = tokenState.get(requestToken);
if (throttled) {
- return makeOAuthProblemReport(OAuthConstants.PROBLEM_CONSUMER_KEY_REFUSED,
+ return makeOAuthProblemReport(OAuth.Problems.CONSUMER_KEY_REFUSED,
"exceeded quota", HttpResponse.SC_FORBIDDEN);
} else if (unauthorized) {
- return makeOAuthProblemReport(OAuthConstants.PROBLEM_PERMISSION_DENIED,
+ return makeOAuthProblemReport(OAuth.Problems.PERMISSION_DENIED,
"user refused access", HttpResponse.SC_UNAUTHORIZED);
} else if (state == null) {
- return makeOAuthProblemReport(OAuthConstants.PROBLEM_TOKEN_REJECTED,
+ return makeOAuthProblemReport(OAuth.Problems.TOKEN_REJECTED,
"Unknown request token", HttpResponse.SC_UNAUTHORIZED);
}
if (rejectExtraParams) {
String extra = hasExtraParams(info.message);
if (extra != null) {
- return makeOAuthProblemReport(OAuthConstants.PROBLEM_PARAMETER_REJECTED,
+ return makeOAuthProblemReport(OAuth.Problems.PARAMETER_REJECTED,
extra, HttpResponse.SC_BAD_REQUEST);
}
}
@@ -605,7 +605,7 @@ public class FakeOAuthServiceProvider im
// Verify can refresh
String sentHandle = info.message.getParameter("oauth_session_handle");
if (sentHandle == null) {
- return makeOAuthProblemReport(OAuthConstants.PROBLEM_PARAMETER_ABSENT,
+ return makeOAuthProblemReport(OAuth.Problems.PARAMETER_ABSENT,
"no oauth_session_handle", HttpResponse.SC_BAD_REQUEST);
}
if (!sentHandle.equals(state.sessionHandle)) {
@@ -614,7 +614,7 @@ public class FakeOAuthServiceProvider im
}
state.renewToken();
} else if (state.getState() == State.REVOKED){
- return makeOAuthProblemReport(OAuthConstants.PROBLEM_TOKEN_REVOKED,
+ return makeOAuthProblemReport(OAuth.Problems.TOKEN_REVOKED,
"Revoked access token can't be renewed", HttpResponse.SC_UNAUTHORIZED);
} else {
throw new Exception("Token in weird state " + state.getState());
@@ -654,18 +654,18 @@ public class FakeOAuthServiceProvider im
} else if ("container.com".equals(consumerId)) {
consumer = signedFetchConsumer;
} else {
- return makeOAuthProblemReport(OAuthConstants.PROBLEM_PARAMETER_MISSING,
+ return makeOAuthProblemReport(OAuth.Problems.PARAMETER_ABSENT,
"oauth_consumer_key not found", HttpResponse.SC_BAD_REQUEST);
}
OAuthAccessor accessor = new OAuthAccessor(consumer);
String responseBody = null;
if (throttled) {
return makeOAuthProblemReport(
- OAuthConstants.PROBLEM_CONSUMER_KEY_REFUSED, "exceeded quota", HttpResponse.SC_FORBIDDEN);
+ OAuth.Problems.CONSUMER_KEY_REFUSED, "exceeded quota", HttpResponse.SC_FORBIDDEN);
}
if (unauthorized) {
return makeOAuthProblemReport(
- OAuthConstants.PROBLEM_PERMISSION_DENIED, "user refused access",
+ OAuth.Problems.PERMISSION_DENIED, "user refused access",
HttpResponse.SC_UNAUTHORIZED);
}
if (consumer == oauthConsumer) {
@@ -674,7 +674,7 @@ public class FakeOAuthServiceProvider im
TokenState state = tokenState.get(accessToken);
if (state == null) {
return makeOAuthProblemReport(
- OAuthConstants.PROBLEM_TOKEN_REJECTED, "Access token unknown",
+ OAuth.Problems.TOKEN_REJECTED, "Access token unknown",
HttpResponse.SC_UNAUTHORIZED);
}
// Check the signature
@@ -684,7 +684,7 @@ public class FakeOAuthServiceProvider im
if (state.getState() != State.APPROVED) {
return makeOAuthProblemReport(
- OAuthConstants.PROBLEM_TOKEN_REVOKED, "User revoked permissions",
+ OAuth.Problems.TOKEN_REVOKED, "User revoked permissions",
HttpResponse.SC_UNAUTHORIZED);
}
if (sessionExtension) {
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthRequestTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthRequestTest.java?rev=950406&r1=950405&r2=950406&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthRequestTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthRequestTest.java Wed Jun 2 07:57:51 2010
@@ -755,7 +755,7 @@ public class OAuthRequestTest {
response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
assertEquals("", response.getResponseAsString());
assertEquals(HttpResponse.SC_FORBIDDEN, response.getHttpStatusCode());
- assertEquals("parameter_missing", response.getMetadata().get("oauthError"));
+ assertEquals("parameter_absent", response.getMetadata().get("oauthError"));
assertNull(response.getMetadata().get("oauthApprovalUrl"));
}
Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleOAuthServlet.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleOAuthServlet.java?rev=950406&r1=950405&r2=950406&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleOAuthServlet.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleOAuthServlet.java Wed Jun 2 07:57:51 2010
@@ -128,7 +128,7 @@ public class SampleOAuthServlet extends
List<Parameter> responseParams = OAuth.newList(OAuth.OAUTH_TOKEN, entry.token,
OAuth.OAUTH_TOKEN_SECRET, entry.tokenSecret);
if (callback != null) {
- responseParams.add(new Parameter(OAuthConstants.OAUTH_CALLBACK_CONFIRMED, "true"));
+ responseParams.add(new Parameter(OAuth.OAUTH_CALLBACK_CONFIRMED, "true"));
}
sendResponse(servletResponse, responseParams);
}
@@ -208,7 +208,7 @@ public class SampleOAuthServlet extends
// Add user_id to the callback
callback = OAuth.addParameters(callback, "user_id", entry.userId);
if (entry.callbackToken != null) {
- callback = OAuth.addParameters(callback, OAuthConstants.OAUTH_VERIFIER,
+ callback = OAuth.addParameters(callback, OAuth.OAUTH_VERIFIER,
entry.callbackToken);
}
@@ -229,7 +229,7 @@ public class SampleOAuthServlet extends
if (entry.callbackToken != null) {
// We're using the fixed protocol
- String clientCallbackToken = requestMessage.getParameter(OAuthConstants.OAUTH_VERIFIER);
+ String clientCallbackToken = requestMessage.getParameter(OAuth.OAUTH_VERIFIER);
if (!entry.callbackToken.equals(clientCallbackToken)) {
dataStore.disableToken(entry);
servletResponse.sendError(HttpServletResponse.SC_FORBIDDEN, "This token is not authorized");