svn commit: r658142 - /incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthFetcher.java

[etnu]

Author: etnu
Date: Tue May 20 00:48:42 2008
New Revision: 658142

URL: http://svn.apache.org/viewvc?rev=658142&view=rev
Log:
Applied SHINDIG-239, from Dirk.


Modified:
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthFetcher.java

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthFetcher.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthFetcher.java?rev=658142&r1=658141&r2=658142&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthFetcher.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthFetcher.java
 Tue May 20 00:48:42 2008
@@ -62,6 +62,9 @@
   public static final String CLIENT_STATE = "oauthState";
   public static final String APPROVAL_URL = "approvalUrl";
 
+  // names of additional OAuth parameters we include in outgoing requests
+  public static final String XOAUTH_APP_URL = "xoauth_app_url";
+
   /**
    * Maximum age for our client state; if this is exceeded we start over. One
    * hour is a fairly arbitrary time limit here.
@@ -253,7 +256,9 @@
     try {
       OAuthAccessor accessor = accessorInfo.getAccessor();
       String url = accessor.consumer.serviceProvider.requestTokenURL;
-      OAuthMessage request = newRequestMessage(url);
+      List<OAuth.Parameter> msgParams = new ArrayList<OAuth.Parameter>();
+      msgParams.add(new OAuth.Parameter(XOAUTH_APP_URL, 
authToken.getAppUrl()));
+      OAuthMessage request = newRequestMessage(url, msgParams);
       OAuthMessage reply = sendOAuthMessage(request);
       reply.requireParameters(OAuth.OAUTH_TOKEN, OAuth.OAUTH_TOKEN_SECRET);
       accessor.requestToken = reply.getParameter(OAuth.OAUTH_TOKEN);
@@ -294,11 +299,6 @@
     return accessor.newRequestMessage(method, url, params);
   }
 
-  private OAuthMessage newRequestMessage(String url) throws Exception {
-    ArrayList<OAuth.Parameter> params = new ArrayList<OAuth.Parameter>();
-    return newRequestMessage(url, params);
-  }
-
   private OAuthMessage newRequestMessage(String url,
       List<OAuth.Parameter> params) throws Exception {
     String method = "POST";
@@ -469,6 +469,7 @@
       OAuthAccessor accessor = accessorInfo.getAccessor();
       String url = accessor.consumer.serviceProvider.accessTokenURL;
       List<OAuth.Parameter> msgParams = new ArrayList<OAuth.Parameter>();
+      msgParams.add(new OAuth.Parameter(XOAUTH_APP_URL, 
authToken.getAppUrl()));
       msgParams.add(
           new OAuth.Parameter(OAuth.OAUTH_TOKEN, accessor.requestToken));
       OAuthMessage request = newRequestMessage(url, msgParams);
@@ -523,6 +524,8 @@
 
       String method = realRequest.getMethod();
 
+      msgParams.add(new OAuth.Parameter(XOAUTH_APP_URL, 
authToken.getAppUrl()));
+
       // Build and sign the message.
       OAuthMessage oauthRequest = newRequestMessage(
           method, realRequest.getUri().toASCIIString(), msgParams);