Author: beaton
Date: Tue Jun 16 20:40:51 2009
New Revision: 785385
URL: http://svn.apache.org/viewvc?rev=785385&view=rev
Log:
Fix NPE when no viewer is present in token.
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/GadgetOAuthTokenStore.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthRequestTest.java
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/GadgetOAuthTokenStore.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/GadgetOAuthTokenStore.java?rev=785385&r1=785384&r2=785385&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/GadgetOAuthTokenStore.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/GadgetOAuthTokenStore.java
Tue Jun 16 20:40:51 2009
@@ -111,7 +111,7 @@
// if owner == viewer.
if (arguments.mayUseToken()
&& securityToken.getOwnerId() != null
- && securityToken.getViewerId().equals(securityToken.getOwnerId())) {
+ && securityToken.getOwnerId().equals(securityToken.getViewerId())) {
lookupToken(securityToken, consumer, arguments, clientState,
accessorBuilder, responseParams);
}
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthRequestTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthRequestTest.java?rev=785385&r1=785384&r2=785385&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthRequestTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthRequestTest.java
Tue Jun 16 20:40:51 2009
@@ -401,6 +401,17 @@
}
@Test
+ public void testOAuthFlow_noViewer() throws Exception {
+ MakeRequestClient client = makeNonSocialClient("owner", null, GADGET_URL);
+
+ HttpResponse response =
client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
+ assertEquals("", response.getResponseAsString());
+ assertEquals(403, response.getHttpStatusCode());
+ assertEquals(-1, response.getCacheTtl());
+ assertEquals(OAuthError.NOT_OWNER.toString(),
response.getMetadata().get("oauthError"));
+ }
+
+ @Test
public void testOAuthFlow_noSpec() throws Exception {
fetcherConfig = new OAuthFetcherConfig(
new BasicBlobCrypter("abcdefghijklmnop".getBytes()),
